oak-db 3.3.1 → 3.3.3

package/lib/MySQL/connector.d.ts

@@ -1,15 +1,15 @@
-import mysql, { Pool } from 'mysql2/promise';
-import { TxnOption } from 'oak-domain/lib/types';
-import { MySQLConfiguration } from './types/Configuration';
-export declare class MySqlConnector {
-    pool: Pool;
-    configuration: MySQLConfiguration;
-    txnDict: Record<string, mysql.PoolConnection>;
-    constructor(configuration: MySQLConfiguration);
-    connect(): void;
-    disconnect(): Promise<void>;
-    startTransaction(option?: TxnOption): Promise<string>;
-    exec(sql: string, txn?: string): Promise<any>;
-    commitTransaction(txn: string): Promise<void>;
-    rollbackTransaction(txn: string): Promise<void>;
-}
+import mysql, { Pool } from 'mysql2/promise';
+import { TxnOption } from 'oak-domain/lib/types';
+import { MySQLConfiguration } from './types/Configuration';
+export declare class MySqlConnector {
+    pool: Pool;
+    configuration: MySQLConfiguration;
+    txnDict: Record<string, mysql.PoolConnection>;
+    constructor(configuration: MySQLConfiguration);
+    connect(): void;
+    disconnect(): Promise<void>;
+    startTransaction(option?: TxnOption): Promise<string>;
+    exec(sql: string, txn?: string): Promise<any>;
+    commitTransaction(txn: string): Promise<void>;
+    rollbackTransaction(txn: string): Promise<void>;
+}

package/lib/MySQL/connector.js

