tspace-mysql 1.2.1 → 1.2.3

package/README.md

@@ -45,12 +45,13 @@ DB_USERNAME = root
 DB_PASSWORD = password
 DB_DATABASE = database
 
-/** default
-    DB_CONNECTION_LIMIT = 30
-    DB_CONNECTION_ERROR = true
-    DB_QUEUE_LIMIT      = 25
-    DB_TIMEOUT          = 30000
-    DB_DATE_STRINGS     = true
+/** 
+ * @default
+ *  DB_CONNECTION_LIMIT = 10
+ *  DB_CONNECTION_ERROR = true
+ *  DB_QUEUE_LIMIT      = 0
+ *  DB_TIMEOUT          = 60000
+ *  DB_DATE_STRINGS     = true
 */
 
 ```
@@ -358,16 +359,31 @@ import { Model } from 'tspace-mysql'
 class User extends Model {
   constructor(){
     super()
-    this.useTimestamp() /** created_at , updated_at
     /**
      * 
-     * @Custom 
-     * 
+     * Assign setting global in your model
+     * @useMethod
+     *
+     * this.useDebug() 
+     * this.usePrimaryKey('id')
      * this.useTimestamp({
      *    createdAt : 'created_at',
      *    updatedAt : 'updated_at'
-     * }) 
-     */
+     * }) // runing a timestamp when insert or update
+     * this.useSoftDelete()
+     * this.useTable('users')
+     * this.useTableSingular() // 'user'
+     * this.useTablePlural() // 'users'
+     * this.usePattern('snake_case')   
+     * this.useUUID('uuid') // => runing a uuid (universally unique identifier) when insert new data
+     * this.useRegistry()
+     * this.useSchema({
+     *   id : Number,
+     *   username : String
+     *   created_at : Date,
+     *   updated_at : Date,
+     *  }) // validate type of schema when return result
+    */
 
     /*
      * the "snake case", plural name of the class will be used as the table name 
@@ -624,7 +640,7 @@ hook((result) => ...) // callback result to function
 hasOne({ name , model , localKey , foreignKey , freezeTable , as })
 hasMany({ name , model , localKey , foreignKey , freezeTable , as })
 belongsTo({ name , model , localKey , foreignKey , freezeTable , as })
-belongsToMany({ name , model , localKey , foreignKey , freezeTable , as })
+belongsToMany({ name , model , localKey , foreignKey , freezeTable , as , pivot })
 /** 
  * @relation using registry in your models
 */

package/dist/cli/generate/make.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const model_1 = __importDefault(require("../models/model"));
+const model_1 = __importDefault(require("./model"));
 const pluralize_1 = __importDefault(require("pluralize"));
 const lib_1 = require("../../lib");
 exports.default = (cmd) => {

package/dist/cli/generate/model.d.ts

@@ -0,0 +1,2 @@
+declare const Model: (model: string, npm: string) => string;
+export default Model;

package/dist/cli/generate/model.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const Model = (model, npm) => {
+    return `import { Model } from '${npm}'
+class ${model} extends Model {
+  constructor(){
+    super()
+    /**
+     * 
+     * Assign setting global in your model
+     * @useMethod
+     *
+     * this.useDebug() // => runing a uuid (universally unique identifier) when insert new data
+     * this.usePrimaryKey('id') // => runing a uuid (universally unique identifier) when insert new data
+     * this.useTimestamp({ createdAt : 'created_at' , updatedAt : 'updated_at' }) // runing a timestamp when insert or update
+     * this.useSoftDelete()
+     * this.useTable('users')
+     * this.useTableSingular() // 'user'
+     * this.useTablePlural() // 'users'
+     * this.usePattern('snake_case')   
+     * this.useUUID('uuid')
+     * this.useRegistry()
+    */
+  }
+}
+export { ${model} }
+export default ${model}
+`;
+};
+exports.default = Model;

package/dist/lib/connection/index.js

@@ -109,7 +109,7 @@ class PoolConnection {
                 "password"              : "",
                 "connectionLimit"       : "",
                 "dateStrings"           : "",
-                "connectTimeout"        : "",
+                "idleTimeout"           : "",
                 "waitForConnections"    : "",
                 "queueLimit"            : "",
                 "charset"               : ""

package/dist/lib/connection/options.js

@@ -24,9 +24,9 @@ const env = {
     USERNAME: process.env.DB_USERNAME || process.env.TSPACE_USERNAME,
     PASSWORD: process.env.DB_PASSWORD || process.env.TSPACE_PASSWORD || '',
     DATABASE: process.env.DB_DATABASE || process.env.TSPACE_DATABASE,
-    CONNECTION_LIMIT: process.env.DB_CONNECTION_LIMIT || process.env.TSPACE_CONNECTION_LIMIT || 151,
-    QUEUE_LIMIT: process.env.DB_QUEUE_LIMIT || process.env.TSPACE_QUEUE_LIMIT || 25,
-    TIMEOUT: process.env.DB_TIMEOUT || process.env.TSPACE_TIMEOUT || 1000 * 30,
+    CONNECTION_LIMIT: process.env.DB_CONNECTION_LIMIT || process.env.TSPACE_CONNECTION_LIMIT || 10,
+    QUEUE_LIMIT: process.env.DB_QUEUE_LIMIT || process.env.TSPACE_QUEUE_LIMIT || 0,
+    TIMEOUT: process.env.DB_TIMEOUT || process.env.TSPACE_TIMEOUT || 1000 * 60,
     CHARSET: process.env.DB_CHARSET || process.env.TSPACE_CHARSET || 'utf8mb4',
     CONNECTION_ERROR: process.env.DB_CONNECTION_ERROR || process.env.TSPACE_CONNECTION_ERROR || true,
     WAIT_FOR_CONNECTIONS: process.env.DB_WAIT_FOR_CONNECTIONS || process.env.TSPACE_WAIT_FOR_CONNECTIONS || true,

package/dist/lib/constants/index.js

@@ -151,6 +151,7 @@ const CONSTANTS = {
             CREATED_AT: 'created_at',
             UPDATED_AT: 'updated_at'
         },
+        SCHEMA: null
     }
 };
 exports.CONSTANTS = CONSTANTS;

package/dist/lib/tspace/Database.js

@@ -1283,16 +1283,14 @@ class Database extends AbstractDatabase_1.default {
                     throw new Error(`can't find property '${pluck}' of result`);
                 const r = newData[pluck] || null;
                 const hook = this.$state.get('HOOK');
