oak-db 3.0.3 → 3.1.0

package/lib/MySQL/store.d.ts

@@ -7,14 +7,15 @@ import { MySqlTranslator, MySqlSelectOption, MysqlOperateOption } from './transl
 import { AsyncContext, AsyncRowStore } from 'oak-domain/lib/store/AsyncRowStore';
 import { SyncContext } from 'oak-domain/lib/store/SyncRowStore';
 export declare class MysqlStore<ED extends EntityDict & BaseEntityDict, Cxt extends AsyncContext<ED>> extends CascadeStore<ED> implements AsyncRowStore<ED, Cxt> {
-    protected aggregateSync<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 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 aggregateAsync<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']>>;
+    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;
@@ -23,7 +24,7 @@ export declare class MysqlStore<ED extends EntityDict & BaseEntityDict, Cxt exte
     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 countAsync<T extends keyof ED>(entity: T, selection: Pick<ED[T]['Selection'], 'filter' | 'count'>, context: AsyncContext<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

@@ -21,7 +21,10 @@ function convertGeoTextToObject(geoText) {
     }
 }
 class MysqlStore extends CascadeStore_1.CascadeStore {
-    aggregateSync(entity, aggregation, context, option) {
+    countAbjointRow(entity, selection, context, option) {
+        throw new Error('MySQL store不支持同步取数据，不应该跑到这儿');
+    }
+    aggregateAbjointRowSync(entity, aggregation, context, option) {
         throw new Error('MySQL store不支持同步取数据，不应该跑到这儿');
     }
     selectAbjointRow(entity, selection, context, option) {
@@ -40,7 +43,7 @@ class MysqlStore extends CascadeStore_1.CascadeStore {
         this.connector = new connector_1.MySqlConnector(configuration);
         this.translator = new translator_1.MySqlTranslator(storageSchema);
     }
-    async aggregateAsync(entity, aggregation, context, option) {
+    async aggregateAbjointRowAsync(entity, aggregation, context, option) {
         const sql = this.translator.translateAggregate(entity, aggregation, option);
         const result = await this.connector.exec(sql, context.getCurrentTxnId());
         return this.formResult(entity, result);
@@ -264,7 +267,7 @@ class MysqlStore extends CascadeStore_1.CascadeStore {
         const result = await super.selectAsync(entity, selection, context, option);
         return result;
     }
-    async countAsync(entity, selection, context, option) {
+    async countAbjointRowAsync(entity, selection, context, option) {
         const sql = this.translator.translateCount(entity, selection, option);
         const result = await this.connector.exec(sql, context.getCurrentTxnId());
         return result[0].cnt;

package/lib/sqlTranslator.js

@@ -522,6 +522,10 @@ class SqlTranslator {
             // between是所有数据库都支持的语法吗？
             return ` between ${values[0]} and ${values[1]}`;
         }
+        else if (predicate === '$mod') {
+            // %是所有数据库都支持的语法吗？
+            return ` % ${value[0]} = ${value[1]}`;
+        }
         else {
             (0, assert_1.default)(predicate === '$exists');
             if (value) {
@@ -818,7 +822,7 @@ class SqlTranslator {
         };
     }
     translateSelectInner(entity, selection, initialNumber, refAlias, option) {
-        const { data, filter, sorter, indexFrom, count } = selection;
+        const { data, filter, sorter, indexFrom, count, distinct } = selection;
         const { from: fromText, aliasDict, projectionRefAlias, filterRefAlias, currentNumber } = this.analyzeJoin(entity, {
             projection: data,
             filter,
@@ -826,7 +830,10 @@ class SqlTranslator {
         }, initialNumber);
         (0, assert_1.default)((0, lodash_1.intersection)((0, lodash_1.keys)(refAlias), (0, lodash_1.keys)(filterRefAlias)).length === 0, 'filter中的#node结点定义有重复');
         (0, lodash_1.assign)(refAlias, filterRefAlias);
-        const { projText } = this.translateProjection(entity, data, aliasDict, projectionRefAlias);
+        let { projText } = this.translateProjection(entity, data, aliasDict, projectionRefAlias);
+        if (distinct) {
+            projText = `distinct ${projText}`;
+        }
         const { stmt: filterText, currentNumber: currentNumber2 } = this.translateFilter(entity, filter, aliasDict, refAlias, currentNumber, option);
         const sorterText = sorter && this.translateSorter(entity, sorter, aliasDict);
         return {
@@ -844,7 +851,7 @@ class SqlTranslator {
         return filterStmt;
     }
     translateAggregate(entity, aggregation, option) {
-        const { data, filter, sorter, indexFrom, count } = aggregation;
+        const { data, filter, sorter, indexFrom, count, distinct } = aggregation;
         const { from: fromText, aliasDict, projectionRefAlias, filterRefAlias, currentNumber } = this.analyzeJoin(entity, {
             aggregation: data,
             filter,
@@ -863,8 +870,8 @@ class SqlTranslator {
                 }
                 groupByText = as;
             }
-            else {
-                const { projText: projSubText } = this.translateProjection(entity, data[k], aliasDict, projectionRefAlias, undefined, true);
+            else if (k.startsWith('#')) {
+                let { projText: projSubText } = this.translateProjection(entity, data[k], aliasDict, projectionRefAlias, undefined, true);
                 let projSubText2 = '';
                 if (k.startsWith('#max')) {
                     projSubText2 = `max(${projSubText}) as \`${k}\``;
@@ -873,12 +880,21 @@ class SqlTranslator {
                     projSubText2 = `min(${projSubText}) as \`${k}\``;
                 }
                 else if (k.startsWith('#count')) {
+                    if (data.distinct) {
+                        projSubText = `distinct ${projSubText}`;
+                    }
                     projSubText2 = `count(${projSubText}) as \`${k}\``;
                 }
                 else if (k.startsWith('#sum')) {
+                    if (data.distinct) {
+                        projSubText = `distinct ${projSubText}`;
+                    }
                     projSubText2 = `sum(${projSubText}) as \`${k}\``;
                 }
                 else {
+                    if (data.distinct) {
+                        projSubText = `distinct ${projSubText}`;
+                    }
                     (0, assert_1.default)(k.startsWith('#avg'));
                     projSubText2 = `avg(${projSubText}) as \`${k}\``;
                 }
@@ -902,7 +918,7 @@ class SqlTranslator {
         const projText = 'count(1) cnt';
         const { stmt: filterText } = this.translateFilter(entity, filter, aliasDict, filterRefAlias, currentNumber, option);
         if (count && count > 0) {
-            const subQuerySql = this.populateSelectStmt('1', fromText, aliasDict, filterText, undefined, undefined, undefined, undefined, option, Object.assign({}, selection, { indexFrom: 0, count }));
+            const subQuerySql = this.populateSelectStmt('1', fromText, aliasDict, filterText, undefined, undefined, 0, count, option, Object.assign({}, selection, { indexFrom: 0, count }));
             return `select count(1) cnt from (${subQuerySql}) __tmp`;
         }
         return this.populateSelectStmt(projText, fromText, aliasDict, filterText, undefined, undefined, undefined, undefined, option, selection);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "oak-db",
-	"version": "3.0.3",
+	"version": "3.1.0",
 	"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": "^4.0.0",
+		"oak-domain": "^4.0.2",
 		"uuid": "^8.3.2"
 	},
 	"license": "ISC",
@@ -31,7 +31,7 @@
 		"@types/uuid": "^8.3.4",
 		"cross-env": "^7.0.3",
 		"mocha": "^10.2.0",
-		"oak-general-business": "^4.0.0",
+		"oak-general-business": "^4.0.3",
 		"ts-node": "^10.9.1",
 		"tslib": "^2.4.0",
 		"typescript": "^5.2.2"