oak-db 3.3.4 → 3.3.5

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<[mysql.RowDataPacket[] | mysql.RowDataPacket[][] | mysql.OkPacket | mysql.OkPacket[] | mysql.ResultSetHeader, mysql.FieldPacket[]]>;
+    commitTransaction(txn: string): Promise<void>;
+    rollbackTransaction(txn: string): Promise<void>;
+}

package/lib/MySQL/store.d.ts

@@ -12,7 +12,7 @@ export declare class MysqlStore<ED extends EntityDict & BaseEntityDict, Cxt exte
     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>;
+    exec(script: string, txnId?: string): Promise<void>;
     connector: MySqlConnector;
     translator: MySqlTranslator<ED>;
     constructor(storageSchema: StorageSchema<ED>, configuration: MySQLConfiguration);

package/lib/MySQL/store.js

@@ -33,8 +33,8 @@ class MysqlStore extends CascadeStore_1.CascadeStore {
     updateAbjointRow(entity, operation, context, option) {
         throw new Error('MySQL store不支持同步更新数据，不应该跑到这儿');
     }
-    exec(script, txnId) {
-        return this.connector.exec(script, txnId);
+    async exec(script, txnId) {
+        await this.connector.exec(script, txnId);
     }
     connector;
     translator;
@@ -240,21 +240,21 @@ class MysqlStore extends CascadeStore_1.CascadeStore {
             case 'create': {
                 const { data } = operation;
                 const sql = translator.translateInsert(entity, data instanceof Array ? data : [data]);
-                await connector.exec(sql, txn);
-                return data instanceof Array ? data.length : 1;
+                const result = await connector.exec(sql, txn);
+                return result[0].affectedRows;
             }
             case 'remove': {
                 const sql = translator.translateRemove(entity, operation, option);
-                await connector.exec(sql, txn);
+                const result = await connector.exec(sql, txn);
                 // todo 这里对sorter和indexfrom/count的支持不完整
-                return 1;
+                return result[0].changedRows;
             }
             default: {
                 (0, assert_1.default)(!['select', 'download', 'stat'].includes(action));
                 const sql = translator.translateUpdate(entity, operation, option);
-                await connector.exec(sql, txn);
+                const result = await connector.exec(sql, txn);
                 // todo 这里对sorter和indexfrom/count的支持不完整
-                return 1;
+                return result[0].changedRows;
             }
         }
     }

package/lib/MySQL/translator.js

@@ -119,21 +119,21 @@ class MySqlTranslator extends sqlTranslator_1.SqlTranslator {
         // numeric types
         "bit",
         "int",
-        "integer", // synonym for int
+        "integer",
         "tinyint",
         "smallint",
         "mediumint",
         "bigint",
         "float",
         "double",
-        "double precision", // synonym for double
-        "real", // synonym for double
+        "double precision",
+        "real",
         "decimal",
-        "dec", // synonym for decimal
-        "numeric", // synonym for decimal
-        "fixed", // synonym for decimal
-        "bool", // synonym for tinyint
-        "boolean", // synonym for tinyint
+        "dec",
+        "numeric",
+        "fixed",
+        "bool",
+        "boolean",
         // date and time types
         "date",
         "datetime",
@@ -142,10 +142,10 @@ class MySqlTranslator extends sqlTranslator_1.SqlTranslator {
         "year",
         // string types
         "char",
-        "nchar", // synonym for national char
+        "nchar",
         "national char",
         "varchar",
-        "nvarchar", // synonym for national varchar
+        "nvarchar",
         "national varchar",
         "blob",
         "text",