@@ -1,77 +1,77 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MySqlConnector = void 0;
-const tslib_1 = require("tslib");
-const promise_1 = tslib_1.__importDefault(require("mysql2/promise"));
-const uuid_1 = require("uuid");
-const assert_1 = tslib_1.__importDefault(require("assert"));
-class MySqlConnector {
-    pool;
-    configuration;
-    txnDict;
-    constructor(configuration) {
-        this.configuration = configuration;
-        this.txnDict = {};
-        this.pool = promise_1.default.createPool(this.configuration);
-    }
-    connect() {
-    }
-    disconnect() {
-        return this.pool.end();
-    }
-    async startTransaction(option) {
-        // 防止用户配置connection可复用
-        const startInner = async () => {
-            const connection = await this.pool.getConnection();
-            // 分配出来的connection不能被别的事务占据
-            for (const txn2 in this.txnDict) {
-                if (this.txnDict[txn2] === connection) {
-                    return new Promise((resolve) => {
-                        this.pool.on('release', () => resolve(startInner()));
-                    });
-                }
-            }
-            await connection.beginTransaction();
-            const id = (0, uuid_1.v4)();
-            // console.log('start_txn', id, connection.threadId);
-            this.txnDict[id] = connection;
-            if (option?.isolationLevel) {
-                await connection.query(`SET TRANSACTION ISOLATION LEVEL ${option.isolationLevel};`);
-            }
-            return id;
-        };
-        return startInner();
-    }
-    async exec(sql, txn) {
-        if (process.env.NODE_ENV === 'development') {
-            // console.log(sql);
-        }
-        if (txn) {
-            const connection = this.txnDict[txn];
-            (0, assert_1.default)(connection);
-            const result = await connection.query(sql);
-            return result;
-        }
-        else {
-            const result = await this.pool.query(sql);
-            return result;
-        }
-    }
-    async commitTransaction(txn) {
-        const connection = this.txnDict[txn];
-        (0, assert_1.default)(connection);
-        delete this.txnDict[txn];
-        // console.log('commit_txn', txn, connection.threadId);
-        await connection.commit();
-        connection.release();
-    }
-    async rollbackTransaction(txn) {
-        const connection = this.txnDict[txn];
-        (0, assert_1.default)(connection);
-        // console.log('rollback_txn', txn, connection.threadId);
-        await connection.rollback();
-        delete this.txnDict[txn];
-        connection.release();
-    }
-}
-exports.MySqlConnector = MySqlConnector;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MySqlConnector = void 0;
+const tslib_1 = require("tslib");
+const promise_1 = tslib_1.__importDefault(require("mysql2/promise"));
+const uuid_1 = require("uuid");
+const assert_1 = tslib_1.__importDefault(require("assert"));
+class MySqlConnector {
+    pool;
+    configuration;
+    txnDict;
+    constructor(configuration) {
+        this.configuration = configuration;
+        this.txnDict = {};
+        this.pool = promise_1.default.createPool(this.configuration);
+    }
+    connect() {
+    }
+    disconnect() {
+        return this.pool.end();
+    }
+    async startTransaction(option) {
+        // 防止用户配置connection可复用
+        const startInner = async () => {
+            const connection = await this.pool.getConnection();
+            // 分配出来的connection不能被别的事务占据
+            for (const txn2 in this.txnDict) {
+                if (this.txnDict[txn2] === connection) {
+                    return new Promise((resolve) => {
+                        this.pool.on('release', () => resolve(startInner()));
+                    });
+                }
+            }
+            await connection.beginTransaction();
+            const id = (0, uuid_1.v4)();
+            // console.log('start_txn', id, connection.threadId);
+            this.txnDict[id] = connection;
+            if (option?.isolationLevel) {
+                await connection.query(`SET TRANSACTION ISOLATION LEVEL ${option.isolationLevel};`);
+            }
+            return id;
+        };
+        return startInner();
+    }
+    async exec(sql, txn) {
+        if (process.env.NODE_ENV === 'development') {
+            // console.log(sql);
+        }
+        if (txn) {
+            const connection = this.txnDict[txn];
+            (0, assert_1.default)(connection);
+            const result = await connection.query(sql);
+            return result;
+        }
+        else {
+            const result = await this.pool.query(sql);
+            return result;
+        }
+    }
+    async commitTransaction(txn) {
+        const connection = this.txnDict[txn];
+        (0, assert_1.default)(connection);
+        delete this.txnDict[txn];
+        // console.log('commit_txn', txn, connection.threadId);
+        await connection.commit();
+        connection.release();
+    }
+    async rollbackTransaction(txn) {
+        const connection = this.txnDict[txn];
+        (0, assert_1.default)(connection);
+        // console.log('rollback_txn', txn, connection.threadId);
+        await connection.rollback();
+        delete this.txnDict[txn];
+        connection.release();
+    }
+}
+exports.MySqlConnector = MySqlConnector;

package/lib/MySQL/store.d.ts

@@ -31,6 +31,6 @@ export declare class MysqlStore<ED extends EntityDict & BaseEntityDict, Cxt exte
     commit(txnId: string): Promise<void>;
     rollback(txnId: string): Promise<void>;
     connect(): void;
-    disconnect(): void;
+    disconnect(): Promise<void>;
     initialize(option: CreateEntityOption): Promise<void>;
 }

package/lib/MySQL/store.js

