tspace-mysql 1.6.6-dev.1.2 → 1.6.7

package/build/lib/core/Model.js

@@ -26,6 +26,7 @@ let globalSettings = {
     debug: false,
     uuid: false,
     timestamp: false,
+    pattern: false,
     logger: {
         selected: false,
         inserted: false,
@@ -2068,7 +2069,6 @@ class Model extends AbstractModel_1.AbstractModel {
         if (typeof column === 'object') {
             return this.whereObject(column);
         }
-        const c = this._columnPattern(String(column));
         [value, operator] = this._valueAndOperator(value, operator, arguments.length === 2);
         value = this.$utils.escape(value);
         value = this._valueTrueFalse(value);
@@ -2082,7 +2082,7 @@ class Model extends AbstractModel_1.AbstractModel {
             ...this.$state.get('WHERE'),
             [
                 this.$state.get('WHERE').length ? `${this.$constants('AND')}` : '',
-                `${this.bindColumn(String(c))}`,
+                `${this.bindColumn(String(column))}`,
                 `${operator}`,
                 `${this._checkValueHasRaw(value)}`
             ].join(' ')
@@ -2098,7 +2098,6 @@ class Model extends AbstractModel_1.AbstractModel {
      */
     orWhere(column, operator, value) {
         [value, operator] = this._valueAndOperator(value, operator, arguments.length === 2);
-        const c = this._columnPattern(String(column));
         value = this.$utils.escape(value);
         value = this._valueTrueFalse(value);
         if (value === null) {
@@ -2111,7 +2110,7 @@ class Model extends AbstractModel_1.AbstractModel {
             ...this.$state.get('WHERE'),
             [
                 this.$state.get('WHERE').length ? `${this.$constants('OR')}` : '',
-                `${this.bindColumn(String(c))}`,
+                `${this.bindColumn(String(column))}`,
                 `${operator}`,
                 `${this._checkValueHasRaw(value)}`
             ].join(' ')
@@ -2181,7 +2180,7 @@ class Model extends AbstractModel_1.AbstractModel {
         for (let column in columns) {
             const operator = '=';
             const value = this.$utils.escape(columns[column]);
-            const c = this._columnPattern(String(column));
+            const c = String(column);
             if (value === null) {
                 this.whereNull(column);
                 continue;
@@ -2201,51 +2200,51 @@ class Model extends AbstractModel_1.AbstractModel {
             }
             switch (useOp.op) {
                 case 'IN': {
-                    this.whereIn(column, Array.isArray(useOp.value) ? useOp.value : useOp.value.split(','));
+                    this.whereIn(c, Array.isArray(useOp.value) ? useOp.value : useOp.value.split(','));
                     break;
                 }
                 case '|IN': {
-                    this.orWhereIn(column, Array.isArray(useOp.value) ? useOp.value : useOp.value.split(','));
+                    this.orWhereIn(c, Array.isArray(useOp.value) ? useOp.value : useOp.value.split(','));
                     break;
                 }
                 case 'QUERY': {
-                    this.whereSubQuery(column, useOp.value);
+                    this.whereSubQuery(c, useOp.value);
                     break;
                 }
                 case '!QUERY': {
-                    this.orWhereSubQuery(column, useOp.value);
+                    this.orWhereSubQuery(c, useOp.value);
                     break;
                 }
                 case 'NOT IN': {
-                    this.whereNotIn(column, Array.isArray(useOp.value) ? useOp.value : useOp.value.split(','));
+                    this.whereNotIn(c, Array.isArray(useOp.value) ? useOp.value : useOp.value.split(','));
                     break;
                 }
                 case '|NOT IN': {
-                    this.orWhereNotIn(column, Array.isArray(useOp.value) ? useOp.value : useOp.value.split(','));
+                    this.orWhereNotIn(c, Array.isArray(useOp.value) ? useOp.value : useOp.value.split(','));
                     break;
                 }
                 case 'IS NULL': {
-                    this.whereNull(column);
+                    this.whereNull(c);
                     break;
                 }
                 case '|IS NULL': {
-                    this.orWhereNull(column);
+                    this.orWhereNull(c);
                     break;
                 }
                 case 'IS NOT NULL': {
-                    this.whereNotNull(column);
+                    this.whereNotNull(c);
                     break;
                 }
                 case '|IS NOT NULL': {
-                    this.orWhereNotNull(column);
+                    this.orWhereNotNull(c);
                     break;
                 }
                 default: {
                     if (useOp.op.includes('|')) {
-                        this.orWhere(column, useOp.op.replace('|', ''), useOp.value);
+                        this.orWhere(c, useOp.op.replace('|', ''), useOp.value);
                         break;
                     }
-                    this.where(column, useOp.op, useOp.value);
+                    this.where(c, useOp.op, useOp.value);
                 }
             }
         }
@@ -2263,18 +2262,29 @@ class Model extends AbstractModel_1.AbstractModel {
     whereJSON(column, { key, value, operator }) {
         value = this.$utils.escape(value);
         value = this._valueTrueFalse(value);
-        const c = this._columnPattern(String(column));
         this.$state.set('WHERE', [
             ...this.$state.get('WHERE'),
             [
                 this.$state.get('WHERE').length ? `${this.$constants('AND')}` : '',
-                `${this.bindColumn(c)}->>'$.${key}'`,
+                `${this.bindColumn(String(column))}->>'$.${key}'`,
                 `${operator == null ? "=" : operator.toLocaleUpperCase()}`,
                 `${this._checkValueHasRaw(value)}`
             ].join(' ')
         ]);
         return this;
     }
+    /**
+     * @override
+     * @param    {string} column
+     * @param    {object}  property object { key , value , operator }
+     * @property {string}  property.key
+     * @property {string}  property.value
+     * @property {string?} property.operator
+     * @returns   {this}
+     */
+    whereJson(column, { key, value, operator }) {
+        return this.whereJSON(column, { key, value, operator });
+    }
     /**
      * @override
      * @param {number} userId
@@ -2282,7 +2292,6 @@ class Model extends AbstractModel_1.AbstractModel {
      * @returns {this}
      */
     whereUser(userId, column = 'user_id') {
-        column = this._columnPattern(String(column));
         this.$state.set('WHERE', [
             ...this.$state.get('WHERE'),
             [
@@ -2302,7 +2311,6 @@ class Model extends AbstractModel_1.AbstractModel {
         if (!Array.isArray(array)) {
             throw this._assertError("This method must require the value to be an array only.");
         }
-        const c = this._columnPattern(String(column));
         const values = array.length
             ? `${array.map((value) => this._checkValueHasRaw(this.$utils.escape(value))).join(',')}`
             : this.$constants(this.$constants('NULL'));
@@ -2310,7 +2318,7 @@ class Model extends AbstractModel_1.AbstractModel {
             ...this.$state.get('WHERE'),
             [
                 this.$state.get('WHERE').length ? `${this.$constants('AND')}` : '',
-                `${this.bindColumn(c)}`,
+                `${this.bindColumn(String(column))}`,
                 `${this.$constants('IN')}`,
                 `(${values})`
             ].join(' ')
@@ -2327,7 +2335,6 @@ class Model extends AbstractModel_1.AbstractModel {
         if (!Array.isArray(array)) {
             throw this._assertError("This method must require the value to be an array only.");
         }
-        const c = this._columnPattern(String(column));
         const values = array.length
             ? `${array.map((value) => this._checkValueHasRaw(this.$utils.escape(value))).join(',')}`
             : this.$constants(this.$constants('NULL'));
@@ -2335,7 +2342,7 @@ class Model extends AbstractModel_1.AbstractModel {
             ...this.$state.get('WHERE'),
             [
                 this.$state.get('WHERE').length ? `${this.$constants('OR')}` : '',
-                `${this.bindColumn(c)}`,
+                `${this.bindColumn(String(column))}`,
                 `${this.$constants('IN')}`,
                 `(${values})`
             ].join(' ')
@@ -2352,7 +2359,6 @@ class Model extends AbstractModel_1.AbstractModel {
         if (!Array.isArray(array)) {
             throw this._assertError("This method must require the value to be an array only.");
         }
-        const c = this._columnPattern(String(column));
         if (!array.length)
             return this;
         const values = `${array.map((value) => this._checkValueHasRaw(this.$utils.escape(value))).join(',')}`;
@@ -2360,7 +2366,7 @@ class Model extends AbstractModel_1.AbstractModel {
             ...this.$state.get('WHERE'),
             [
                 this.$state.get('WHERE').length ? `${this.$constants('AND')}` : '',
-                `${this.bindColumn(c)}`,
+                `${this.bindColumn(String(column))}`,
                 `${this.$constants('NOT_IN')}`,
                 `(${values})`
             ].join(' ')
@@ -2377,7 +2383,6 @@ class Model extends AbstractModel_1.AbstractModel {
         if (!Array.isArray(array)) {
             this._assertError(`This 'orWhereNotIn' method is required array only`);
         }
-        const c = this._columnPattern(String(column));
         if (!array.length)
             return this;
         const values = `${array.map((value) => this._checkValueHasRaw(this.$utils.escape(value))).join(',')}`;
@@ -2385,7 +2390,7 @@ class Model extends AbstractModel_1.AbstractModel {
             ...this.$state.get('WHERE'),
             [
                 this.$state.get('WHERE').length ? `${this.$constants('OR')}` : '',
-                `${this.bindColumn(c)}`,
+                `${this.bindColumn(String(column))}`,
                 `${this.$constants('NOT_IN')}`,
                 `(${values})`
             ].join(' ')
@@ -2399,12 +2404,11 @@ class Model extends AbstractModel_1.AbstractModel {
      * @returns {this}
      */
     whereSubQuery(column, subQuery) {
-        const c = this._columnPattern(String(column));
         this.$state.set('WHERE', [
             ...this.$state.get('WHERE'),
             [
                 this.$state.get('WHERE').length ? `${this.$constants('AND')}` : '',
-                `${this.bindColumn(c)}`,
+                `${this.bindColumn(String(column))}`,
                 `${this.$constants('IN')}`,
                 `(${subQuery})`
             ].join(' ')
@@ -2418,12 +2422,11 @@ class Model extends AbstractModel_1.AbstractModel {
      * @returns {this}
      */
     whereNotSubQuery(column, subQuery) {
-        const c = this._columnPattern(String(column));
         this.$state.set('WHERE', [
             ...this.$state.get('WHERE'),
             [
                 this.$state.get('WHERE').length ? `${this.$constants('AND')}` : '',
-                `${this.bindColumn(c)}`,
+                `${this.bindColumn(String(column))}`,
                 `${this.$constants('NOT_IN')}`,
                 `(${subQuery})`
             ].join(' ')
@@ -2437,14 +2440,13 @@ class Model extends AbstractModel_1.AbstractModel {
      * @returns {this}
      */
     orWhereSubQuery(column, subQuery) {
-        const c = this._columnPattern(String(column));
         this.$state.set('WHERE', [
             ...this.$state.get('WHERE'),
             [
                 this.$state.get('WHERE').length
                     ? `${this.$constants('OR')}`
                     : '',
-                `${this.bindColumn(c)}`,
+                `${this.bindColumn(String(column))}`,
                 `${this.$constants('IN')}`,
                 `(${subQuery})`
             ].join(' ')
@@ -2458,14 +2460,13 @@ class Model extends AbstractModel_1.AbstractModel {
      * @returns {this}
      */
     orWhereNotSubQuery(column, subQuery) {
-        const c = this._columnPattern(String(column));
         this.$state.set('WHERE', [
             ...this.$state.get('WHERE'),
             [
                 this.$state.get('WHERE').length
                     ? `${this.$constants('OR')}`
                     : '',
-                `${this.bindColumn(c)}`,
+                `${this.bindColumn(String(column))}`,
                 `${this.$constants('NOT_IN')}`,
                 `(${subQuery})`
             ].join(' ')
@@ -2482,13 +2483,12 @@ class Model extends AbstractModel_1.AbstractModel {
         if (!Array.isArray(array)) {
             throw this._assertError("This method must require the value to be an array only.");
         }
-        const c = this._columnPattern(String(column));
         if (!array.length) {
             this.$state.set('WHERE', [
                 ...this.$state.get('WHERE'),
                 [
                     this.$state.get('WHERE').length ? `${this.$constants('AND')}` : '',
-                    `${this.bindColumn(c)}`,
+                    `${this.bindColumn(String(column))}`,
                     `${this.$constants('BETWEEN')}`,
                     `${this.$constants(this.$constants('NULL'))}`,
                     `${this.$constants('AND')}`,
@@ -2502,7 +2502,7 @@ class Model extends AbstractModel_1.AbstractModel {
             ...this.$state.get('WHERE'),
             [
                 this.$state.get('WHERE').length ? `${this.$constants('AND')}` : '',
-                `${this.bindColumn(c)}`,
+                `${this.bindColumn(String(column))}`,
                 `${this.$constants('BETWEEN')}`,
                 `${this._checkValueHasRaw(this.$utils.escape(value1))}`,
                 `${this.$constants('AND')}`,
@@ -2521,13 +2521,12 @@ class Model extends AbstractModel_1.AbstractModel {
         if (!Array.isArray(array)) {
             throw this._assertError("This method must require the value to be an array only.");
         }
-        const c = this._columnPattern(String(column));
         if (!array.length) {
             this.$state.set('WHERE', [
                 ...this.$state.get('WHERE'),
                 [
                     this.$state.get('WHERE').length ? `${this.$constants('OR')}` : '',
-                    `${this.bindColumn(c)}`,
+                    `${this.bindColumn(String(column))}`,
                     `${this.$constants('BETWEEN')}`,
                     `${this.$constants(this.$constants('NULL'))}`,
                     `${this.$constants('AND')}`,
@@ -2541,7 +2540,7 @@ class Model extends AbstractModel_1.AbstractModel {
             ...this.$state.get('WHERE'),
             [
                 this.$state.get('WHERE').length ? `${this.$constants('OR')}` : '',
-                `${this.bindColumn(c)}`,
+                `${this.bindColumn(String(column))}`,
                 `${this.$constants('BETWEEN')}`,
                 `${this._checkValueHasRaw(this.$utils.escape(value1))}`,
                 `${this.$constants('AND')}`,
@@ -2560,13 +2559,12 @@ class Model extends AbstractModel_1.AbstractModel {
         if (!Array.isArray(array)) {
             throw this._assertError("This method must require the value to be an array only.");
         }
-        const c = this._columnPattern(String(column));
         if (!array.length) {
             this.$state.set('WHERE', [
                 ...this.$state.get('WHERE'),
                 [
                     this.$state.get('WHERE').length ? `${this.$constants('AND')}` : '',
-                    `${this.bindColumn(c)}`,
+                    `${this.bindColumn(String(column))}`,
                     `${this.$constants('NOT_BETWEEN')}`,
                     `${this.$constants(this.$constants('NULL'))}`,
                     `${this.$constants('AND')}`,
@@ -2580,7 +2578,7 @@ class Model extends AbstractModel_1.AbstractModel {
             ...this.$state.get('WHERE'),
             [
                 this.$state.get('WHERE').length ? `${this.$constants('AND')}` : '',
-                `${this.bindColumn(c)}`,
+                `${this.bindColumn(String(column))}`,
                 `${this.$constants('NOT_BETWEEN')}`,
                 `${this._checkValueHasRaw(this.$utils.escape(value1))}`,
                 `${this.$constants('AND')}`,
@@ -2599,13 +2597,12 @@ class Model extends AbstractModel_1.AbstractModel {
         if (!Array.isArray(array)) {
             throw this._assertError("This method must require the value to be an array only.");
         }
-        const c = this._columnPattern(String(column));
         if (!array.length) {
             this.$state.set('WHERE', [
                 ...this.$state.get('WHERE'),
                 [
                     this.$state.get('WHERE').length ? `${this.$constants('OR')}` : '',
-                    `${this.bindColumn(c)}`,
+                    `${this.bindColumn(String(column))}`,
                     `${this.$constants('NOT_BETWEEN')}`,
                     `${this.$constants(this.$constants('NULL'))}`,
                     `${this.$constants('AND')}`,
@@ -2619,7 +2616,7 @@ class Model extends AbstractModel_1.AbstractModel {
             ...this.$state.get('WHERE'),
             [
                 this.$state.get('WHERE').length ? `${this.$constants('OR')}` : '',
-                `${this.bindColumn(c)}`,
+                `${this.bindColumn(String(column))}`,
                 `${this.$constants('NOT_BETWEEN')}`,
                 `${this._checkValueHasRaw(this.$utils.escape(value1))}`,
                 `${this.$constants('AND')}`,
@@ -2634,12 +2631,11 @@ class Model extends AbstractModel_1.AbstractModel {
      * @returns {this}
      */
     whereNull(column) {
-        const c = this._columnPattern(String(column));
         this.$state.set('WHERE', [
             ...this.$state.get('WHERE'),
             [
                 this.$state.get('WHERE').length ? `${this.$constants('AND')}` : '',
-                `${this.bindColumn(c)}`,
+                `${this.bindColumn(String(column))}`,
                 `${this.$constants('IS_NULL')}`
             ].join(' ')
         ]);
@@ -2651,12 +2647,11 @@ class Model extends AbstractModel_1.AbstractModel {
      * @returns {this}
      */
     orWhereNull(column) {
-        const c = this._columnPattern(String(column));
         this.$state.set('WHERE', [
             ...this.$state.get('WHERE'),
             [
                 this.$state.get('WHERE').length ? `${this.$constants('OR')}` : '',
-                `${this.bindColumn(c)}`,
+                `${this.bindColumn(String(column))}`,
                 `${this.$constants('IS_NULL')}`
             ].join(' ')
         ]);
@@ -2668,12 +2663,11 @@ class Model extends AbstractModel_1.AbstractModel {
      * @returns {this}
      */
     whereNotNull(column) {
-        const c = this._columnPattern(String(column));
         this.$state.set('WHERE', [
             ...this.$state.get('WHERE'),
             [
                 this.$state.get('WHERE').length ? `${this.$constants('AND')}` : '',
-                `${this.bindColumn(c)}`,
+                `${this.bindColumn(String(column))}`,
                 `${this.$constants('IS_NOT_NULL')}`
             ].join(' ')
         ]);
@@ -2685,12 +2679,11 @@ class Model extends AbstractModel_1.AbstractModel {
      * @returns {this}
      */
     orWhereNotNull(column) {
-        const c = this._columnPattern(String(column));
         this.$state.set('WHERE', [
             ...this.$state.get('WHERE'),
             [
                 this.$state.get('WHERE').length ? `${this.$constants('OR')}` : '',
-                `${this.bindColumn(c)}`,
+                `${this.bindColumn(String(column))}`,
                 `${this.$constants('IS_NOT_NULL')}`
             ].join(' ')
         ]);
@@ -2705,7 +2698,6 @@ class Model extends AbstractModel_1.AbstractModel {
      */
     whereSensitive(column, operator, value) {
         [value, operator] = this._valueAndOperator(value, operator, arguments.length === 2);
-        const c = this._columnPattern(String(column));
         value = this.$utils.escape(value);
         value = this._valueTrueFalse(value);
         this.$state.set('WHERE', [
@@ -2713,7 +2705,7 @@ class Model extends AbstractModel_1.AbstractModel {
             [
                 this.$state.get('WHERE').length ? `${this.$constants('AND')}` : '',
                 `${this.$constants('BINARY')}`,
-                `${this.bindColumn(c)}`,
+                `${this.bindColumn(String(column))}`,
                 `${operator}`,
                 `${this._checkValueHasRaw(this.$utils.escape(value))}`
             ].join(' ')
@@ -2729,7 +2721,6 @@ class Model extends AbstractModel_1.AbstractModel {
      */
     whereStrict(column, operator, value) {
         [value, operator] = this._valueAndOperator(value, operator, arguments.length === 2);
-        const c = this._columnPattern(String(column));
         value = this.$utils.escape(value);
         value = this._valueTrueFalse(value);
         this.$state.set('WHERE', [
@@ -2737,7 +2728,7 @@ class Model extends AbstractModel_1.AbstractModel {
             [
                 this.$state.get('WHERE').length ? `${this.$constants('AND')}` : '',
                 `${this.$constants('BINARY')}`,
-                `${this.bindColumn(c)}`,
+                `${this.bindColumn(String(column))}`,
                 `${operator}`,
                 `${this._checkValueHasRaw(this.$utils.escape(value))}`
             ].join(' ')
@@ -2753,7 +2744,6 @@ class Model extends AbstractModel_1.AbstractModel {
      */
     orWhereSensitive(column, operator, value) {
         [value, operator] = this._valueAndOperator(value, operator, arguments.length === 2);
-        const c = this._columnPattern(String(column));
         value = this.$utils.escape(value);
         value = this._valueTrueFalse(value);
         this.$state.set('WHERE', [
@@ -2761,7 +2751,7 @@ class Model extends AbstractModel_1.AbstractModel {
             [
                 this.$state.get('WHERE').length ? `${this.$constants('OR')}` : '',
                 `${this.$constants('BINARY')}`,
-                `${this.bindColumn(c)}`,
+                `${this.bindColumn(String(column))}`,
                 `${operator}`,
                 `${this._checkValueHasRaw(this.$utils.escape(value))}`
             ].join(' ')
@@ -2810,10 +2800,10 @@ class Model extends AbstractModel_1.AbstractModel {
             for (const index in columns) {
                 const column = String(columns[index]);
                 if (+index === 0) {
-                    query.where(column, operator, value);
+                    query.where(this.bindColumn(column), operator, value);
                     continue;
                 }
-                query.orWhere(column, operator, value);
+                query.orWhere(this.bindColumn(column), operator, value);
             }
             return query;
         });
@@ -2837,7 +2827,7 @@ class Model extends AbstractModel_1.AbstractModel {
         this.whereQuery((query) => {
             for (const key in columns) {
                 const column = String(columns[key]);
-                query.where(column, operator, value);
+                query.where(this.bindColumn(column), operator, value);
             }
             return query;
         });
@@ -3729,6 +3719,12 @@ class Model extends AbstractModel_1.AbstractModel {
         });
     }
     _valuePattern(column) {
+        if (column.startsWith(this.$constants('FREEZE'))) {
+            return `${column.replace(this.$constants('FREEZE'), '').replace(/`/g, '')}`;
+        }
+        if (column.startsWith(this.$constants('RAW'))) {
+            return column.replace(this.$constants('RAW'), '').replace(/`/g, '');
+        }
         switch (this.$state.get('PATTERN')) {
             case this.$constants('PATTERN').snake_case: {
                 return column.replace(/([A-Z])/g, (str) => `_${str.toLowerCase()}`);
@@ -3765,12 +3761,6 @@ class Model extends AbstractModel_1.AbstractModel {
             return;
         });
     }
-    _columnPattern(column) {
-        if (column.startsWith(this.$constants('RAW'))) {
-            return column.replace(this.$constants('RAW'), '');
-        }
-        return this._valuePattern(column);
-    }
     _isPatternSnakeCase() {
         return this.$state.get('PATTERN') === this.$constants('PATTERN').snake_case;
     }