oak-db 3.2.1 → 3.3.1

package/lib/MySQL/connector.js

@@ -20,6 +20,7 @@ class MySqlConnector {
         return this.pool.end();
     }
     async startTransaction(option) {
+        // 防止用户配置connection可复用
         const startInner = async () => {
             const connection = await this.pool.getConnection();
             // 分配出来的connection不能被别的事务占据
@@ -32,7 +33,7 @@ class MySqlConnector {
             }
             await connection.beginTransaction();
             const id = (0, uuid_1.v4)();
-            console.log('start_txn', id, connection.threadId);
+            // console.log('start_txn', id, connection.threadId);
             this.txnDict[id] = connection;
             if (option?.isolationLevel) {
                 await connection.query(`SET TRANSACTION ISOLATION LEVEL ${option.isolationLevel};`);
@@ -58,18 +59,16 @@ class MySqlConnector {
     }
     async commitTransaction(txn) {
         const connection = this.txnDict[txn];
-        if(!connection) {
-            console.log('qiguai!');
-        }
+        (0, assert_1.default)(connection);
         delete this.txnDict[txn];
-        console.log('commit_txn', txn, connection.threadId);
+        // 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);
+        // console.log('rollback_txn', txn, connection.threadId);
         await connection.rollback();
         delete this.txnDict[txn];
         connection.release();

package/lib/MySQL/store.d.ts

@@ -4,28 +4,28 @@ import { CascadeStore } from 'oak-domain/lib/store/CascadeStore';
 import { MySQLConfiguration } from './types/Configuration';
 import { MySqlConnector } from './connector';
 import { MySqlTranslator, MySqlSelectOption, MysqlOperateOption } from './translator';
-import { BackendRuntimeContext, AsyncRowStore } from 'oak-domain/lib/store/AsyncRowStore';
-import { FrontendRuntimeContext } from 'oak-domain/lib/store/SyncRowStore';
+import { AsyncContext, AsyncRowStore } from 'oak-domain/lib/store/AsyncRowStore';
+import { SyncContext } from 'oak-domain/lib/store/SyncRowStore';
 import { CreateEntityOption } from '../types/Translator';
-export declare class MysqlStore<ED extends EntityDict & BaseEntityDict, Cxt extends BackendRuntimeContext<ED>> extends CascadeStore<ED> implements AsyncRowStore<ED, Cxt> {
-    protected countAbjointRow<T extends keyof ED, OP extends SelectOption, Cxt extends FrontendRuntimeContext<ED>>(entity: T, selection: Pick<ED[T]['Selection'], 'filter' | 'count'>, context: Cxt, option: OP): number;
-    protected aggregateAbjointRowSync<T extends keyof ED, OP extends SelectOption, Cxt extends FrontendRuntimeContext<ED>>(entity: T, aggregation: ED[T]['Aggregation'], context: Cxt, option: OP): AggregationResult<ED[T]['Schema']>;
-    protected selectAbjointRow<T extends keyof ED, OP extends SelectOption>(entity: T, selection: ED[T]['Selection'], context: FrontendRuntimeContext<ED>, option: OP): Partial<ED[T]['Schema']>[];
-    protected updateAbjointRow<T extends keyof ED, OP extends OperateOption>(entity: T, operation: ED[T]['Operation'], context: FrontendRuntimeContext<ED>, option: OP): number;
+export declare class MysqlStore<ED extends EntityDict & BaseEntityDict, Cxt extends AsyncContext<ED>> extends CascadeStore<ED> implements AsyncRowStore<ED, Cxt> {
+    protected countAbjointRow<T extends keyof ED, OP extends SelectOption, Cxt extends SyncContext<ED>>(entity: T, selection: Pick<ED[T]['Selection'], 'filter' | 'count'>, context: Cxt, option: OP): number;
+    protected aggregateAbjointRowSync<T extends keyof ED, OP extends SelectOption, Cxt extends SyncContext<ED>>(entity: T, aggregation: ED[T]['Aggregation'], context: Cxt, option: OP): AggregationResult<ED[T]['Schema']>;
+    protected selectAbjointRow<T extends keyof ED, OP extends SelectOption>(entity: T, selection: ED[T]['Selection'], context: SyncContext<ED>, option: OP): Partial<ED[T]['Schema']>[];
+    protected updateAbjointRow<T extends keyof ED, OP extends OperateOption>(entity: T, operation: ED[T]['Operation'], context: SyncContext<ED>, option: OP): number;
     exec(script: string, txnId?: string): Promise<any>;
     connector: MySqlConnector;
     translator: MySqlTranslator<ED>;
     constructor(storageSchema: StorageSchema<ED>, configuration: MySQLConfiguration);
-    protected aggregateAbjointRowAsync<T extends keyof ED, OP extends SelectOption, Cxt extends BackendRuntimeContext<ED>>(entity: T, aggregation: ED[T]['Aggregation'], context: Cxt, option: OP): Promise<AggregationResult<ED[T]['Schema']>>;
+    protected aggregateAbjointRowAsync<T extends keyof ED, OP extends SelectOption, Cxt extends AsyncContext<ED>>(entity: T, aggregation: ED[T]['Aggregation'], context: Cxt, option: OP): Promise<AggregationResult<ED[T]['Schema']>>;
     aggregate<T extends keyof ED, OP extends SelectOption>(entity: T, aggregation: ED[T]['Aggregation'], context: Cxt, option: OP): Promise<AggregationResult<ED[T]['Schema']>>;
     protected supportManyToOneJoin(): boolean;
     protected supportMultipleCreate(): boolean;
     private formResult;
-    protected selectAbjointRowAsync<T extends keyof ED>(entity: T, selection: ED[T]['Selection'], context: BackendRuntimeContext<ED>, option?: MySqlSelectOption): Promise<Partial<ED[T]['Schema']>[]>;
-    protected updateAbjointRowAsync<T extends keyof ED>(entity: T, operation: ED[T]['Operation'], context: BackendRuntimeContext<ED>, option?: MysqlOperateOption): Promise<number>;
+    protected selectAbjointRowAsync<T extends keyof ED>(entity: T, selection: ED[T]['Selection'], context: AsyncContext<ED>, option?: MySqlSelectOption): Promise<Partial<ED[T]['Schema']>[]>;
+    protected updateAbjointRowAsync<T extends keyof ED>(entity: T, operation: ED[T]['Operation'], context: AsyncContext<ED>, option?: MysqlOperateOption): Promise<number>;
     operate<T extends keyof ED>(entity: T, operation: ED[T]['Operation'], context: Cxt, option: OperateOption): Promise<OperationResult<ED>>;
     select<T extends keyof ED>(entity: T, selection: ED[T]['Selection'], context: Cxt, option: SelectOption): Promise<Partial<ED[T]['Schema']>[]>;
-    protected countAbjointRowAsync<T extends keyof ED>(entity: T, selection: Pick<ED[T]['Selection'], 'filter' | 'count'>, context: BackendRuntimeContext<ED>, option: SelectOption): Promise<number>;
+    protected countAbjointRowAsync<T extends keyof ED>(entity: T, selection: Pick<ED[T]['Selection'], 'filter' | 'count'>, context: AsyncContext<ED>, option: SelectOption): Promise<number>;
     count<T extends keyof ED>(entity: T, selection: Pick<ED[T]['Selection'], 'filter' | 'count'>, context: Cxt, option: SelectOption): Promise<number>;
     begin(option?: TxnOption): Promise<string>;
     commit(txnId: string): Promise<void>;

package/lib/MySQL/store.js

@@ -192,18 +192,18 @@ class MysqlStore extends CascadeStore_1.CascadeStore {
                 const rel = (0, relation_1.judgeRelation)(schema, e, attr);
                 if (rel === 2) {
                     // 边界，如果是toModi的对象，这里的外键确实有可能为空
-                    (0, assert_1.default)(schema[e].toModi || r.entity !== attr || r.entityId === r[attr].id, `对象${e}取数据时，发现entityId与连接的对象的主键不一致，rowId是${r.id}，其entityId值为${r.entityId}，连接的对象的主键为${r[attr].id}`);
+                    // assert(schema[e].toModi || r.entity !== attr || r.entityId === r[attr].id, `对象${<string>e}取数据时，发现entityId与连接的对象的主键不一致，rowId是${r.id}，其entityId值为${r.entityId}，连接的对象的主键为${r[attr].id}`);
                     if (r[attr].id === null) {
                         (0, assert_1.default)(schema[e].toModi || r.entity !== attr);
                         delete r[attr];
                         continue;
                     }
-                    (0, assert_1.default)(r.entity === attr, `对象${e}取数据时，发现entity值与连接的外键对象不一致，rowId是${r.id}，其entity值为${r.entity}，连接的对象为${attr}`);
+                    // assert(r.entity === attr, `对象${<string>e}取数据时，发现entity值与连接的外键对象不一致，rowId是${r.id}，其entity值为${r.entity}，连接的对象为${attr}`);
                     removeNullObjects(r[attr], attr);
                 }
                 else if (typeof rel === 'string') {
                     // 边界，如果是toModi的对象，这里的外键确实有可能为空
-                    (0, assert_1.default)(schema[e].toModi || r[`${attr}Id`] === r[attr].id, `对象${e}取数据时，发现其外键与连接的对象的主键不一致，rowId是${r.id}，其${attr}Id值为${r[`${attr}Id`]}，连接的对象的主键为${r[attr].id}`);
+                    // assert(schema[e].toModi || r[`${attr}Id`] === r[attr].id, `对象${<string>e}取数据时，发现其外键与连接的对象的主键不一致，rowId是${r.id}，其${attr}Id值为${r[`${attr}Id`]}，连接的对象的主键为${r[attr].id}`);
                     if (r[attr].id === null) {
                         (0, assert_1.default)(schema[e].toModi || r[`${attr}Id`] === null);
                         delete r[attr];

package/lib/MySQL/translator.js

@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
 const assert_1 = tslib_1.__importDefault(require("assert"));
 const util_1 = require("util");
 const lodash_1 = require("lodash");
+const types_1 = require("oak-domain/lib/types");
 const sqlTranslator_1 = require("../sqlTranslator");
 const GeoTypes = [
     {
@@ -920,9 +921,12 @@ class MySqlTranslator extends sqlTranslator_1.SqlTranslator {
             }
             return sql;
         }
-        const now = Date.now();
-        const updateText2 = updateText ? `${updateText}, \`${alias}\`.\`$$deleteAt$$\` = '${now}'` : `\`${alias}\`.\`$$deleteAt$$\` = '${now}'`;
-        let sql = `update ${fromText} set ${updateText2}`;
+        // 新的remove应该包含$$deleteAt$$的值了
+        /* const now = Date.now();
+
+        const updateText2 = updateText ? `${updateText}, \`${alias}\`.\`$$deleteAt$$\` = '${now}'` : `\`${alias}\`.\`$$deleteAt$$\` = '${now}'`; */
+        (0, assert_1.default)(updateText.includes(types_1.DeleteAtAttribute));
+        let sql = `update ${fromText} set ${updateText}`;
         if (filterText) {
             sql += ` where ${filterText}`;
         }

package/lib/MySQL/types/Configuration.d.ts

@@ -5,6 +5,7 @@ export type MySQLConfiguration = {
     database: string;
     charset: 'utf8mb4_general_ci';
     connectionLimit: number;
+    port?: number;
 };
 export type Configuration = {
     mysql: MySQLConfiguration;

package/lib/MySQL/types/Configuration.js

@@ -1,2 +1,2 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/index.d.ts

@@ -1,2 +1,2 @@
-export * from './MySQL/store';
-export { MySqlSelectOption, MysqlOperateOption } from './MySQL/translator';
+export * from './MySQL/store';
+export { MySqlSelectOption, MysqlOperateOption } from './MySQL/translator';

package/lib/index.js

@@ -1,4 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-tslib_1.__exportStar(require("./MySQL/store"), exports);
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./MySQL/store"), exports);