oak-db 2.2.0 → 2.2.2

package/lib/MySQL/store.d.ts

@@ -1,4 +1,4 @@
-import { EntityDict, DeduceCreateSingleOperation, DeduceRemoveOperation, DeduceUpdateOperation, OperateOption, OperationResult, TxnOption, StorageSchema, DeduceCreateMultipleOperation, SelectOption, AggregationResult } from 'oak-domain/lib/types';
+import { EntityDict, OperateOption, OperationResult, TxnOption, StorageSchema, SelectOption, AggregationResult } from 'oak-domain/lib/types';
 import { EntityDict as BaseEntityDict } from 'oak-domain/lib/base-app-domain';
 import { CascadeStore } from 'oak-domain/lib/store/CascadeStore';
 import { MySQLConfiguration } from './types/Configuration';
@@ -19,7 +19,7 @@ export declare class MysqlStore<ED extends EntityDict & BaseEntityDict, Cxt exte
     protected supportMultipleCreate(): boolean;
     private formResult;
     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: DeduceCreateMultipleOperation<ED[T]['Schema']> | DeduceCreateSingleOperation<ED[T]['Schema']> | DeduceUpdateOperation<ED[T]['Schema']> | DeduceRemoveOperation<ED[T]['Schema']>, context: AsyncContext<ED>, option?: MysqlOperateOption): Promise<number>;
+    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']>[]>;
     count<T extends keyof ED>(entity: T, selection: Pick<ED[T]['Selection'], 'filter' | 'count'>, context: Cxt, option: SelectOption): Promise<number>;

package/lib/MySQL/translator.d.ts

@@ -97,7 +97,8 @@ export declare class MySqlTranslator<ED extends EntityDict> extends SqlTranslato
         replace?: boolean;
     }): string[];
     private translateFnName;
-    protected translateExpression<T extends keyof ED>(alias: string, expression: RefOrExpression<keyof ED[T]["OpSchema"]>, refDict: Record<string, string>): string;
+    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(removeText: string, fromText: string, aliasDict: Record<string, string>, filterText: string, sorterText?: string, indexFrom?: number, count?: number, option?: MysqlOperateOption): string;

package/lib/MySQL/translator.js

