@@ -53,10 +53,10 @@ module.exports =
53
53
54
54
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 ; }
55
55
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 ) ;
60
60
var unique = __webpack_require__ ( 5 ) ;
61
61
var toString = __webpack_require__ ( 6 ) ;
62
62
var DSUtils = JSData . DSUtils ;
@@ -123,14 +123,18 @@ module.exports =
123
123
124
124
var relation = _localResourceConfig$relationList$filter2 [ 0 ] ;
125
125
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 ;
128
129
129
- var relationTable = getTable ( relationResourceConfig ) ;
130
- var foreignId = relationTable + '.' + relationResourceConfig . idAttribute ;
130
+ var relationTable = getTable ( relationResourceConfig ) ;
131
+ var foreignId = relationTable + '.' + relationResourceConfig . idAttribute ;
131
132
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
+ }
134
138
}
135
139
localResourceConfig = relationResourceConfig ;
136
140
} ;
@@ -471,25 +475,25 @@ module.exports =
471
475
/* 1 */
472
476
/***/ function ( module , exports ) {
473
477
474
- module . exports = require ( "knex " ) ;
478
+ module . exports = require ( "mout/string/underscore " ) ;
475
479
476
480
/***/ } ,
477
481
/* 2 */
478
482
/***/ function ( module , exports ) {
479
483
480
- module . exports = require ( "js-data " ) ;
484
+ module . exports = require ( "knex " ) ;
481
485
482
486
/***/ } ,
483
487
/* 3 */
484
488
/***/ function ( module , exports ) {
485
489
486
- module . exports = require ( "mout/array/map " ) ;
490
+ module . exports = require ( "js-data " ) ;
487
491
488
492
/***/ } ,
489
493
/* 4 */
490
494
/***/ function ( module , exports ) {
491
495
492
- module . exports = require ( "mout/string/underscore " ) ;
496
+ module . exports = require ( "mout/array/map " ) ;
493
497
494
498
/***/ } ,
495
499
/* 5 */
0 commit comments