From 1dc0c3425238e50ff326d66b8f3c98552fc39f6a Mon Sep 17 00:00:00 2001
From: Raymond Feng <raymond@strongloop.com>
Date: Wed, 12 Mar 2014 22:11:55 -0700
Subject: [PATCH] Fix the connector resolver to make sure known connectors are
 used

---
 lib/datasource.js        |  7 ++++++-
 test/loopback-dl.test.js | 23 +++++++++++++++++++++--
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/lib/datasource.js b/lib/datasource.js
index 32a0ee4b..dc7461ca 100644
--- a/lib/datasource.js
+++ b/lib/datasource.js
@@ -178,13 +178,18 @@ DataSource.prototype._setupConnector = function () {
 
 // List possible connector module names
 function connectorModuleNames(name) {
-  var names = [name]; // Check the name as is
+  var names = []; // Check the name as is
   if (!name.match(/^\//)) {
     names.push('./connectors/' + name); // Check built-in connectors
     if (name.indexOf('loopback-connector-') !== 0) {
       names.push('loopback-connector-' + name); // Try loopback-connector-<name>
     }
   }
+  // Only try the short name if the connector is not from StrongLoop
+  if(['mongodb', 'oracle', 'mysql', 'postgresql', 'mssql', 'rest', 'soap']
+    .indexOf(name) === -1) {
+    names.push(name);
+  }
   return names;
 }
 
diff --git a/test/loopback-dl.test.js b/test/loopback-dl.test.js
index 4ac1f91b..01cc0114 100644
--- a/test/loopback-dl.test.js
+++ b/test/loopback-dl.test.js
@@ -615,9 +615,17 @@ describe('DataSource connector types', function() {
 describe('DataSource constructor', function () {
   // Mocked require
   var loader = function (name) {
+    if (name.indexOf('./connectors/') !== -1) {
+      // ./connectors/<name> doesn't exist
+      return null;
+    }
+    if (name === 'loopback-connector-abc') {
+      // Assume loopback-connector-abc doesn't exist
+      return null;
+    }
     return {
       name: name
-    }
+    };
   };
 
   it('should resolve connector by path', function () {
@@ -632,9 +640,20 @@ describe('DataSource constructor', function () {
     var connector = DataSource._resolveConnector('loopback-connector-xyz', loader);
     assert(connector.connector);
   });
-  it('should try to resolve connector by short module name', function () {
+  it('should try to resolve connector by short module name with full name first', function () {
     var connector = DataSource._resolveConnector('xyz', loader);
     assert(connector.connector);
+    assert.equal(connector.connector.name, 'loopback-connector-xyz');
+  });
+  it('should try to resolve connector by short module name', function () {
+    var connector = DataSource._resolveConnector('abc', loader);
+    assert(connector.connector);
+    assert.equal(connector.connector.name, 'abc');
+  });
+  it('should try to resolve connector by short module name for known connectors', function () {
+    var connector = DataSource._resolveConnector('oracle', loader);
+    assert(connector.connector);
+    assert.equal(connector.connector.name, 'loopback-connector-oracle');
   });
   it('should try to resolve connector by full module name', function () {
     var connector = DataSource._resolveConnector('loopback-xyz', loader);