oak-db 3.3.12 → 3.3.14

package/lib/sqlTranslator.d.ts

@@ -53,7 +53,11 @@ export declare abstract class SqlTranslator<ED extends EntityDict & BaseEntityDi
     };
     private translateSorter;
     private translateProjection;
-    private translateSelectInner;
+    protected translateSelectInner<T extends keyof ED, OP extends SqlSelectOption>(entity: T, selection: ED[T]['Selection'], initialNumber: number, refAlias: Record<string, [string, keyof ED]>, option?: OP): {
+        filterStmt: string;
+        stmt: string;
+        currentNumber: number;
+    };
     translateSelect<T extends keyof ED, OP extends SqlSelectOption>(entity: T, selection: ED[T]['Selection'], option?: OP): string;
     translateWhere<T extends keyof ED, OP extends SqlSelectOption>(entity: T, selection: ED[T]['Selection'], option?: OP): string;
     translateAggregate<T extends keyof ED, OP extends SqlSelectOption>(entity: T, aggregation: ED[T]['Aggregation'], option?: OP): string;

package/lib/sqlTranslator.js

@@ -72,6 +72,8 @@ class SqlTranslator {
                     name: `${entity}_trigger_uuid_auto_create`,
                     attributes: [{
                             name: types_1.TriggerUuidAttribute,
+                        }, {
+                            name: types_1.DeleteAtAttribute,
                         }]
                 },
             ];
@@ -84,7 +86,7 @@ class SqlTranslator {
                             attributes: [{
                                     name: attr,
                                 }, {
-                                    name: '$$deleteAt$$',
+                                    name: types_1.DeleteAtAttribute,
                                 }]
                         });
                     }
@@ -100,7 +102,7 @@ class SqlTranslator {
                                     }, {
                                         name: 'entityId',
                                     }, {
-                                        name: '$$deleteAt$$',
+                                        name: types_1.DeleteAtAttribute,
                                     }]
                             });
                         }
@@ -113,7 +115,7 @@ class SqlTranslator {
                             attributes: [{
                                     name: attr,
                                 }, {
-                                    name: '$$deleteAt$$',
+                                    name: types_1.DeleteAtAttribute,
                                 }]
                         });
                     }
@@ -129,7 +131,7 @@ class SqlTranslator {
                                     }, {
                                         name: 'expiresAt',
                                     }, {
-                                        name: '$$deleteAt$$',
+                                        name: types_1.DeleteAtAttribute,
                                     }]
                             });
                         }