@@ -288,8 +288,8 @@ class MysqlStore extends CascadeStore_1.CascadeStore {
     connect() {
         this.connector.connect();
     }
-    disconnect() {
-        this.connector.disconnect();
+    async disconnect() {
+        await this.connector.disconnect();
     }
     async initialize(option) {
         const schema = this.getSchema();

package/lib/MySQL/translator.d.ts

@@ -1,107 +1,107 @@
-import { EntityDict, Q_FullTextValue, RefOrExpression, Ref, StorageSchema } from "oak-domain/lib/types";
-import { EntityDict as BaseEntityDict } from 'oak-domain/lib/base-app-domain';
-import { DataType } from "oak-domain/lib/types/schema/DataTypes";
-import { SqlOperateOption, SqlSelectOption, SqlTranslator } from "../sqlTranslator";
-import { CreateEntityOption } from '../types/Translator';
-export interface MySqlSelectOption extends SqlSelectOption {
-}
-export interface MysqlOperateOption extends SqlOperateOption {
-}
-export declare class MySqlTranslator<ED extends EntityDict & BaseEntityDict> extends SqlTranslator<ED> {
-    protected getDefaultSelectFilter(alias: string, option?: MySqlSelectOption): string;
-    private makeUpSchema;
-    constructor(schema: StorageSchema<ED>);
-    static supportedDataTypes: DataType[];
-    static spatialTypes: DataType[];
-    static withLengthDataTypes: DataType[];
-    static withPrecisionDataTypes: DataType[];
-    static withScaleDataTypes: DataType[];
-    static unsignedAndZerofillTypes: DataType[];
-    static withWidthDataTypes: DataType[];
-    static dataTypeDefaults: {
-        varchar: {
-            length: number;
-        };
-        nvarchar: {
-            length: number;
-        };
-        "national varchar": {
-            length: number;
-        };
-        char: {
-            length: number;
-        };
-        binary: {
-            length: number;
-        };
-        varbinary: {
-            length: number;
-        };
-        decimal: {
-            precision: number;
-            scale: number;
-        };
-        dec: {
-            precision: number;
-            scale: number;
-        };
-        numeric: {
-            precision: number;
-            scale: number;
-        };
-        fixed: {
-            precision: number;
-            scale: number;
-        };
-        float: {
-            precision: number;
-        };
-        double: {
-            precision: number;
-        };
-        time: {
-            precision: number;
-        };
-        datetime: {
-            precision: number;
-        };
-        timestamp: {
-            precision: number;
-        };
-        bit: {
-            width: number;
-        };
-        int: {
-            width: number;
-        };
-        integer: {
-            width: number;
-        };
-        tinyint: {
-            width: number;
-        };
-        smallint: {
-            width: number;
-        };
-        mediumint: {
-            width: number;
-        };
-        bigint: {
-            width: number;
-        };
-    };
-    maxAliasLength: number;
-    private populateDataTypeDef;
-    protected translateAttrProjection(dataType: DataType, alias: string, attr: string): string;
-    protected translateObjectPredicate(predicate: Record<string, any>, alias: string, attr: string): string;
-    protected translateObjectProjection(projection: Record<string, any>, alias: string, attr: string, prefix: string): string;
-    protected translateAttrValue(dataType: DataType | Ref, value: any): string;
-    protected translateFullTextSearch<T extends keyof ED>(value: Q_FullTextValue, entity: T, alias: string): string;
-    translateCreateEntity<T extends keyof ED>(entity: T, options?: CreateEntityOption): string[];
-    private translateFnName;
-    private translateAttrInExpression;
-    protected translateExpression<T extends keyof ED>(entity: T, alias: string, expression: RefOrExpression<keyof ED[T]["OpSchema"]>, refDict: Record<string, [string, keyof ED]>): string;
-    protected populateSelectStmt<T extends keyof ED>(projectionText: string, fromText: string, aliasDict: Record<string, string>, filterText: string, sorterText?: string, groupByText?: string, indexFrom?: number, count?: number, option?: MySqlSelectOption): string;
-    protected populateUpdateStmt(updateText: string, fromText: string, aliasDict: Record<string, string>, filterText: string, sorterText?: string, indexFrom?: number, count?: number, option?: MysqlOperateOption): string;
-    protected populateRemoveStmt(updateText: string, fromText: string, aliasDict: Record<string, string>, filterText: string, sorterText?: string, indexFrom?: number, count?: number, option?: MysqlOperateOption): string;
-}
+import { EntityDict, Q_FullTextValue, RefOrExpression, Ref, StorageSchema } from "oak-domain/lib/types";
+import { EntityDict as BaseEntityDict } from 'oak-domain/lib/base-app-domain';
+import { DataType } from "oak-domain/lib/types/schema/DataTypes";
+import { SqlOperateOption, SqlSelectOption, SqlTranslator } from "../sqlTranslator";
+import { CreateEntityOption } from '../types/Translator';
+export interface MySqlSelectOption extends SqlSelectOption {
+}
+export interface MysqlOperateOption extends SqlOperateOption {
+}
+export declare class MySqlTranslator<ED extends EntityDict & BaseEntityDict> extends SqlTranslator<ED> {
+    protected getDefaultSelectFilter(alias: string, option?: MySqlSelectOption): string;
+    private makeUpSchema;
+    constructor(schema: StorageSchema<ED>);
+    static supportedDataTypes: DataType[];
+    static spatialTypes: DataType[];
+    static withLengthDataTypes: DataType[];
+    static withPrecisionDataTypes: DataType[];
+    static withScaleDataTypes: DataType[];
+    static unsignedAndZerofillTypes: DataType[];
+    static withWidthDataTypes: DataType[];
+    static dataTypeDefaults: {
+        varchar: {
+            length: number;
+        };
+        nvarchar: {
+            length: number;
+        };
+        "national varchar": {
+            length: number;
+        };
+        char: {
+            length: number;
+        };
+        binary: {
+            length: number;
+        };
+        varbinary: {
+            length: number;
+        };
+        decimal: {
+            precision: number;
+            scale: number;
+        };
+        dec: {
+            precision: number;
+            scale: number;
+        };
+        numeric: {
+            precision: number;
+            scale: number;
+        };
+        fixed: {
+            precision: number;
+            scale: number;
+        };
+        float: {
+            precision: number;
+        };
+        double: {
+            precision: number;
+        };
+        time: {
+            precision: number;
+        };
+        datetime: {
+            precision: number;
+        };
+        timestamp: {
+            precision: number;
+        };
+        bit: {
+            width: number;
+        };
+        int: {
+            width: number;
+        };
+        integer: {
+            width: number;
+        };
+        tinyint: {
+            width: number;
+        };
+        smallint: {
+            width: number;
+        };
+        mediumint: {
+            width: number;
+        };
+        bigint: {
+            width: number;
+        };
+    };
+    maxAliasLength: number;
+    private populateDataTypeDef;
+    protected translateAttrProjection(dataType: DataType, alias: string, attr: string): string;
+    protected translateObjectPredicate(predicate: Record<string, any>, alias: string, attr: string): string;
+    protected translateObjectProjection(projection: Record<string, any>, alias: string, attr: string, prefix: string): string;
+    protected translateAttrValue(dataType: DataType | Ref, value: any): string;
+    protected translateFullTextSearch<T extends keyof ED>(value: Q_FullTextValue, entity: T, alias: string): string;
+    translateCreateEntity<T extends keyof ED>(entity: T, options?: CreateEntityOption): string[];
+    private translateFnName;
+    private translateAttrInExpression;
+    protected translateExpression<T extends keyof ED>(entity: T, alias: string, expression: RefOrExpression<keyof ED[T]["OpSchema"]>, refDict: Record<string, [string, keyof ED]>): string;
+    protected populateSelectStmt<T extends keyof ED>(projectionText: string, fromText: string, aliasDict: Record<string, string>, filterText: string, sorterText?: string, groupByText?: string, indexFrom?: number, count?: number, option?: MySqlSelectOption): string;
+    protected populateUpdateStmt(updateText: string, fromText: string, aliasDict: Record<string, string>, filterText: string, sorterText?: string, indexFrom?: number, count?: number, option?: MysqlOperateOption): string;
+    protected populateRemoveStmt(updateText: string, fromText: string, aliasDict: Record<string, string>, filterText: string, sorterText?: string, indexFrom?: number, count?: number, option?: MysqlOperateOption): string;
+}