tspace-mysql 1.3.2 → 1.3.4

package/dist/lib/connection/index.js

@@ -79,22 +79,20 @@ class PoolConnection {
     }
     _defaultOptions() {
         return new Map(Object.entries({
+            multipleStatements: options_1.default.MULTIPLE_STATEMENTS || false,
+            enableKeepAlive: options_1.default.ENABLE_KEEP_ALIVE || false,
+            keepAliveInitialDelay: options_1.default.KEEP_ALIVE_DELAY || 0,
             connectionLimit: Number(options_1.default.CONNECTION_LIMIT),
             dateStrings: Boolean(options_1.default.DATE_STRINGS),
             connectTimeout: Number(options_1.default.TIMEOUT),
             waitForConnections: Boolean(options_1.default.WAIT_FOR_CONNECTIONS),
             queueLimit: Number(options_1.default.QUEUE_LIMIT),
-            multipleStatements: true,
             charset: String(options_1.default.CHARSET),
             host: String(options_1.default.HOST),
-            port: Number.isNaN(Number(options_1.default.PORT))
-                ? 3306
-                : Number(options_1.default.PORT),
+            port: Number.isNaN(Number(options_1.default.PORT)) ? 3306 : Number(options_1.default.PORT),
             database: String(options_1.default.DATABASE),
             user: String(options_1.default.USERNAME),
-            password: String(options_1.default.PASSWORD) !== ''
-                ? String(options_1.default.PASSWORD)
-                : ''
+            password: String(options_1.default.PASSWORD) === '' ? '' : String(options_1.default.PASSWORD)
         }));
     }
     _loadOptions() {
@@ -110,7 +108,7 @@ class PoolConnection {
                 "password"              : "",
                 "connectionLimit"       : "",
                 "dateStrings"           : "",
-                "idleTimeout"           : "",
+                "connectTimeout"        : "",
                 "waitForConnections"    : "",
                 "queueLimit"            : "",
                 "charset"               : ""

package/dist/lib/connection/options.d.ts

@@ -11,5 +11,8 @@ declare const _default: Readonly<{
     CONNECTION_ERROR?: string | boolean | undefined;
     WAIT_FOR_CONNECTIONS?: string | boolean | undefined;
     DATE_STRINGS?: string | boolean | undefined;
+    KEEP_ALIVE_DELAY?: string | number | undefined;
+    ENABLE_KEEP_ALIVE?: string | boolean | undefined;
+    MULTIPLE_STATEMENTS?: string | boolean | undefined;
 }>;
 export default _default;

package/dist/lib/connection/options.js

@@ -30,7 +30,10 @@ const env = {
     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,
-    DATE_STRINGS: process.env.DB_DATE_STRINGS || process.env.TSPACE_DATE_STRINGS || true
+    DATE_STRINGS: process.env.DB_DATE_STRINGS || process.env.TSPACE_DATE_STRINGS || true,
+    KEEP_ALIVE_DELAY: process.env.DB_KEEP_ALIVE_DELAY || process.env.TSPACE_KEEP_ALIVE_DELAY || 0,
+    ENABLE_KEEP_ALIVE: process.env.DB_ENABLE_KEEP_ALIVE || process.env.TSPACE_ENABLE_KEEP_ALIVE || false,
+    MULTIPLE_STATEMENTS: process.env.MULTIPLE_STATEMENTS || process.env.TSPACE_MULTIPLE_STATEMENTS || false
 };
 for (const [key, value] of Object.entries(env)) {
     if (value == null)

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/dist/lib/tspace/Model.js

@@ -1803,10 +1803,6 @@ class Model extends AbstractModel_1.AbstractModel {
                 return [];
             const query = yield relation.query;
             this._assertError(query == null, `Unknown callback query in [Relation : ${relation.name}]`);
-            const relationIsHasOneOrBelongsTo = [
-                this.$constants('RELATIONSHIP').hasOne,
-                this.$constants('RELATIONSHIP').belongsTo
-            ].some(r => r === relation.relation);
             const dataFromRelation = yield query
                 .bind(this.$pool.get())
                 .whereIn(foreignKey, dataPerentId)
@@ -2265,7 +2261,7 @@ class Model extends AbstractModel_1.AbstractModel {
     _insertNotExistsModel() {
         return __awaiter(this, void 0, void 0, function* () {
             this._assertError(!this.$state.get('WHERE'), "Can't insert [insertNotExists] without where condition");
-            const clone = new Model().copyModel(this, { where: true });
+            const clone = new Model().bind(this.$pool.get()).copyModel(this, { where: true });
             const check = (yield clone.exists()) || false;
             if (check)
                 return null;
@@ -2275,7 +2271,7 @@ class Model extends AbstractModel_1.AbstractModel {
             });
             if (!result)
                 return null;
-            return yield new Model().copyModel(this).where('id', id).first();
+            return yield new Model().bind(this.$pool.get()).copyModel(this).where('id', id).first();
         });
     }
     _insertModel() {
@@ -2290,6 +2286,7 @@ class Model extends AbstractModel_1.AbstractModel {
                 return null;
             return yield new Model().copyModel(this)
                 .where('id', id)
+                .bind(this.$pool.get())
                 .first();
         });
     }
@@ -2304,7 +2301,7 @@ class Model extends AbstractModel_1.AbstractModel {
             if (!result)
                 return null;
             const arrayId = [...Array(result)].map((_, i) => i + id);
-            const data = new Model().copyModel(this).whereIn('id', arrayId).get();
+            const data = new Model().copyModel(this).bind(this.$pool.get()).whereIn('id', arrayId).get();
             const resultData = data || [];
             this.$state.set('RESULT', resultData);
             return resultData;
@@ -2313,7 +2310,7 @@ class Model extends AbstractModel_1.AbstractModel {
     _updateOrInsertModel() {
         return __awaiter(this, void 0, void 0, function* () {
             this._assertError(!this.$state.get('WHERE'), "Can not update or insert [updateOrInsert] without where condition");
-            const clone = new Model().copyModel(this, { where: true });
+            const clone = new Model().bind(this.$pool.get()).copyModel(this, { where: true });
             const check = (yield clone.exists()) || false;
             switch (check) {
                 case false: {
@@ -2325,7 +2322,7 @@ class Model extends AbstractModel_1.AbstractModel {
                         return null;
                     if (!result)
                         return null;
-                    const data = yield new Model().copyModel(this).where('id', id).first();
+                    const data = yield new Model().bind(this.$pool.get()).copyModel(this).where('id', id).first();
                     const resultData = data == null
                         ? null
                         : Object.assign(Object.assign({}, data), { action_status: 'insert' });
@@ -2340,7 +2337,7 @@ class Model extends AbstractModel_1.AbstractModel {
                         return null;
                     if (!result)
                         return null;
-                    const data = yield new Model().copyModel(this, { where: true }).get();
+                    const data = yield new Model().bind(this.$pool.get()).copyModel(this, { where: true }).get();
                     if ((data === null || data === void 0 ? void 0 : data.length) > 1) {
                         for (const v of data)
                             v.action_status = 'update';
@@ -2357,7 +2354,7 @@ class Model extends AbstractModel_1.AbstractModel {
     _insertOrSelectModel() {
         return __awaiter(this, void 0, void 0, function* () {
             this._assertError(!this.$state.get('WHERE'), "Can not update or insert [updateOrInsert] without where condition");
-            const clone = new Model().copyModel(this, { where: true });
+            const clone = new Model().bind(this.$pool.get()).copyModel(this, { where: true });
             const check = (yield clone.exists()) || false;
             switch (check) {
                 case false: {
@@ -2369,7 +2366,7 @@ class Model extends AbstractModel_1.AbstractModel {
                         return null;
                     if (!result)
                         return null;
-                    const data = yield new Model().copyModel(this).where('id', id).first();
+                    const data = yield new Model().bind(this.$pool.get()).copyModel(this).where('id', id).first();
                     const resultData = data == null
                         ? null
                         : Object.assign(Object.assign({}, data), { action_status: 'insert' });
@@ -2379,7 +2376,7 @@ class Model extends AbstractModel_1.AbstractModel {
                 case true: {
                     if (this.$state.get('VOID'))
                         return null;
-                    const data = yield new Model().copyModel(this, { where: true }).get();
+                    const data = yield new Model().bind(this.$pool.get()).copyModel(this, { where: true }).get();
                     if ((data === null || data === void 0 ? void 0 : data.length) > 1) {
                         for (const v of data)
                             v.action_status = 'select';
@@ -2402,7 +2399,7 @@ class Model extends AbstractModel_1.AbstractModel {
                 return null;
             if (result == null || !result)
                 return null;
-            const data = yield new Model().copyModel(this, { where: true }).get();
+            const data = yield new Model().bind(this.$pool.get()).copyModel(this, { where: true }).get();
             if ((data === null || data === void 0 ? void 0 : data.length) > 1) {
                 this.$state.set('RESULT', data);
                 return data || [];

package/package.json

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