oak-db 1.0.6 → 2.0.2

package/lib/MySQL/store.d.ts

@@ -1,20 +1,24 @@
-import { EntityDict, Context, DeduceCreateSingleOperation, DeduceRemoveOperation, DeduceUpdateOperation, OperateOption, OperationResult, SelectionResult, TxnOption, SelectRowShape, StorageSchema, DeduceCreateMultipleOperation, SelectOption } from 'oak-domain/lib/types';
+import { EntityDict, DeduceCreateSingleOperation, DeduceRemoveOperation, DeduceUpdateOperation, OperateOption, OperationResult, TxnOption, StorageSchema, DeduceCreateMultipleOperation, SelectOption } 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';
 import { MySqlConnector } from './connector';
 import { MySqlTranslator, MySqlSelectOption, MysqlOperateOption } from './translator';
-export declare class MysqlStore<ED extends EntityDict & BaseEntityDict, Cxt extends Context<ED>> extends CascadeStore<ED, Cxt> {
+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 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;
     connector: MySqlConnector;
     translator: MySqlTranslator<ED>;
     constructor(storageSchema: StorageSchema<ED>, configuration: MySQLConfiguration);
     protected supportManyToOneJoin(): boolean;
     protected supportMultipleCreate(): boolean;
     private formResult;
-    protected selectAbjointRow<T extends keyof ED, S extends ED[T]['Selection']>(entity: T, selection: S, context: Cxt, option?: MySqlSelectOption): Promise<SelectRowShape<ED[T]['Schema'], S['data']>[]>;
-    protected updateAbjointRow<T extends keyof ED>(entity: T, operation: DeduceCreateMultipleOperation<ED[T]['Schema']> | DeduceCreateSingleOperation<ED[T]['Schema']> | DeduceUpdateOperation<ED[T]['Schema']> | DeduceRemoveOperation<ED[T]['Schema']>, context: Cxt, 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: DeduceCreateMultipleOperation<ED[T]['Schema']> | DeduceCreateSingleOperation<ED[T]['Schema']> | DeduceUpdateOperation<ED[T]['Schema']> | DeduceRemoveOperation<ED[T]['Schema']>, 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, S extends ED[T]['Selection']>(entity: T, selection: S, context: Cxt, option: SelectOption): Promise<SelectionResult<ED[T]['Schema'], S['data']>>;
+    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>;

package/lib/MySQL/store.js

@@ -28,6 +28,12 @@ var MysqlStore = /** @class */ (function (_super) {
         _this.translator = new translator_1.MySqlTranslator(storageSchema);
         return _this;
     }
+    MysqlStore.prototype.selectAbjointRow = function (entity, selection, context, option) {
+        throw new Error('MySQL store不支持同步取数据，不应该跑到这儿');
+    };
+    MysqlStore.prototype.updateAbjointRow = function (entity, operation, context, option) {
+        throw new Error('MySQL store不支持同步更新数据，不应该跑到这儿');
+    };
     MysqlStore.prototype.supportManyToOneJoin = function () {
         return true;
     };
@@ -166,7 +172,7 @@ var MysqlStore = /** @class */ (function (_super) {
         }
         return formSingleRow(result);
     };
-    MysqlStore.prototype.selectAbjointRow = function (entity, selection, context, option) {
+    MysqlStore.prototype.selectAbjointRowAsync = function (entity, selection, context, option) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var sql, result;
             return tslib_1.__generator(this, function (_a) {
@@ -181,7 +187,7 @@ var MysqlStore = /** @class */ (function (_super) {
             });
         });
     };
-    MysqlStore.prototype.updateAbjointRow = function (entity, operation, context, option) {
+    MysqlStore.prototype.updateAbjointRowAsync = function (entity, operation, context, option) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var _a, translator, connector, action, txn, _b, data, sql, sql, sql;
             return tslib_1.__generator(this, function (_c) {
@@ -252,7 +258,7 @@ var MysqlStore = /** @class */ (function (_super) {
                     case 0:
                         action = operation.action;
                         (0, assert_1.default)(!['select', 'download', 'stat'].includes(action), '现在不支持使用select operation');
-                        return [4 /*yield*/, this.cascadeUpdate(entity, operation, context, option)];
+                        return [4 /*yield*/, this.cascadeUpdateAsync(entity, operation, context, option)];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -263,12 +269,10 @@ var MysqlStore = /** @class */ (function (_super) {
             var result;
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.cascadeSelect(entity, selection, context, option)];
+                    case 0: return [4 /*yield*/, this.cascadeSelectAsync(entity, selection, context, option)];
                     case 1:
                         result = _a.sent();
-                        return [2 /*return*/, {
-                                result: result,
-                            }];
+                        return [2 /*return*/, result];
                 }
             });
         });

package/lib/MySQL/translator.js

@@ -5,7 +5,6 @@ var tslib_1 = require("tslib");
 var assert_1 = tslib_1.__importDefault(require("assert"));
 var util_1 = require("util");
 var lodash_1 = require("lodash");
-var luxon_1 = require("luxon");
 var sqlTranslator_1 = require("../sqlTranslator");
 var GeoTypes = [
     {
@@ -125,7 +124,7 @@ var MySqlTranslator = /** @class */ (function (_super) {
         }
     };
     MySqlTranslator.prototype.populateDataTypeDef = function (type, params) {
-        if (['date', 'datetime', 'time'].includes(type)) {
+        if (['date', 'datetime', 'time', 'sequence'].includes(type)) {
             return 'bigint ';
         }
         if (['object', 'array'].includes(type)) {
@@ -251,6 +250,7 @@ var MySqlTranslator = /** @class */ (function (_super) {
         var schema = this.schema;
         var entityDef = schema[entity];
         var storageName = entityDef.storageName, attributes = entityDef.attributes, indexes = entityDef.indexes, view = entityDef.view;
+        var hasSequence = false;
         // todo view暂还不支持
         var entityType = view ? 'view' : 'table';
         var sql = "create ".concat(entityType, " ");
@@ -268,7 +268,7 @@ var MySqlTranslator = /** @class */ (function (_super) {
             // 翻译所有的属性
             Object.keys(attributes).forEach(function (attr, idx) {
                 var attrDef = attributes[attr];
-                var type = attrDef.type, params = attrDef.params, defaultValue = attrDef.default, unique = attrDef.unique, notNull = attrDef.notNull;
+                var type = attrDef.type, params = attrDef.params, defaultValue = attrDef.default, unique = attrDef.unique, notNull = attrDef.notNull, sequenceStart = attrDef.sequenceStart;
                 sql += "`".concat(attr, "` ");
                 sql += _this.populateDataTypeDef(type, params);
                 if (notNull || type === 'geometry') {
@@ -277,6 +277,13 @@ var MySqlTranslator = /** @class */ (function (_super) {
                 if (unique) {
                     sql += ' unique ';
                 }
+                if (sequenceStart) {
+                    if (hasSequence) {
+                        throw new Error("\u300C".concat(entity, "\u300D\u53EA\u80FD\u6709\u4E00\u4E2Asequence\u5217"));
+                    }
+                    hasSequence = sequenceStart;
+                    sql += ' auto_increment unique ';
+                }
                 if (defaultValue !== undefined) {
                     (0, assert_1.default)(type !== 'ref');
                     sql += " default ".concat(_this.translateAttrValue(type, defaultValue));
@@ -339,6 +346,9 @@ var MySqlTranslator = /** @class */ (function (_super) {
             }
         }
         sql += ')';
+        if (typeof hasSequence === 'number') {
+            sql += "auto_increment = ".concat(hasSequence);
+        }
         if (!replace) {
             return [sql];
         }
@@ -471,14 +481,14 @@ var MySqlTranslator = /** @class */ (function (_super) {
         var _this = this;
         var translateConstant = function (constant) {
             if (typeof constant === 'string') {
-                return "'".concat(constant, "'");
+                return " ".concat(new Date(constant).valueOf());
             }
             else if (constant instanceof Date) {
-                return "'".concat(luxon_1.DateTime.fromJSDate(constant).toFormat('yyyy-LL-dd HH:mm:ss'), "'");
+                return " ".concat(constant.valueOf());
             }
             else {
                 (0, assert_1.default)(typeof constant === 'number');
-                return "".concat(constant);
+                return " ".concat(constant);
             }
         };
         var translateInner = function (expr) {
@@ -547,8 +557,6 @@ var MySqlTranslator = /** @class */ (function (_super) {
     };
     MySqlTranslator.prototype.populateUpdateStmt = function (updateText, fromText, aliasDict, filterText, sorterText, indexFrom, count, option) {
         // todo using index
-        var alias = aliasDict['./'];
-        var now = luxon_1.DateTime.now().toFormat('yyyy-LL-dd HH:mm:ss');
         (0, assert_1.default)(updateText);
         var sql = "update ".concat(fromText, " set ").concat(updateText);
         if (filterText) {
@@ -566,7 +574,7 @@ var MySqlTranslator = /** @class */ (function (_super) {
     MySqlTranslator.prototype.populateRemoveStmt = function (removeText, fromText, aliasDict, filterText, sorterText, indexFrom, count, option) {
         // todo using index
         var alias = aliasDict['./'];
-        var now = luxon_1.DateTime.now().toFormat('yyyy-LL-dd HH:mm:ss');
+        var now = Date.now();
         var sql = "update ".concat(fromText, " set `").concat(alias, "`.`$$deleteAt$$` = '").concat(now, "'");
         if (filterText) {
             sql += " where ".concat(filterText);

package/lib/sqlTranslator.js

@@ -24,6 +24,10 @@ var SqlTranslator = /** @class */ (function () {
                         length: 36,
                     },
                 },
+                $$seq$$: {
+                    type: 'sequence',
+                    sequenceStart: 10000,
+                },
                 $$createAt$$: {
                     type: 'datetime',
                     notNull: true,
@@ -707,7 +711,7 @@ var SqlTranslator = /** @class */ (function () {
         (0, assert_1.default)(!sorter, '当前remove不支持sorter行为');
         var _a = this.analyzeJoin(entity, { filter: filter, sorter: sorter }), aliasDict = _a.aliasDict, filterRefAlias = _a.filterRefAlias, extraWhere = _a.extraWhere, fromText = _a.from, currentNumber = _a.currentNumber;
         var alias = aliasDict['./'];
-        var filterText = this.translateFilter(entity, operation, aliasDict, filterRefAlias, currentNumber, extraWhere).stmt;
+        var filterText = this.translateFilter(entity, operation, aliasDict, filterRefAlias, currentNumber, extraWhere, { includedDeleted: true }).stmt;
         // const sorterText = sorter && sorter.length > 0 ? this.translateSorter(entity, sorter, aliasDict) : undefined;
         return this.populateRemoveStmt(alias, fromText, aliasDict, filterText, /* sorterText */ undefined, indexFrom, count, option);
     };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "oak-db",
-	"version": "1.0.6",
+	"version": "2.0.2",
 	"description": "oak-db",
 	"main": "lib/index",
 	"author": {
@@ -16,10 +16,9 @@
 	},
 	"dependencies": {
 		"lodash": "^4.17.21",
-		"luxon": "^2.4.0",
 		"mysql": "^2.18.1",
 		"mysql2": "^2.3.3",
-		"oak-domain": "^1.1.13",
+		"oak-domain": "^2.0.1",
 		"uuid": "^8.3.2"
 	},
 	"license": "ISC",
@@ -30,7 +29,7 @@
 		"@types/node": "^17.0.42",
 		"@types/uuid": "^8.3.4",
 		"mocha": "^10.0.0",
-		"oak-general-business": "^1.0.14",
+		"oak-general-business": "^2.0.1",
 		"ts-node": "~10.9.1",
 		"tslib": "^2.4.0",
 		"typescript": "~4.7.4"