tspace-mysql 1.1.0 → 1.1.1

package/dist/lib/tspace/Database.js

@@ -187,7 +187,7 @@ var Database = /** @class */ (function (_super) {
         }
         var select = '*';
         if (columns === null || columns === void 0 ? void 0 : columns.length)
-            select = columns.join(',');
+            select = columns.join(', ');
         this.$db.set('SELECT', "".concat(this.$constants('SELECT'), " ").concat(select));
         return this;
     };

package/dist/lib/tspace/Model.d.ts

@@ -485,11 +485,11 @@ declare class Model extends AbstractModel {
      */
     faker(rows?: number): Promise<any>;
     /**
-    *
-    * @override Method
-    * @param {number} id
-    * @return {this}
-    */
+     *
+     * @override Method
+     * @param {number} id
+     * @return {this}
+     */
     whereUser(id: number): this;
     private _queryStatementModel;
     private _actionStatementModel;

package/dist/lib/tspace/Model.js

@@ -1519,11 +1519,11 @@ var Model = /** @class */ (function (_super) {
         });
     };
     /**
-    *
-    * @override Method
-    * @param {number} id
-    * @return {this}
-    */
+     *
+     * @override Method
+     * @param {number} id
+     * @return {this}
+     */
     Model.prototype.whereUser = function (id) {
         var column = this._valuePattern('userId');
         id = this.$utils.escape(id);
@@ -1918,6 +1918,7 @@ var Model = /** @class */ (function (_super) {
         var _a;
         return __awaiter(this, void 0, void 0, function () {
             var _b, localKey, foreignKey, localKeyId, dataPerentId, query, dataFromRelation;
+            var _this = this;
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
@@ -1925,12 +1926,15 @@ var Model = /** @class */ (function (_super) {
                             return [2 /*return*/, []];
                         _b = this._valueInRelation(relation), localKey = _b.localKey, foreignKey = _b.foreignKey;
                         localKeyId = parents.map(function (parent) {
-                            return parent[localKey];
+                            var data = parent[localKey];
+                            if (!parent.hasOwnProperty(localKey)) {
+                                _this._assertError(data == null, "unknown relationship without primary or foreign key");
+                            }
+                            return data;
                         }).filter(function (data) { return data != null; });
                         dataPerentId = Array.from(new Set(localKeyId)) || [];
                         if (!dataPerentId.length && this.$db.get('WITH_EXISTS'))
                             return [2 /*return*/, []];
-                        this._assertError(!dataPerentId.length, "unknown relationship without primary or foreign key");
                         return [4 /*yield*/, relation.query];
                     case 1:
                         query = _c.sent();
@@ -1950,15 +1954,21 @@ var Model = /** @class */ (function (_super) {
     Model.prototype._handleBelongsToMany = function (dataFromParent, relation, pivotTable) {
         return __awaiter(this, void 0, void 0, function () {
             var _a, name, localKey, foreignKey, localKeyId, dataPerentId, modelOther, other, otherlocalKey, otherforeignKey, sqldataChilds, dataChilds, otherId, otherArrId, otherdataChilds;
+            var _this = this;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         _a = this._valueInRelation(relation), name = _a.name, localKey = _a.localKey, foreignKey = _a.foreignKey;
-                        localKeyId = dataFromParent.map(function (dataPerent) {
-                            return dataPerent[localKey];
+                        localKeyId = dataFromParent.map(function (parent) {
+                            var data = parent[localKey];
+                            if (!parent.hasOwnProperty(localKey)) {
+                                _this._assertError(data == null, "unknown relationship without primary or foreign key");
+                            }
+                            return data;
                         }).filter(function (data) { return data != null; });
                         dataPerentId = Array.from(new Set(localKeyId)).join(',') || [];
-                        this._assertError(!dataPerentId.length, "unknown relationship without primary or foreign key");
+                        if (!dataPerentId.length && this.$db.get('WITH_EXISTS'))
+                            return [2 /*return*/, []];
                         modelOther = new relation.model();
                         other = this._classToTableName(modelOther.constructor.name, { singular: true });
                         otherlocalKey = 'id';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tspace-mysql",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "mysql query builder object relational mapping",
   "main": "dist/lib/index.js",
   "types": "dist/lib/index.d.ts",