Merge branch 'master' into gh-issue-10-transaction-support

Author: Mike Eldridge

dist/js-data-sql.js

@@ -53,10 +53,10 @@ module.exports =
 
 	function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-	var knex = __webpack_require__(1);
-	var JSData = __webpack_require__(2);
-	var map = __webpack_require__(3);
-	var underscore = __webpack_require__(4);
+	var knex = __webpack_require__(2);
+	var JSData = __webpack_require__(3);
+	var map = __webpack_require__(4);
+	var underscore = __webpack_require__(1);
 	var unique = __webpack_require__(5);
 	var toString = __webpack_require__(6);
 	var DSUtils = JSData.DSUtils;
@@ -123,14 +123,18 @@ module.exports =
 
 	                var relation = _localResourceConfig$relationList$filter2[0];
 
-	                var _table = getTable(localResourceConfig);
-	                var localId = _table + '.' + relation.localKey;
+	                if (relation) {
+	                  var _table = getTable(localResourceConfig);
+	                  var localId = _table + '.' + relation.localKey;
 
-	                var relationTable = getTable(relationResourceConfig);
-	                var foreignId = relationTable + '.' + relationResourceConfig.idAttribute;
+	                  var relationTable = getTable(relationResourceConfig);
+	                  var foreignId = relationTable + '.' + relationResourceConfig.idAttribute;
 
-	                query = query.join(relationTable, localId, foreignId);
-	                joinedTables.push(relationPath.join('.'));
+	                  query = query.join(relationTable, localId, foreignId);
+	                  joinedTables.push(relationPath.join('.'));
+	                } else {
+	                  // local column
+	                }
 	              }
 	              localResourceConfig = relationResourceConfig;
 	            };
@@ -471,25 +475,25 @@ module.exports =
 /* 1 */
 /***/ function(module, exports) {
 
-	module.exports = require("knex");
+	module.exports = require("mout/string/underscore");
 
 /***/ },
 /* 2 */
 /***/ function(module, exports) {
 
-	module.exports = require("js-data");
+	module.exports = require("knex");
 
 /***/ },
 /* 3 */
 /***/ function(module, exports) {
 
-	module.exports = require("mout/array/map");
+	module.exports = require("js-data");
 
 /***/ },
 /* 4 */
 /***/ function(module, exports) {
 
-	module.exports = require("mout/string/underscore");
+	module.exports = require("mout/array/map");
 
 /***/ },
 /* 5 */

mocha.start.js

@@ -58,8 +58,9 @@ beforeEach(function () {
   adapter = new DSSqlAdapter({
     client: 'mysql',
     connection: {
-      user: process.env.C9_USER || 'ubuntu',
-      database: process.env.C9_USER ? 'c9' : 'circle_test'
+      host: process.env.DB_HOST || 'localhost',
+      user: process.env.DB_USER || process.env.C9_USER || 'ubuntu',
+      database: process.env.DB_NAME || (process.env.C9_USER ? 'c9' : 'circle_test')
       //user: 'root',
       //database: 'test'
     }

package.json

@@ -1,7 +1,7 @@
 {
   "name": "js-data-sql",
   "description": "Postgres/MySQL/MariaDB/SQLite3 adapter for js-data.",
-  "version": "0.11.2",
+  "version": "0.11.3",
   "homepage": "http://www.js-data.io/docs/dssqladapter",
   "repository": {
     "type": "git",
@@ -40,7 +40,7 @@
   "scripts": {
     "lint": "node_modules/standard/bin/cmd.js src/index.js",
     "build": "node_modules/webpack/bin/webpack.js --config webpack.config.js --progress --colors",
-    "mocha": "mocha test/*.spec.js --timeout 20000 --reporter spec",
+    "mocha": "mocha --timeout 20000 --reporter spec mocha.start.js test/*.spec.js",
     "test": "npm run lint && npm run build && npm run mocha"
   },
   "standard": {

src/index.js

@@ -65,14 +65,18 @@ function filterQuery (resourceConfig, params, options) {
 
             if (!joinedTables.some(t => t === relationPath.join('.'))) {
               let [relation] = localResourceConfig.relationList.filter(r => r.relation === relationName)
-              let table = getTable(localResourceConfig)
-              let localId = `${table}.${relation.localKey}`
+              if (relation) {
+                let table = getTable(localResourceConfig)
+                let localId = `${table}.${relation.localKey}`
 
-              let relationTable = getTable(relationResourceConfig)
-              let foreignId = `${relationTable}.${relationResourceConfig.idAttribute}`
+                let relationTable = getTable(relationResourceConfig)
+                let foreignId = `${relationTable}.${relationResourceConfig.idAttribute}`
 
-              query = query.join(relationTable, localId, foreignId)
-              joinedTables.push(relationPath.join('.'))
+                query = query.join(relationTable, localId, foreignId)
+                joinedTables.push(relationPath.join('.'))
+              } else {
+                // local column
+              }
             }
             localResourceConfig = relationResourceConfig
           }

test/findAll.spec.js

@@ -182,4 +182,14 @@ describe('DSSqlAdapter#findAll', function () {
     assert.isUndefined(users[0].email);
   });
 
+  it('should filter when relations have same column if column is qualified', function* () {
+    var profile1 = yield adapter.create(Profile, { email: '[email protected]' });
+    var user1 = yield adapter.create(User, {name: 'John', profileId: profile1.id});
+
+    // `id` column must be qualified with `user.`
+    var users = yield adapter.findAll(User, {'user.id': user1.id, 'profile.email': '[email protected]'});
+    assert.equal(users.length, 1);
+    assert.equal(users[0].profileId, profile1.id);
+  });
+
 });