Merge pull request #424 from mitsos1os/issue-423

Prioritize db url
loopbackio · Mar 23, 2018 · f3ebd13 · f3ebd13
2 parents 08518f0 + 38f8346
commit f3ebd13
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/lib/mongodb.js b/lib/mongodb.js
@@ -225,7 +225,7 @@ MongoDB.prototype.connect = function(callback) {
         self.client = client;
         // The database name might be in the url
         return urlParser(self.settings.url, self.settings, function(err, url) {
-          self.db = client.db(self.settings.database || url.dbName, url.db_options || self.settings);
+          self.db = client.db(url.dbName || self.settings.database, url.db_options || self.settings);
           callback && callback(err, self.db);
         });
       } else {

diff --git a/test/mongodb.test.js b/test/mongodb.test.js
@@ -265,6 +265,29 @@ describe('mongodb connector', function() {
         ds.disconnect(done);
       });
     });
+
+    it('should prioritize to the database given in the url property', function(done) {
+      var cfg = JSON.parse(JSON.stringify(config));
+      var testDb = 'lb-ds-overriden-test-1';
+      cfg.url = 'mongodb://' + cfg.hostname + ':' + cfg.port + '/' + testDb;
+      var ds = getDataSource(cfg);
+      ds.once('connected', function() {
+        var db = ds.connector.db;
+        var validationError = null;
+        try {
+          db.should.have.property('databaseName', testDb); // check the db name in the db instance
+        } catch (err) { // async error
+          validationError = err;
+        }
+        ds.ping(function(err) {
+          if (err && !validationError) validationError = err;
+          ds.disconnect(function(disconnectError) {
+            if (disconnectError && !validationError) validationError = disconnectError;
+            done(validationError);
+          });
+        });
+      });
+    });
   });
 
   describe('order filters', function() {