Merge pull request #62 from js-data/develop

Stable Version 0.11.12

Author: techniq

dist/js-data-sql.js

@@ -250,8 +250,9 @@ module.exports =
 	      var instance = undefined;
 	      options = options || {};
 	      options.with = options.with || [];
+	      var table = getTable(resourceConfig);
 	      var query = options && options.transaction || this.query;
-	      return query.select('*').from(getTable(resourceConfig)).where(resourceConfig.idAttribute, (0, _lang.toString)(id)).then(function (rows) {
+	      return query.select(table + '.*').from(table).where(table + '.' + resourceConfig.idAttribute, (0, _lang.toString)(id)).then(function (rows) {
 	        if (!rows.length) {
 	          return _bluebird2.default.reject(new Error('Not Found!'));
 	        } else {
@@ -464,7 +465,7 @@ module.exports =
 	                if (v === null) {
 	                  query = query.whereNull(field);
 	                } else {
-	                  query.where(field, v);
+	                  query = query.where(field, v);
 	                }
 	              } else if (op === '!=' || op === '!==') {
 	                if (v === null) {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "js-data-sql",
   "description": "Postgres/MySQL/MariaDB/SQLite3 adapter for js-data.",
-  "version": "0.11.9",
+  "version": "0.11.12",
   "homepage": "http://www.js-data.io/docs/dssqladapter",
   "repository": {
     "type": "git",

src/index.js

@@ -174,11 +174,12 @@ class DSSqlAdapter {
     let instance
     options = options || {}
     options.with = options.with || []
+    let table = getTable(resourceConfig);
     let query = options && options.transaction || this.query
     return query
-      .select('*')
-      .from(getTable(resourceConfig))
-      .where(resourceConfig.idAttribute, toString(id))
+      .select(`${table}.*`)
+      .from(table)
+      .where(`${table}.${resourceConfig.idAttribute}`, toString(id))
       .then(rows => {
         if (!rows.length) {
           return Promise.reject(new Error('Not Found!'))
@@ -362,7 +363,7 @@ class DSSqlAdapter {
               if (v === null) {
                 query = query.whereNull(field)
               } else {
-                query.where(field, v)
+                query = query.where(field, v)
               }
             } else if (op === '!=' || op === '!==') {
               if (v === null) {