@@ -83,7 +83,7 @@ var MySqlTranslator = /** @class */ (function (_super) {
         if (option === null || option === void 0 ? void 0 : option.includedDeleted) {
             return '';
         }
-        return " `".concat(alias, "`.`$$deleteAt$$` is null");
+        return " (`".concat(alias, "`.`$$deleteAt$$` is null)");
     };
     MySqlTranslator.prototype.makeUpSchema = function () {
         for (var entity in this.schema) {
@@ -357,21 +357,32 @@ var MySqlTranslator = /** @class */ (function (_super) {
     MySqlTranslator.prototype.translateFnName = function (fnName, argumentNumber) {
         switch (fnName) {
             case '$add': {
-                return '%s + %s';
+                var result = '%s';
+                while (--argumentNumber > 0) {
+                    result += ' + %s';
+                }
+                return result;
             }
             case '$subtract': {
+                (0, assert_1.default)(argumentNumber === 2);
                 return '%s - %s';
             }
             case '$multiply': {
-                return '%s * %s';
+                var result = '%s';
+                while (--argumentNumber > 0) {
+                    result += ' * %s';
+                }
+                return result;
             }
             case '$divide': {
+                (0, assert_1.default)(argumentNumber === 2);
                 return '%s / %s';
             }
             case '$abs': {
                 return 'ABS(%s)';
             }
             case '$round': {
+                (0, assert_1.default)(argumentNumber === 2);
                 return 'ROUND(%s, %s)';
             }
             case '$ceil': {
@@ -381,33 +392,42 @@ var MySqlTranslator = /** @class */ (function (_super) {
                 return 'FLOOR(%s)';
             }
             case '$pow': {
+                (0, assert_1.default)(argumentNumber === 2);
                 return 'POW(%s, %s)';
             }
             case '$gt': {
+                (0, assert_1.default)(argumentNumber === 2);
                 return '%s > %s';
             }
             case '$gte': {
+                (0, assert_1.default)(argumentNumber === 2);
                 return '%s >= %s';
             }
             case '$lt': {
+                (0, assert_1.default)(argumentNumber === 2);
                 return '%s < %s';
             }
             case '$lte': {
                 return '%s <= %s';
             }
             case '$eq': {
+                (0, assert_1.default)(argumentNumber === 2);
                 return '%s = %s';
             }
             case '$ne': {
+                (0, assert_1.default)(argumentNumber === 2);
                 return '%s <> %s';
             }
             case '$startsWith': {
+                (0, assert_1.default)(argumentNumber === 2);
                 return '%s like CONCAT(%s, \'%\')';
             }
             case '$endsWith': {
+                (0, assert_1.default)(argumentNumber === 2);
                 return '%s like CONCAT(\'%\', %s)';
             }
             case '$includes': {
+                (0, assert_1.default)(argumentNumber === 2);
                 return '%s like CONCAT(\'%\', %s, \'%\')';
             }
             case '$true': {
@@ -464,27 +484,47 @@ var MySqlTranslator = /** @class */ (function (_super) {
                 return 'DAYOFYEAR(%s)';
             }
             case '$dateDiff': {
+                (0, assert_1.default)(argumentNumber === 3);
                 return 'DATEDIFF(%s, %s, %s)';
             }
             case '$contains': {
+                (0, assert_1.default)(argumentNumber === 2);
                 return 'ST_CONTAINS(%s, %s)';
             }
             case '$distance': {
+                (0, assert_1.default)(argumentNumber === 2);
                 return 'ST_DISTANCE(%s, %s)';
             }
+            case '$concat': {
+                var result = ' concat(%s';
+                while (--argumentNumber > 0) {
+                    result += ', %s';
+                }
+                result += ')';
+                return result;
+            }
             default: {
                 throw new Error("unrecoganized function ".concat(fnName));
             }
         }
     };
-    MySqlTranslator.prototype.translateExpression = function (alias, expression, refDict) {
+    MySqlTranslator.prototype.translateAttrInExpression = function (entity, attr, exprText) {
+        var attributes = this.schema[entity].attributes;
+        var type = attributes[attr].type;
+        if (['date', 'time', 'datetime'].includes(type)) {
+            // 从unix时间戵转成date类型参加expr的运算
+            return "from_unixtime(".concat(exprText, " / 1000)");
+        }
+        return exprText;
+    };
+    MySqlTranslator.prototype.translateExpression = function (entity, alias, expression, refDict) {
         var _this = this;
         var translateConstant = function (constant) {
-            if (typeof constant === 'string') {
-                return " ".concat(new Date(constant).valueOf());
+            if (constant instanceof Date) {
+                return " from_unixtime(".concat(constant.valueOf(), "/1000)");
             }
-            else if (constant instanceof Date) {
-                return " ".concat(constant.valueOf());
+            else if (typeof constant === 'string') {
+                return " '".concat(constant, "'");
             }
             else {
                 (0, assert_1.default)(typeof constant === 'number');
@@ -496,14 +536,14 @@ var MySqlTranslator = /** @class */ (function (_super) {
             var result;
             if (k.includes('#attr')) {
                 var attrText = "`".concat(alias, "`.`").concat((expr)['#attr'], "`");
-                result = attrText;
+                result = _this.translateAttrInExpression(entity, (expr)['#attr'], attrText);
             }
             else if (k.includes('#refId')) {
                 var refId = (expr)['#refId'];
                 var refAttr = (expr)['#refAttr'];
                 (0, assert_1.default)(refDict[refId]);
-                var attrText = "`".concat(refDict[refId], "`.`").concat(refAttr, "`");
-                result = attrText;
+                var attrText = "`".concat(refDict[refId][0], "`.`").concat(refAttr, "`");
+                result = _this.translateAttrInExpression(entity, (expr)['#refAttr'], attrText);
             }
             else {
                 (0, assert_1.default)(k.length === 1);

package/lib/sqlTranslator.d.ts

@@ -1,4 +1,4 @@
-import { DeduceCreateOperationData, EntityDict, OperateOption, Q_FullTextValue, Ref, RefOrExpression, SelectOption, StorageSchema } from "oak-domain/lib/types";
+import { EntityDict, OperateOption, Q_FullTextValue, Ref, RefOrExpression, SelectOption, StorageSchema } from "oak-domain/lib/types";
 import { DataType } from "oak-domain/lib/types/schema/DataTypes";
 export interface SqlSelectOption extends SelectOption {
 }
@@ -18,9 +18,9 @@ export declare abstract class SqlTranslator<ED extends EntityDict> {
     protected abstract populateSelectStmt<T extends keyof ED, OP extends SqlSelectOption>(projectionText: string, fromText: string, aliasDict: Record<string, string>, filterText: string, sorterText?: string, groupByText?: string, indexFrom?: number, count?: number, option?: OP, selection?: ED[T]['Selection'], aggregation?: ED[T]['Aggregation']): string;
     protected abstract populateUpdateStmt<OP extends SqlOperateOption>(updateText: string, fromText: string, aliasDict: Record<string, string>, filterText: string, sorterText?: string, indexFrom?: number, count?: number, option?: OP): string;
     protected abstract populateRemoveStmt<OP extends SqlOperateOption>(removeText: string, fromText: string, aliasDict: Record<string, string>, filterText: string, sorterText?: string, indexFrom?: number, count?: number, option?: OP): string;
-    protected abstract translateExpression<T extends keyof ED>(alias: string, expression: RefOrExpression<keyof ED[T]['OpSchema']>, refDict: Record<string, string>): string;
+    protected abstract translateExpression<T extends keyof ED>(entity: T, alias: string, expression: RefOrExpression<keyof ED[T]['OpSchema']>, refDict: Record<string, [string, keyof ED]>): string;
     private getStorageName;
-    translateInsert<T extends keyof ED>(entity: T, data: DeduceCreateOperationData<ED[T]['OpSchema']>[]): string;
+    translateInsert<T extends keyof ED>(entity: T, data: ED[T]['CreateMulti']['data']): string;
     /**
      * analyze the join relations in projection/query/sort
      * 所有的层次关系都当成left join处理，如果有内表为空的情况，请手动处理

package/lib/sqlTranslator.js

@@ -195,6 +195,8 @@ var SqlTranslator = /** @class */ (function () {
                         alias: alias,
                     });
                 }
+                else if (['$text'].includes(op)) {
+                }
                 else {
                     var rel = (0, relation_1.judgeRelation)(_this.schema, entityName, op);
                     if (typeof rel === 'string') {
@@ -246,7 +248,7 @@ var SqlTranslator = /** @class */ (function () {
             if (node['#id']) {
                 (0, assert_1.default)(!filterRefAlias[node['#id']]);
                 (0, lodash_1.assign)(filterRefAlias, (_b = {},
-                    _b[node['#id']] = alias,
+                    _b[node['#id']] = [alias, entityName],
                     _b));
             }
         };
@@ -368,7 +370,7 @@ var SqlTranslator = /** @class */ (function () {
             if (node['#id']) {
                 (0, assert_1.default)(!projectionRefAlias[node['#id']], "projection\u4E0A\u6709\u91CD\u590D\u7684#id\u5B9A\u4E49\u300C".concat(node['#id'], "\u300D"));
                 (0, lodash_1.assign)(projectionRefAlias, (_b = {},
-                    _b[node['#id']] = alias,
+                    _b[node['#id']] = [alias, entityName],
                     _b));
             }
         };
@@ -514,9 +516,9 @@ var SqlTranslator = /** @class */ (function () {
                     if (whereText) {
                         whereText += ' and ';
                     }
-                    whereText + '(';
                     if (['$and', '$or', '$xor', '$not'].includes(attr)) {
                         var result = '';
+                        whereText += '(';
                         switch (attr) {
                             case '$and':
                             case '$or':
@@ -543,10 +545,11 @@ var SqlTranslator = /** @class */ (function () {
                                 }
                             }
                         }
+                        whereText += ')';
                     }
                     else if (attr.toLowerCase().startsWith(types_1.EXPRESSION_PREFIX)) {
                         // expression
-                        whereText += " (".concat(_this.translateExpression(alias, filter2[attr], filterRefAlias), ")");
+                        whereText += " (".concat(_this.translateExpression(entity2, alias, filter2[attr], filterRefAlias), ")");
                     }
                     else if (['$gt', '$gte', '$lt', '$lte', '$eq', '$ne', '$startsWith', '$endsWith', '$includes'].includes(attr)) {
                         whereText += _this.translateComparison(attr, filter2[attr], type);
@@ -562,24 +565,23 @@ var SqlTranslator = /** @class */ (function () {
                     else {
                         var rel = (0, relation_1.judgeRelation)(_this.schema, entity2, attr);
                         if (rel === 2) {
-                            whereText += " ".concat(translateInner(attr, "".concat(path).concat(attr, "/"), filter2[attr]));
+                            whereText += " (".concat(translateInner(attr, "".concat(path).concat(attr, "/"), filter2[attr]), ")");
                         }
                         else if (typeof rel === 'string') {
-                            whereText += " ".concat(translateInner(rel, "".concat(path).concat(attr, "/"), filter2[attr]));
+                            whereText += " (".concat(translateInner(rel, "".concat(path).concat(attr, "/"), filter2[attr]), ")");
                         }
                         else {
                             (0, assert_1.default)(attributes.hasOwnProperty(attr), "\u975E\u6CD5\u7684\u5C5E\u6027".concat(attr));
                             var type2 = attributes[attr].type;
                             //                                 assert (type2 !== 'ref');
                             if (typeof filter2[attr] === 'object' && Object.keys(filter2[attr])[0] && Object.keys(filter2[attr])[0].startsWith('$')) {
-                                whereText += " `".concat(alias, "`.`").concat(attr, "` ").concat(translateInner(entity2, path, filter2[attr], type2));
+                                whereText += " (`".concat(alias, "`.`").concat(attr, "` ").concat(translateInner(entity2, path, filter2[attr], type2), ")");
                             }
                             else {
-                                whereText += " `".concat(alias, "`.`").concat(attr, "` = ").concat(_this.translateAttrValue(type2, filter2[attr]));
+                                whereText += " (`".concat(alias, "`.`").concat(attr, "` = ").concat(_this.translateAttrValue(type2, filter2[attr]), ")");
                             }
                         }
                     }
-                    whereText + ')';
                 });
             }
             if (!whereText) {
@@ -606,7 +608,7 @@ var SqlTranslator = /** @class */ (function () {
             var attr = Object.keys(sortAttr)[0];
             var alias = aliasDict[path];
             if (attr.toLocaleLowerCase().startsWith(types_1.EXPRESSION_PREFIX)) {
-                return _this.translateExpression(alias, sortAttr[attr], {});
+                return _this.translateExpression(entity2, alias, sortAttr[attr], {});
             }
             else if (sortAttr[attr] === 1) {
                 return "`".concat(alias, "`.`").concat(attr, "`");
@@ -654,7 +656,7 @@ var SqlTranslator = /** @class */ (function () {
             attrs.forEach(function (attr, idx) {
                 var prefix2 = commonPrefix ? "".concat(commonPrefix, ".").concat(prefix) : prefix;
                 if (attr.toLowerCase().startsWith(types_1.EXPRESSION_PREFIX)) {
-                    var exprText = _this.translateExpression(alias, projection2[attr], projectionRefAlias);
+                    var exprText = _this.translateExpression(entity2, alias, projection2[attr], projectionRefAlias);
                     if (disableAs) {
                         projText += " ".concat(exprText);
                     }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "oak-db",
-	"version": "2.2.0",
+	"version": "2.2.2",
 	"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": "^2.3.0",
+		"oak-domain": "^2.4.0",
 		"uuid": "^8.3.2"
 	},
 	"license": "ISC",
@@ -29,7 +29,7 @@
 		"@types/node": "^17.0.42",
 		"@types/uuid": "^8.3.4",
 		"mocha": "^10.0.0",
-		"oak-general-business": "^2.3.0",
+		"oak-general-business": "^2.3.2",
 		"ts-node": "~10.9.1",
 		"tslib": "^2.4.0",
 		"typescript": "~4.7.4"