-                if (hook)
-                    for (let i in hook)
-                        yield hook[i](r);
+                for (let i in hook)
+                    yield hook[i](r);
                 return r;
             }
             const r = (result === null || result === void 0 ? void 0 : result.shift()) || null;
             const hook = this.$state.get('HOOK');
-            if (hook)
-                for (let i in hook)
-                    yield hook[i](r);
+            for (let i in hook)
+                yield hook[i](r);
             return r;
         });
     }
@@ -1338,9 +1336,8 @@ class Database extends AbstractDatabase_1.default {
                     throw Object.assign({ message }, options);
                 }
                 const hook = this.$state.get('HOOK');
-                if (hook)
-                    for (let i in hook)
-                        yield hook[i](data);
+                for (let i in hook)
+                    yield hook[i](data);
                 return data;
             }
             const data = (result === null || result === void 0 ? void 0 : result.shift()) || null;
@@ -1351,9 +1348,8 @@ class Database extends AbstractDatabase_1.default {
                 throw Object.assign({ message }, options);
             }
             const hook = this.$state.get('HOOK');
-            if (hook)
-                for (let i in hook)
-                    yield hook[i](data);
+            for (let i in hook)
+                yield hook[i](data);
             return data;
         });
     }
@@ -1390,9 +1386,8 @@ class Database extends AbstractDatabase_1.default {
                     return resultArray;
                 }, []);
                 const hook = this.$state.get('HOOK');
-                if (hook)
-                    for (let i in hook)
-                        yield hook[i](data || []);
+                for (let i in hook)
+                    yield hook[i](data || []);
                 return data || [];
             }
             if (this.$state.get('PLUCK')) {
@@ -1402,15 +1397,13 @@ class Database extends AbstractDatabase_1.default {
                     throw new Error(`can't find property '${pluck}' of result`);
                 }
                 const hook = this.$state.get('HOOK');
-                if (hook)
-                    for (let i in hook)
-                        yield hook[i](newData || []);
+                for (let i in hook)
+                    yield hook[i](newData || []);
                 return newData || [];
             }
             const hook = this.$state.get('HOOK');
