verdnatura-mirror
/
loopback
mirror of https://github.com/strongloop/loopback.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3733 from nitro404/hotfix/retain-datasource-name 

Fixe data sources not retaining the correct name value
This commit is contained in:
Miroslav Bajtoš 2018-01-19 17:08:22 +01:00 committed by GitHub
parent 72d48c3bfa ab791fc258
commit 60c9dd166b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/application.js
View File

@ -505,21 +505,21 @@ function dataSourcesFromConfig(name, config, connectorRegistry, registry) {
'can not create data source without config object'); 'can not create data source without config object');
if (typeof config.connector === 'string') { if (typeof config.connector === 'string') {
name = config.connector; const connectorName = config.connector;
if (connectorRegistry[name]) { if (connectorRegistry[connectorName]) {
config.connector = connectorRegistry[name]; config.connector = connectorRegistry[connectorName];
} else { } else {
connectorPath = path.join(__dirname, 'connectors', name + '.js'); connectorPath = path.join(__dirname, 'connectors', connectorName + '.js');
if (fs.existsSync(connectorPath)) { if (fs.existsSync(connectorPath)) {
config.connector = require(connectorPath); config.connector = require(connectorPath);
} }
} }
if (config.connector && typeof config.connector === 'object' && !config.connector.name) if (config.connector && typeof config.connector === 'object' && !config.connector.name)
config.connector.name = name; config.connector.name = connectorName;
} }
return registry.createDataSource(config); return registry.createDataSource(name, config);
} }
function configureModel(ModelCtor, config, app) { function configureModel(ModelCtor, config, app) {

2
test/app.test.js
View File

@ -787,7 +787,7 @@ describe('app', function() {
it('looks up the connector in `app.connectors`', function() { it('looks up the connector in `app.connectors`', function() {
app.connector('custom', loopback.Memory); app.connector('custom', loopback.Memory);
app.dataSource('custom', {connector: 'custom'}); app.dataSource('custom', {connector: 'custom'});
expect(app.dataSources.custom.name).to.equal(loopback.Memory.name); expect(app.dataSources.custom.name).to.equal('custom');
}); });
it('adds data source name to error messages', function() { it('adds data source name to error messages', function() {