tspace-mysql 1.3.2 → 1.3.3

package/dist/lib/constants/index.js

@@ -9,6 +9,7 @@ const CONSTANTS = Object.freeze({
     COLUMNS: 'COLUMNS',
     WHERE: 'WHERE',
     BETWEEN: 'BETWEEN',
+    NOT_BETWEEN: 'NOT BETWEEN',
     AND: 'AND',
     IS_NULL: 'IS NULL',
     IS_NOT_NULL: 'IS NOT NULL',

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

@@ -46,6 +46,7 @@ declare abstract class AbstractBuilder {
     abstract whereNotSubQuery(column: string, subQuery: string): this;
     abstract orWhereSubQuery(column: string, subQuery: string): this;
     abstract whereBetween(column: string, arrayValue: Array<any>): this;
+    abstract whereNotBetween(column: string, arrayValue: Array<any>): this;
     abstract having(condition: string): this;
     abstract havingRaw(condition: string): this;
     abstract join(pk: string, fk: string): this;

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

@@ -3,6 +3,8 @@ import { Connection, ConnectionOptions } from './Interface';
 declare abstract class AbstractDB extends Builder {
     abstract table(tableName: string): void;
     abstract beginTransaction(): Promise<any>;
+    abstract makeObject(value: any): Record<string, any> | null;
+    abstract makeArray(value: any): Array<any>;
     abstract generateUUID(): string;
     abstract raw(sql: string): string;
     abstract constants(constants?: string): string | {

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

@@ -182,6 +182,13 @@ declare class Builder extends AbstractBuilder {
      * @return {this}
      */
     whereBetween(column: string, array: Array<any>): this;
+    /**
+     * where not between using [value1, value2]
+     * @param {string} column
+     * @param {array} array
+     * @return {this}
+     */
+    whereNotBetween(column: string, array: Array<any>): this;
     /**
      * where null using NULL
      * @param {string} column

package/dist/lib/tspace/Builder.js

@@ -268,7 +268,7 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
             this._queryWhereIsExists()
                 ? `${this.$state.get('WHERE')} ${this.$constants('AND')}`
                 : `${this.$constants('WHERE')}`,
-            `${this._bindTableAndColumnInQueryWhere(column)} = ${id}`,
+            `${this._bindTableAndColumnInQueryWhere(column)} = ${this.$utils.escape(id)}`,
         ].join(' '));
         return this;
     }
@@ -404,7 +404,7 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
                 : `${this.$constants('WHERE')}`,
             `${this._bindTableAndColumnInQueryWhere(column)}`,
             `${this.$constants('IN')}`,
-            `(${this.$utils.escape(subQuery)})`
+            `(${subQuery})`
         ].join(' '));
         return this;
     }
@@ -421,7 +421,7 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
                 : `${this.$constants('WHERE')}`,
             `${this._bindTableAndColumnInQueryWhere(column)}`,
             `${this.$constants('NOT_IN')}`,
-            `(${this.$utils.escape(subQuery)})`
+            `(${subQuery})`
         ].join(' '));
         return this;
     }
@@ -438,7 +438,7 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
                 : `${this.$constants('WHERE')}`,
             `${this._bindTableAndColumnInQueryWhere(column)}`,
             `${this.$constants('IN')}`,
-            `(${this.$utils.escape(subQuery)})`
+            `(${subQuery})`
         ].join(' '));
         return this;
     }
@@ -455,7 +455,7 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
                 : `${this.$constants('WHERE')}`,
             `${this._bindTableAndColumnInQueryWhere(column)}`,
             `${this.$constants('NOT_IN')}`,
-            `(${this.$utils.escape(subQuery)})`
+            `(${subQuery})`
         ].join(' '));
         return this;
     }
@@ -476,7 +476,28 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
                 ? `${this.$state.get('WHERE')} ${this.$constants('AND')}`
                 : `${this.$constants('WHERE')}`,
             `${this._bindTableAndColumnInQueryWhere(column)} ${this.$constants('BETWEEN')}`,
-            `'${this.$utils.escape(value1)}' ${this.$constants('AND')} '${this.$utils.escape(value2)}'`
+            `${this._checkValueHasRaw(this.$utils.escape(value1))} ${this.$constants('AND')} ${this._checkValueHasRaw(this.$utils.escape(value2))}`
+        ].join(' '));
+        return this;
+    }
+    /**
+     * where not between using [value1, value2]
+     * @param {string} column
+     * @param {array} array
+     * @return {this}
+     */
+    whereNotBetween(column, array) {
+        if (!Array.isArray(array))
+            throw new Error("Value is't array");
+        if (!array.length)
+            return this;
+        const [value1, value2] = array;
+        this.$state.set('WHERE', [
+            this._queryWhereIsExists()
+                ? `${this.$state.get('WHERE')} ${this.$constants('AND')}`
+                : `${this.$constants('WHERE')}`,
+            `${this._bindTableAndColumnInQueryWhere(column)} ${this.$constants('NOT_BETWEEN')}`,
+            `${this._checkValueHasRaw(this.$utils.escape(value1))} ${this.$constants('AND')} ${this._checkValueHasRaw(this.$utils.escape(value2))}`
         ].join(' '));
         return this;
     }

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

@@ -2,7 +2,6 @@ import { AbstractDB } from './AbstractDB';
 import { Connection, ConnectionOptions, ConnectionTransaction } from './Interface';
 declare class DB extends AbstractDB {
     constructor(table?: string);
-    union(a: string, b: string): Promise<any[]>;
     /**
      * Covert result to array
      * @param {any} result table name

package/dist/lib/tspace/DB.js

@@ -32,15 +32,6 @@ class DB extends AbstractDB_1.AbstractDB {
             this.table(table);
         return new Proxy(this, ProxyHandler_1.proxyHandler);
     }
-    union(a, b) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return yield this.queryStatement([
-                a,
-                'UNION',
-                b
-            ].join(' '));
-        });
-    }
     /**
      * Covert result to array
      * @param {any} result table name

package/package.json

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