-            if (hook)
-                for (let i in hook)
-                    yield hook[i](result || []);
+            for (let i in hook)
+                yield hook[i](result || []);
             return result || [];
         });
     }

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

@@ -5,6 +5,7 @@ export interface Relation {
     localKey?: string | undefined;
     foreignKey?: string | undefined;
     freezeTable?: string | undefined;
+    pivot?: string | undefined;
     query?: any | undefined;
     relation?: Object | undefined;
 }
@@ -15,6 +16,7 @@ export interface RelationQuery {
     localKey?: string | undefined;
     foreignKey?: string | undefined;
     freezeTable?: string | undefined;
+    pivot?: string | undefined;
     query?: any | undefined;
     relation?: Object | undefined;
 }

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

@@ -15,10 +15,10 @@ declare class Model extends AbstractModel {
      */
     protected useRegistry(): this;
     /**
-    *
-    * Assign primary column in model
-    * @return {this} this
-    */
+     *
+     * Assign primary column in model
+     * @return {this} this
+     */
     protected usePrimaryKey(primary: string): this;
     /**
      * Assign generate uuid when creating in model
@@ -77,6 +77,15 @@ declare class Model extends AbstractModel {
      * @return {this} this
      */
     protected useTablePlural(): this;
+    /**
+     *
+     * Assign schema column in model
+     * @param {Object<Function>} schema type String Number and Date
+     * @return {this} this
+     */
+    protected useSchema(schema: {
+        [key: string]: Function;
+    }): this;
     /**
      * Build  method for relation in model
      * @param    {string} name name relation registry in your model
@@ -222,7 +231,7 @@ declare class Model extends AbstractModel {
      * @property {string} relation.freezeTable
      * @return   {this}   this
      */
-    protected belongsToMany({ name, as, model, localKey, foreignKey, freezeTable }: Relation): this;
+    protected belongsToMany({ name, as, model, localKey, foreignKey, freezeTable, pivot }: Relation): this;
     /**
      * Assign the relation in model Objects
      * @param    {object}  relation registry relation in your model
@@ -278,7 +287,7 @@ declare class Model extends AbstractModel {
      * @param    {function?} callback callback of query
      * @return   {this} this
      */
-    protected belongsToManyBuilder({ name, as, model, localKey, foreignKey, freezeTable }: RelationQuery, callback?: Function): this;
+    protected belongsToManyBuilder({ name, as, model, localKey, foreignKey, freezeTable, pivot }: RelationQuery, callback?: Function): this;
     /**
      * return only in trashed (data has been remove)
      * @return {promise}
@@ -540,6 +549,7 @@ declare class Model extends AbstractModel {
     * @return {this} this this
     */
     createNotExists(data: object): this;
+    getSchema(): Promise<any>;
     /**
      *
      * @override Method
@@ -566,13 +576,13 @@ declare class Model extends AbstractModel {
     private _handleSoftDelete;
     private _buildQueryModel;
     private _showOnly;
+    private _validateSchema;
     private _execute;
     private _executeGroup;
     private _relationMapData;
     private _handleRelationsExists;
     private _queryRelationsExists;
     private _relation;
-    private _handleBelongsToMany;
     private _belongsToMany;
     private _pagination;
     private _result;

package/dist/lib/tspace/Model.js

@@ -37,8 +37,7 @@ class Model extends AbstractModel_1.AbstractModel {
      * define for initialize of models
      * @return {void} void
      */
-    define() {
-    }
+    define() { }
     /**
      *
      * Assign function callback in model
@@ -49,10 +48,10 @@ class Model extends AbstractModel_1.AbstractModel {
         return this;
     }
     /**
-    *
-    * Assign primary column in model
-    * @return {this} this
-    */
+     *
+     * Assign primary column in model
+     * @return {this} this
+     */
     usePrimaryKey(primary) {
         this.$state.set('PRIMARY_KEY', primary);
         return this;
@@ -154,6 +153,16 @@ class Model extends AbstractModel_1.AbstractModel {
         this.$state.set('TABLE_NAME', `\`${pluralize_1.default.plural(table)}\``);
         return this;
     }
+    /**
+     *
+     * Assign schema column in model
+     * @param {Object<Function>} schema type String Number and Date
+     * @return {this} this
+     */
+    useSchema(schema) {
+        this.$state.set('SCHEMA', schema);
+        return this;
+    }
     /**
      * Build  method for relation in model
      * @param    {string} name name relation registry in your model
@@ -444,7 +453,7 @@ class Model extends AbstractModel_1.AbstractModel {
      * @property {string} relation.freezeTable
      * @return   {this}   this
      */
-    belongsToMany({ name, as, model, localKey, foreignKey, freezeTable }) {
+    belongsToMany({ name, as, model, localKey, foreignKey, freezeTable, pivot }) {
         const relation = {
             name,
             model,
@@ -453,6 +462,7 @@ class Model extends AbstractModel_1.AbstractModel {
             localKey,
             foreignKey,
             freezeTable,
+            pivot,
             query: null
         };
         this.$state.set('RELATION', [...this.$state.get('RELATION'), relation]);
@@ -576,7 +586,7 @@ class Model extends AbstractModel_1.AbstractModel {
      * @param    {function?} callback callback of query
      * @return   {this} this
      */
-    belongsToManyBuilder({ name, as, model, localKey, foreignKey, freezeTable }, callback) {
+    belongsToManyBuilder({ name, as, model, localKey, foreignKey, freezeTable, pivot }, callback) {
         const nameRelation = name == null
             ? this._functionRelationName()
             : String(name);
@@ -588,6 +598,7 @@ class Model extends AbstractModel_1.AbstractModel {
             localKey,
             foreignKey,
             freezeTable,
+            pivot,
             query: null
         };
         const r = this._handleRelationsQuery(nameRelation, relation);
@@ -1307,6 +1318,54 @@ class Model extends AbstractModel_1.AbstractModel {
         this.$state.set('SAVE', 'INSERT_NOT_EXISTS');
         return this;
     }
+    getSchema() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const sql = [
+                `${this.$constants('SHOW')}`,
+                `${this.$constants('COLUMNS')}`,
+                `${this.$constants('FROM')}`,
+                `\`${this.$state.get('TABLE_NAME').replace(/\`/g, '')}\``
+            ].join(' ');
+            const raw = yield this.queryStatement(sql);
+            const schemas = raw.map((r) => {
+                let schema = { [r.Field]: String };
+                const numberLists = [
+                    'tinyint',
+                    'smallint',
+                    'mediumint',
+                    'int',
+                    'bigint',
+                    'float',
+                    'double',
+                    'decimal',
+                    'real',
+                    'bit',
+                    'boolean',
+                    'serial'
+                ];
+                const dateAndTimeLists = [
+                    'date',
+                    'datetime',
+                    'time',
+                    'timestamp',
+                    'year'
+                ];
+                if (numberLists.includes(r.Type)) {
+                    schema = {
+                        [r.Field]: Number
+                    };
+                }
+                if (dateAndTimeLists.includes(r.Type)) {
+                    schema = {
+                        [r.Field]: Date
+                    };
+                }
+                return schema;
+            });
+            const result = Object.assign({}, ...schemas);
+            return result;
+        });
+    }
     /**
      *
      * @override Method
@@ -1314,6 +1373,7 @@ class Model extends AbstractModel_1.AbstractModel {
      */
     save() {
         return __awaiter(this, void 0, void 0, function* () {
+            this._validateMethod('save');
             const attributes = this.$attributes;
             if (attributes != null) {
                 while (true) {
@@ -1418,12 +1478,13 @@ class Model extends AbstractModel_1.AbstractModel {
         return (_a = this.$state.get('TABLE_NAME')) === null || _a === void 0 ? void 0 : _a.replace(/`/g, '');
     }
     _valueInRelation(relationModel) {
-        var _a, _b;
+        var _a, _b, _c, _d;
         const relation = relationModel.relation;
         const model = (_a = relationModel.model) === null || _a === void 0 ? void 0 : _a.name;
         const table = relationModel.freezeTable
             ? relationModel.freezeTable
             : (_b = relationModel.query) === null || _b === void 0 ? void 0 : _b._tableName();
+        let pivot = null;
         const name = relationModel.name;
         const as = relationModel.as;
         this._assertError(!model || model == null, 'not found model');
@@ -1459,8 +1520,12 @@ class Model extends AbstractModel_1.AbstractModel {
                 `${this.$state.get('PRIMARY_KEY')}`
             ].join('_'));
             foreignKey = 'id';
+            pivot = (_c = relationModel.pivot) !== null && _c !== void 0 ? _c : this._valuePattern([
+                pluralize_1.default.singular(this === null || this === void 0 ? void 0 : this._tableName()),
+                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 };
+        return { name, as, relation, table, localKey, foreignKey, model, pivot };
     }
     _handleSoftDelete() {
         if (this.$state.get('SOFT_DELETE')) {
@@ -1527,9 +1592,36 @@ class Model extends AbstractModel_1.AbstractModel {
         });
         return result;
     }
+    _validateSchema(results) {
+        const schema = this.$state.get('SCHEMA');
+        if (schema == null)
+            return;
+        if (!results.length)
+            return;
+        const typeOf = (data) => Object.prototype.toString.apply(data).slice(8, -1).toLocaleLowerCase();
+        for (const result of results) {
+            for (const key in result) {
+                const s = schema[key];
+                if (s == null)
+                    this._assertError(`not found this column [${key}] in schema`);
+                const regexDate = /[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])/;
+                const regexDateTime = /[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1]) (2[0-3]|[01][0-9]):[0-5][0-9]/;
+                if (regexDate.test(result[key]) || regexDateTime.test(result[key])) {
+                    if (typeOf(new Date(result[key])) === typeOf(new s()))
+                        continue;
+                    this._assertError(`this column [${key}] is invalid schema field type`);
+                }
+                if (typeOf(result[key]) === typeOf(new s()))
+                    continue;
+                this._assertError(`this column [${key}] is invalid schema field type`);
+            }
+        }
+        return this;
+    }
     _execute({ sql, type, message, options }) {
         return __awaiter(this, void 0, void 0, function* () {
             let result = yield this.queryStatement(sql);
+            this._validateSchema(result);
             if (!result.length)
                 return this._returnEmpty(type, result, message, options);
             const relations = this.$state.get('WITH');
@@ -1629,7 +1721,7 @@ class Model extends AbstractModel_1.AbstractModel {
             const relation = relations[index];
             if (!((_a = Object.keys(relation)) === null || _a === void 0 ? void 0 : _a.length))
                 continue;
-            const { localKey, foreignKey } = this._valueInRelation(relation);
+            const { localKey, foreignKey, pivot } = this._valueInRelation(relation);
             const query = relation.query;
             this._assertError(query == null, `unknown callback query in [relation : '${relation.name}']`);
             let clone = new Model().clone(query);
@@ -1641,6 +1733,21 @@ class Model extends AbstractModel_1.AbstractModel {
                     clone.whereExists(sql);
                 }
             }
+            if (relation.relation === this.$constants('RELATIONSHIP').belongsToMany) {
+                const sql = clone
+                    .bind(this.$pool.get())
+                    .whereReference(`\`${this._tableName()}\`.\`${localKey}\``, `\`${query._tableName()}\`.\`${foreignKey}\``)
+                    .toString();
+                this.whereExists(sql);
+                const thisPivot = new Model();
+                thisPivot.$state.set('TABLE_NAME', `\`${pivot}\``);
+                const sqlPivot = thisPivot
+                    .bind(this.$pool.get())
+                    .whereReference(`\`${this._tableName()}\`.\`${foreignKey}\``, `\`${pivot}\`.\`${this._valuePattern([pluralize_1.default.singular(this._tableName()), foreignKey].join("_"))}\``)
+                    .toString();
+                this.whereExists(sqlPivot);
+                continue;
+            }
             const sql = clone
                 .bind(this.$pool.get())
                 .whereReference(`\`${this._tableName()}\`.\`${localKey}\``, `\`${query._tableName()}\`.\`${foreignKey}\``)
@@ -1676,66 +1783,15 @@ class Model extends AbstractModel_1.AbstractModel {
             return dataFromRelation;
         });
     }
-    _handleBelongsToMany(dataFromParent, relation, pivotTable) {
+    _belongsToMany(dataFromParent, relation) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.$state.get('WITH_EXISTS')) {
-                let { name, localKey, foreignKey, model, table } = this._valueInRelation(relation);
-                const localKeyId = dataFromParent.map((parent) => {
-                    const data = parent[localKey];
-                    if (!parent.hasOwnProperty(localKey)) {
-                        this._assertError(data == null, "unknown relationship without primary or foreign key");
-                    }
-                    return data;
-                }).filter((data) => data != null);
-                const dataPerentId = Array.from(new Set(localKeyId)).join(',') || [];
-                if (!dataPerentId.length && this.$state.get('WITH_EXISTS'))
-                    return [];
-                const modelOther = new relation.model();
-                const other = this._classToTableName(modelOther.constructor.name, { singular: true });
-                const otherlocalKey = 'id';
-                const otherforeignKey = this._valuePattern(`${other}Id`);
-                const sqldataChilds = [
-                    `${this.$constants('SELECT')}`,
-                    `*`,
-                    `${this.$constants('FROM')}`,
-                    `${pivotTable}`,
-                    `${this.$constants('WHERE')}`,
-                    `${otherforeignKey} ${this.$constants('IN')} (${dataPerentId})`
-                ].join(' ');
-                let 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) => {
-                    sub[other] = [];
-                    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[localKey] === dataPerent[otherforeignKey]) {
-                            dataPerent[name].push(sub);
-                        }
-                    });
-                });
-                if (this.$state.get('HIDDEN').length)
-                    this._hiddenColumnModel(dataFromParent);
-                return dataFromParent;
-            }
-            let { name, localKey, foreignKey } = this._valueInRelation(relation);
+            const { name, foreignKey, pivot } = this._valueInRelation(relation);
+            const pivotTable = String(((_a = relation.pivot) !== null && _a !== void 0 ? _a : pivot));
             const localKeyId = dataFromParent.map((parent) => {
-                const data = parent[localKey];
-                if (!parent.hasOwnProperty(localKey)) {
-                    this._assertError(data == null, "unknown relationship without primary or foreign key");
+                const data = parent[foreignKey];
+                if (!parent.hasOwnProperty(foreignKey)) {
+                    this._assertError(data == null, `unknown relationship without primary or foreign key in relation : [${relation === null || relation === void 0 ? void 0 : relation.name}]`);
                 }
                 return data;
             }).filter((data) => data != null);
@@ -1746,13 +1802,14 @@ class Model extends AbstractModel_1.AbstractModel {
             const other = this._classToTableName(modelOther.constructor.name, { singular: true });
             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')}`,
-                `${foreignKey} ${this.$constants('IN')} (${dataPerentId})`
+                `${localKeyPivotTable} ${this.$constants('IN')} (${dataPerentId})`
             ].join(' ');
             let dataChilds = yield this.queryStatement(sqldataChilds);
             const otherId = dataChilds.map((sub) => sub[otherforeignKey]).filter((data) => data != null);
@@ -1763,7 +1820,6 @@ class Model extends AbstractModel_1.AbstractModel {
                 .debug(this.$state.get('DEBUG'))
                 .toString());
             dataChilds.forEach((sub) => {
-                sub[other] = [];
                 otherdataChilds.forEach((otherSub) => {
                     if (otherSub[otherlocalKey] === sub[otherforeignKey]) {
                         sub[other] = otherSub;
@@ -1774,7 +1830,7 @@ class Model extends AbstractModel_1.AbstractModel {
                 if (dataPerent[name] == null)
                     dataPerent[name] = [];
                 dataChilds.forEach((sub) => {
-                    if (sub[foreignKey] === dataPerent[localKey]) {
+                    if (sub[localKeyPivotTable] === dataPerent[foreignKey]) {
                         dataPerent[name].push(sub);
                     }
                 });
@@ -1784,27 +1840,6 @@ class Model extends AbstractModel_1.AbstractModel {
             return dataFromParent;
         });
     }
-    _belongsToMany(dataFromParent, relation) {
-        var _a, _b;
-        return __awaiter(this, void 0, void 0, function* () {
-            const local = this._classToTableName(this.constructor.name, { singular: true });
-            const modelOther = new relation.model();
-            const other = this._classToTableName(modelOther.constructor.name, { singular: true });
-            try {
-                const pivotTable = (_a = relation.freezeTable) !== null && _a !== void 0 ? _a : `${local}_${other}`;
-                return yield this._handleBelongsToMany(dataFromParent, relation, pivotTable);
-            }
-            catch (err) {
-                try {
-                    const pivotTable = (_b = relation.freezeTable) !== null && _b !== void 0 ? _b : `${other}_${local}`;
-                    return yield this._handleBelongsToMany(dataFromParent, relation, pivotTable);
-                }
-                catch (e) {
-                    throw new Error(err.message);
-                }
-            }
-        });
-    }
     _pagination(data) {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
@@ -1896,16 +1931,14 @@ class Model extends AbstractModel_1.AbstractModel {
             if (this._isPatternSnakeCase()) {
                 const empty = this.$utils.snakeCase(this._result(emptyData));
                 const hook = this.$state.get('HOOK');
-                if (hook === null || hook === void 0 ? void 0 : hook.length)
-                    for (let i in hook)
-                        yield hook[i](empty);
+                for (let i in hook)
+                    yield hook[i](empty);
                 return empty;
             }
             const empty = this._result(emptyData);
             const hook = this.$state.get('HOOK');
-            if (hook === null || hook === void 0 ? void 0 : hook.length)
-                for (let i in hook)
-                    yield hook[i](empty);
+            for (let i in hook)
+                yield hook[i](empty);
             return empty;
         });
     }
@@ -1980,9 +2013,8 @@ class Model extends AbstractModel_1.AbstractModel {
                 }
             }
             const hook = this.$state.get('HOOK');
-            if (hook === null || hook === void 0 ? void 0 : hook.length)
-                for (let i in hook)
-                    yield hook[i](result);
+            for (let i in hook)
+                yield hook[i](result);
             return result;
         });
     }
@@ -2222,15 +2254,13 @@ class Model extends AbstractModel_1.AbstractModel {
                 const result = (data === null || data === void 0 ? void 0 : data.shift()) || null;
                 this.$state.set('RESULT', result);
                 const hook = this.$state.get('HOOK');
-                if (hook === null || hook === void 0 ? void 0 : hook.length)
-                    for (let i in hook)
-                        yield hook[i](result);
+                for (let i in hook)
+                    yield hook[i](result);
                 return result;
             }
             const hook = this.$state.get('HOOK');
-            if (hook === null || hook === void 0 ? void 0 : hook.length)
-                for (let i in hook)
-                    yield hook[i](result || []);
+            for (let i in hook)
+                yield hook[i](result || []);
             return null;
         });
     }
@@ -2373,12 +2403,27 @@ class Model extends AbstractModel_1.AbstractModel {
                     'updateOrCreate',
                     'updateOrInsert',
                     'insertOrUpdate',
-                    'update'
+                    'update',
+                    'delete'
                 ];
                 const findMethodNotAllowed = methodCallings.find((methodCalling) => methodsNotAllowed.includes(methodCalling));
                 this._assertError(methodCallings.some((methodCalling) => methodsNotAllowed.includes(methodCalling)), `this method ${method} can't using method : [ ${findMethodNotAllowed} ]`);
                 break;
             }
+            case 'save': {
+                const methodCallings = this.$logger.get();
+                const methodsSomeAllowed = [
+                    'create',
+                    'createNotExists',
+                    'updateOrCreate',
+                    'updateOrInsert',
+                    'insertOrUpdate',
+                    'update',
+                    'delete'
+                ];
+                this._assertError(!methodCallings.some((methodCalling) => methodsSomeAllowed.includes(methodCalling)), `this ${method} method need some : [ ${methodsSomeAllowed.join(', ')} ] methods`);
+                break;
+            }
         }
     }
     _initialModel() {

package/dist/lib/utils/index.js

@@ -123,7 +123,7 @@ const camelCase = (obj) => {
 const consoleDebug = (debug) => {
     if (debug == null)
         return;
-    console.log(`-----\n\x1b[33m${debug.replace(/(\r\n|\n|\r|\t)/gm, "").trim()}\x1b[0m`);
+    console.log(`\n\x1b[33m${debug.replace(/(\r\n|\n|\r|\t)/gm, "").trim()};\x1b[0m`);
 };
 const faker = (value) => {
     if (!value.search('timestamp'))

package/package.json

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