Skip to content

Commit e3cfef4

Browse files
committed
Stable Version 0.11.3
1 parent 0eca2c7 commit e3cfef4

File tree

2 files changed

+19
-15
lines changed

2 files changed

+19
-15
lines changed

dist/js-data-sql.js

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@ module.exports =
5353

5454
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; }
5555

56-
var knex = __webpack_require__(1);
57-
var JSData = __webpack_require__(2);
58-
var map = __webpack_require__(3);
59-
var underscore = __webpack_require__(4);
56+
var knex = __webpack_require__(2);
57+
var JSData = __webpack_require__(3);
58+
var map = __webpack_require__(4);
59+
var underscore = __webpack_require__(1);
6060
var unique = __webpack_require__(5);
6161
var toString = __webpack_require__(6);
6262
var DSUtils = JSData.DSUtils;
@@ -123,14 +123,18 @@ module.exports =
123123

124124
var relation = _localResourceConfig$relationList$filter2[0];
125125

126-
var _table = getTable(localResourceConfig);
127-
var localId = _table + '.' + relation.localKey;
126+
if (relation) {
127+
var _table = getTable(localResourceConfig);
128+
var localId = _table + '.' + relation.localKey;
128129

129-
var relationTable = getTable(relationResourceConfig);
130-
var foreignId = relationTable + '.' + relationResourceConfig.idAttribute;
130+
var relationTable = getTable(relationResourceConfig);
131+
var foreignId = relationTable + '.' + relationResourceConfig.idAttribute;
131132

132-
query = query.join(relationTable, localId, foreignId);
133-
joinedTables.push(relationPath.join('.'));
133+
query = query.join(relationTable, localId, foreignId);
134+
joinedTables.push(relationPath.join('.'));
135+
} else {
136+
// local column
137+
}
134138
}
135139
localResourceConfig = relationResourceConfig;
136140
};
@@ -471,25 +475,25 @@ module.exports =
471475
/* 1 */
472476
/***/ function(module, exports) {
473477

474-
module.exports = require("knex");
478+
module.exports = require("mout/string/underscore");
475479

476480
/***/ },
477481
/* 2 */
478482
/***/ function(module, exports) {
479483

480-
module.exports = require("js-data");
484+
module.exports = require("knex");
481485

482486
/***/ },
483487
/* 3 */
484488
/***/ function(module, exports) {
485489

486-
module.exports = require("mout/array/map");
490+
module.exports = require("js-data");
487491

488492
/***/ },
489493
/* 4 */
490494
/***/ function(module, exports) {
491495

492-
module.exports = require("mout/string/underscore");
496+
module.exports = require("mout/array/map");
493497

494498
/***/ },
495499
/* 5 */

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "js-data-sql",
33
"description": "Postgres/MySQL/MariaDB/SQLite3 adapter for js-data.",
4-
"version": "0.11.2",
4+
"version": "0.11.3",
55
"homepage": "http://www.js-data.io/docs/dssqladapter",
66
"repository": {
77
"type": "git",

0 commit comments

Comments
 (0)