tspace-mysql 1.2.4 → 1.2.5

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

@@ -9,6 +9,7 @@ export interface Relation {
     query?: any | undefined;
     relation?: Object | undefined;
     exists?: boolean | undefined;
+    oldVersion?: boolean | undefined;
 }
 export interface RelationQuery {
     name?: string;

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

@@ -231,7 +231,7 @@ declare class Model extends AbstractModel {
      * @property {string} relation.freezeTable
      * @return   {this}   this
      */
-    protected belongsToMany({ name, as, model, localKey, foreignKey, freezeTable, pivot }: Relation): this;
+    protected belongsToMany({ name, as, model, localKey, foreignKey, freezeTable, pivot, oldVersion }: Relation): this;
     /**
      * Assign the relation in model Objects
      * @param    {object}  relation registry relation in your model

package/dist/lib/tspace/Model.js

@@ -444,7 +444,7 @@ class Model extends AbstractModel_1.AbstractModel {
      * @property {string} relation.freezeTable
      * @return   {this}   this
      */
-    belongsToMany({ name, as, model, localKey, foreignKey, freezeTable, pivot }) {
+    belongsToMany({ name, as, model, localKey, foreignKey, freezeTable, pivot, oldVersion }) {
         const relation = {
             name,
             model,
@@ -454,6 +454,7 @@ class Model extends AbstractModel_1.AbstractModel {
             foreignKey,
             freezeTable,
             pivot,
+            oldVersion,
             query: null
         };
         this.$state.set('RELATION', [...this.$state.get('RELATION'), relation]);
@@ -1472,6 +1473,7 @@ class Model extends AbstractModel_1.AbstractModel {
         var _a, _b, _c, _d;
         const relation = relationModel.relation;
         const model = (_a = relationModel.model) === null || _a === void 0 ? void 0 : _a.name;
+        const oldVersion = relationModel.oldVersion;
         const table = relationModel.freezeTable
             ? relationModel.freezeTable
             : (_b = relationModel.query) === null || _b === void 0 ? void 0 : _b._tableName();
@@ -1516,7 +1518,7 @@ class Model extends AbstractModel_1.AbstractModel {
                 pluralize_1.default.singular((_d = relationModel.query) === null || _d === void 0 ? void 0 : _d._tableName())
             ].sort().join('_'));
         }
-        return { name, as, relation, table, localKey, foreignKey, model, pivot };
+        return { name, as, relation, table, localKey, foreignKey, model, pivot, oldVersion };
     }
     _handleSoftDelete() {
         if (this.$state.get('SOFT_DELETE')) {
@@ -1783,7 +1785,7 @@ class Model extends AbstractModel_1.AbstractModel {
     _belongsToMany(dataFromParent, relation) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const { name, foreignKey, pivot } = this._valueInRelation(relation);
+            const { name, foreignKey, localKey, pivot, oldVersion } = this._valueInRelation(relation);
             const pivotTable = String(((_a = relation.pivot) !== null && _a !== void 0 ? _a : pivot));
             const localKeyId = dataFromParent.map((parent) => {
                 const data = parent[foreignKey];
@@ -1792,7 +1794,7 @@ class Model extends AbstractModel_1.AbstractModel {
                 }
                 return data;
             }).filter((data) => data != null);
-            const dataPerentId = Array.from(new Set(localKeyId)).join(',') || [];
+            const dataPerentId = Array.from(new Set(localKeyId));
             if (!dataPerentId.length && this.$state.get('WITH_EXISTS'))
                 return [];
             const modelOther = new relation.model();
@@ -1800,35 +1802,53 @@ class Model extends AbstractModel_1.AbstractModel {
             const otherlocalKey = 'id';
             const otherforeignKey = this._valuePattern(`${other}Id`);
             const localKeyPivotTable = this._valuePattern([pluralize_1.default.singular(this._tableName()), foreignKey].join("_"));
-            const sqldataChilds = [
-                `${this.$constants('SELECT')}`,
-                `*`,
-                `${this.$constants('FROM')}`,
-                `${pivotTable}`,
-                `${this.$constants('WHERE')}`,
-                `${localKeyPivotTable} ${this.$constants('IN')} (${dataPerentId})`
-            ].join(' ');
-            let dataChilds = yield this.queryStatement(sqldataChilds);
+            const sql = new Model().copyModel(modelOther)
+                .whereReference(`\`${modelOther._tableName()}\`.\`${foreignKey}\``, `\`${pivotTable}\`.\`${localKey}\``)
+                .toString();
+            const queryChildModel = new Model();
+            queryChildModel.$state.set('TABLE_NAME', `\`${pivotTable}\``);
+            const sqldataChilds = queryChildModel
+                .whereIn(localKeyPivotTable, dataPerentId)
+                .when(relation.exists, (query) => query.whereExists(sql))
+                .toString();
+            const dataChilds = yield this.queryStatement(sqldataChilds);
             const otherId = dataChilds.map((sub) => sub[otherforeignKey]).filter((data) => data != null);
             const otherArrId = Array.from(new Set(otherId)) || [];
             const otherdataChilds = yield this.queryStatement(modelOther
-                .bind(this.$pool.get())
                 .whereIn(otherlocalKey, otherArrId)
                 .debug(this.$state.get('DEBUG'))
                 .toString());
-            dataChilds.forEach((sub) => {
-                otherdataChilds.forEach((otherSub) => {
-                    if (otherSub[otherlocalKey] === sub[otherforeignKey]) {
-                        sub[other] = otherSub;
-                    }
+            if (oldVersion) {
+                dataChilds.forEach((sub) => {
+                    otherdataChilds.forEach((otherSub) => {
+                        if (otherSub[otherlocalKey] === sub[otherforeignKey]) {
+                            sub[other] = otherSub;
+                        }
+                    });
                 });
-            });
+                dataFromParent.forEach((dataPerent) => {
+                    if (dataPerent[name] == null)
+                        dataPerent[name] = [];
+                    dataChilds.forEach((sub) => {
+                        if (sub[localKeyPivotTable] === dataPerent[foreignKey]) {
+                            dataPerent[name].push(sub);
+                        }
+                    });
+                });
+                if (this.$state.get('HIDDEN').length)
+                    this._hiddenColumnModel(dataFromParent);
+                return dataFromParent;
+            }
             dataFromParent.forEach((dataPerent) => {
                 if (dataPerent[name] == null)
                     dataPerent[name] = [];
                 dataChilds.forEach((sub) => {
                     if (sub[localKeyPivotTable] === dataPerent[foreignKey]) {
-                        dataPerent[name].push(sub);
+                        const data = otherdataChilds.find(u => u[foreignKey] === sub[localKey]);
+                        if (data != null) {
+                            data.pivot = Object.assign({}, sub);
+                            dataPerent[name].push(data);
+                        }
                     }
                 });
             });

package/package.json

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