@@ -562,10 +564,10 @@ class SqlTranslator {
     translateFilter(entity, filter, aliasDict, filterRefAlias, initialNumber, option) {
         const { schema } = this;
         let currentNumber = initialNumber;
-        const translateInner = (entity2, path, filter2, type) => {
+        const translateInner = (entity2, path, filter2, skipDeletePhy) => {
             const alias = aliasDict[path];
             const { attributes } = schema[entity2];
-            let whereText = type ? '' : this.getDefaultSelectFilter(alias, option);
+            let whereText = skipDeletePhy ? '' : this.getDefaultSelectFilter(alias, option);
             if (filter2) {
                 const attrs = Object.keys(filter2).filter(ele => !ele.startsWith('#'));
                 attrs.forEach((attr) => {
@@ -580,7 +582,7 @@ class SqlTranslator {
                             case '$xor': {
                                 const logicQueries = filter2[attr];
                                 logicQueries.forEach((logicQuery, index) => {
-                                    const sql = translateInner(entity2, path, logicQuery, 'ref'); // 只要传个值就行了，应该无所谓
+                                    const sql = translateInner(entity2, path, logicQuery, true); // 只要传个值就行了，应该无所谓
                                     if (sql) {
                                         whereText += ` (${sql})`;
                                         if (index < logicQueries.length - 1) {
@@ -593,7 +595,7 @@ class SqlTranslator {
                             default: {
                                 (0, assert_1.default)(attr === '$not');
                                 const logicQuery = filter2[attr];
-                                const sql = translateInner(entity2, path, logicQuery, 'ref'); // 只要传个值就行了，应该无所谓
+                                const sql = translateInner(entity2, path, logicQuery, true); // 只要传个值就行了，应该无所谓
                                 if (sql) {
                                     whereText += ` not (${sql})`;
                                     break;
@@ -963,6 +965,10 @@ class SqlTranslator {
         const { data, filter, sorter, indexFrom, count } = operation;
         (0, assert_1.default)(!sorter, '当前remove不支持sorter行为');
         const { aliasDict, filterRefAlias, from: fromText, currentNumber } = this.analyzeJoin(entity, { filter, sorter });
+        // 对于limit，如果有indexForm则一定有count
+        if (typeof indexFrom === 'number') {
+            (0, assert_1.default)(typeof count === 'number' && count > 0);
+        }
         const alias = aliasDict['./'];
         // 这里原来includeDeleted传的是true，不知道原因，但不合理
         const { stmt: filterText } = this.translateFilter(entity, filter, aliasDict, filterRefAlias, currentNumber, { includedDeleted: option?.includedDeleted });
@@ -990,6 +996,10 @@ class SqlTranslator {
         const { filter, sorter, indexFrom, count, data } = operation;
         (0, assert_1.default)(!sorter, '当前update不支持sorter行为');
         const { aliasDict, filterRefAlias, from: fromText, currentNumber } = this.analyzeJoin(entity, { filter, sorter });
+        // 对于limit，如果有indexForm则一定有count
+        if (typeof indexFrom === 'number') {
+            (0, assert_1.default)(typeof count === 'number' && count > 0);
+        }
         const alias = aliasDict['./'];
         let updateText = '';
         for (const attr in data) {

package/lib/types/dbStore.d.ts

@@ -1,8 +1,33 @@
-import { EntityDict } from "oak-domain/lib/base-app-domain";
+import { Attribute, EntityDict, Index, OperateOption, OperationResult, StorageSchema, TxnOption } from 'oak-domain/lib/types';
+import { EntityDict as BaseEntityDict } from 'oak-domain/lib/base-app-domain';
 import { AsyncContext, AsyncRowStore } from "oak-domain/lib/store/AsyncRowStore";
 import { CreateEntityOption } from "./Translator";
-export interface DbStore<ED extends EntityDict, Cxt extends AsyncContext<ED>> extends AsyncRowStore<ED, Cxt> {
+import { AggregationResult, SelectOption } from "oak-domain/lib/types";
+export type Plan = {
+    newTables: Record<string, {
+        attributes: Record<string, Attribute>;
+    }>;
+    newIndexes: Record<string, Index<any>[]>;
+    updatedTables: Record<string, {
+        attributes: Record<string, Attribute & {
+            isNew: boolean;
+        }>;
+    }>;
+    updatedIndexes: Record<string, Index<any>[]>;
+};
+export interface DbStore<ED extends EntityDict & BaseEntityDict, Cxt extends AsyncContext<ED>> extends AsyncRowStore<ED, Cxt> {
+    checkRelationAsync<T extends keyof ED, Cxt extends AsyncContext<ED>>(entity: T, operation: Omit<ED[T]['Operation'] | ED[T]['Selection'], 'id'>, context: Cxt): Promise<void>;
     connect: () => Promise<void>;
     disconnect: () => Promise<void>;
     initialize(options: CreateEntityOption): Promise<void>;
+    aggregate<T extends keyof ED, OP extends SelectOption>(entity: T, aggregation: ED[T]['Aggregation'], context: Cxt, option: OP): Promise<AggregationResult<ED[T]['Schema']>>;
+    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']>[]>;
+    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>;
+    rollback(txnId: string): Promise<void>;
+    readSchema(): Promise<StorageSchema<ED>>;
+    makeUpgradePlan(): Promise<Plan>;
+    diffSchema(schemaOld: StorageSchema<any>, schemaNew: StorageSchema<any>): Plan;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "oak-db",
-	"version": "3.3.12",
+	"version": "3.3.14",
 	"description": "oak-db",
 	"main": "lib/index",
 	"author": {
@@ -18,7 +18,7 @@
 		"lodash": "^4.17.21",
 		"mysql": "^2.18.1",
 		"mysql2": "^2.3.3",
-		"oak-domain": "^5.1.33",
+		"oak-domain": "^5.1.36",
 		"pg": "^8.16.3",
 		"uuid": "^8.3.2"
 	},