oak-db 1.0.1 → 1.0.3

package/lib/MySQL/store.d.ts

@@ -1,9 +1,10 @@
 import { EntityDict, Context, DeduceCreateSingleOperation, DeduceRemoveOperation, DeduceUpdateOperation, OperateOption, OperationResult, SelectionResult, TxnOption, SelectRowShape, 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, Cxt extends Context<ED>> extends CascadeStore<ED, Cxt> {
+export declare class MysqlStore<ED extends EntityDict & BaseEntityDict, Cxt extends Context<ED>> extends CascadeStore<ED, Cxt> {
     connector: MySqlConnector;
     translator: MySqlTranslator<ED>;
     constructor(storageSchema: StorageSchema<ED>, configuration: MySQLConfiguration);
@@ -12,9 +13,9 @@ export declare class MysqlStore<ED extends EntityDict, Cxt extends Context<ED>>
     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>;
-    operate<T extends keyof ED>(entity: T, operation: ED[T]['Operation'], context: Cxt, params?: 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']>>;
-    count<T extends keyof ED>(entity: T, selection: Pick<ED[T]['Selection'], 'filter' | 'count'>, context: Cxt, option?: SelectOption): 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']>>;
+    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>;

package/lib/MySQL/store.js

@@ -231,7 +231,7 @@ var MysqlStore = /** @class */ (function (_super) {
             });
         });
     };
-    MysqlStore.prototype.operate = function (entity, operation, context, params) {
+    MysqlStore.prototype.operate = function (entity, operation, context, option) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var action;
             return tslib_1.__generator(this, function (_a) {
@@ -239,7 +239,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, params)];
+                        return [4 /*yield*/, this.cascadeUpdate(entity, operation, context, option)];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -270,7 +270,7 @@ var MysqlStore = /** @class */ (function (_super) {
                         return [4 /*yield*/, this.connector.exec(sql, context.getCurrentTxnId())];
                     case 1:
                         result = _a.sent();
-                        return [2 /*return*/, result.count];
+                        return [2 /*return*/, result[0].cnt];
                 }
             });
         });

package/lib/MySQL/translator.js

@@ -125,6 +125,18 @@ var MySqlTranslator = /** @class */ (function (_super) {
         }
     };
     MySqlTranslator.prototype.populateDataTypeDef = function (type, params) {
+        if (['date', 'datetime', 'time'].includes(type)) {
+            return 'bigint ';
+        }
+        if (['object', 'array'].includes(type)) {
+            return 'text ';
+        }
+        if (['image', 'function'].includes(type)) {
+            return 'text ';
+        }
+        if (type === 'ref') {
+            return 'char(36)';
+        }
         if (MySqlTranslator.withLengthDataTypes.includes(type)) {
             if (params) {
                 var length_1 = params.length;
@@ -172,18 +184,6 @@ var MySqlTranslator = /** @class */ (function (_super) {
                 }
             }
         }
-        if (['date'].includes(type)) {
-            return 'datetime';
-        }
-        if (['object', 'array'].includes(type)) {
-            return 'text ';
-        }
-        if (['image', 'function'].includes(type)) {
-            return 'text ';
-        }
-        if (type === 'ref') {
-            return 'char(36)';
-        }
         return "".concat(type, " ");
     };
     MySqlTranslator.prototype.translateAttrProjection = function (dataType, alias, attr) {
@@ -197,21 +197,23 @@ var MySqlTranslator = /** @class */ (function (_super) {
         }
     };
     MySqlTranslator.prototype.translateAttrValue = function (dataType, value) {
-        if (value === null) {
+        if (value === null || value === undefined) {
             return 'null';
         }
         switch (dataType) {
             case 'geometry': {
                 return transformGeoData(value);
             }
+            case 'datetime':
+            case 'time':
             case 'date': {
                 if (value instanceof Date) {
-                    return luxon_1.DateTime.fromJSDate(value).toFormat('yyyy-LL-dd HH:mm:ss');
+                    return "".concat(value.valueOf());
                 }
                 else if (typeof value === 'number') {
-                    return luxon_1.DateTime.fromMillis(value).toFormat('yyyy-LL-dd HH:mm:ss');
+                    return "".concat(value);
                 }
-                return value;
+                return "'".concat((new Date(value)).valueOf(), "'");
             }
             case 'object':
             case 'array': {
@@ -547,7 +549,8 @@ var MySqlTranslator = /** @class */ (function (_super) {
         // todo using index
         var alias = aliasDict['./'];
         var now = luxon_1.DateTime.now().toFormat('yyyy-LL-dd HH:mm:ss');
-        var sql = "update ".concat(fromText, " set ").concat(updateText ? "".concat(updateText, ",") : '', " `").concat(alias, "`.`$$updateAt$$` = '").concat(now, "'");
+        (0, assert_1.default)(updateText);
+        var sql = "update ".concat(fromText, " set ").concat(updateText);
         if (filterText) {
             sql += " where ".concat(filterText);
         }

package/lib/sqlTranslator.js

@@ -4,7 +4,6 @@ exports.SqlTranslator = void 0;
 var tslib_1 = require("tslib");
 var assert_1 = tslib_1.__importDefault(require("assert"));
 var lodash_1 = require("lodash");
-var luxon_1 = require("luxon");
 var types_1 = require("oak-domain/lib/types");
 var relation_1 = require("oak-domain/lib/store/relation");
 ;
@@ -26,21 +25,21 @@ var SqlTranslator = /** @class */ (function () {
                     },
                 },
                 $$createAt$$: {
-                    type: 'date',
+                    type: 'datetime',
                     notNull: true,
                 },
                 $$updateAt$$: {
-                    type: 'date',
+                    type: 'datetime',
                     notNull: true,
                 },
                 $$deleteAt$$: {
-                    type: 'date',
+                    type: 'datetime',
                 },
                 $$triggerData$$: {
                     type: 'object',
                 },
                 $$triggerTimestamp$$: {
-                    type: 'date',
+                    type: 'datetime',
                 },
             });
             // 增加默认的索引
@@ -113,15 +112,18 @@ var SqlTranslator = /** @class */ (function () {
         var schema = this.schema;
         var _a = schema[entity], attributes = _a.attributes, _b = _a.storageName, storageName = _b === void 0 ? entity : _b;
         var sql = "insert into `".concat(storageName, "`(");
-        var attrs = Object.keys(data[0]).filter(function (ele) { return attributes.hasOwnProperty(ele); });
+        /**
+         * 这里的attrs要用所有行的union集合
+         */
+        var dataFull = data.reduce(function (prev, cur) { return Object.assign({}, cur, prev); }, {});
+        var attrs = Object.keys(dataFull).filter(function (ele) { return attributes.hasOwnProperty(ele); });
         attrs.forEach(function (attr, idx) {
             sql += " `".concat(attr, "`");
             if (idx < attrs.length - 1) {
                 sql += ',';
             }
         });
-        sql += ', `$$createAt$$`, `$$updateAt$$`) values ';
-        var now = luxon_1.DateTime.now().toFormat('yyyy-LL-dd HH:mm:ss');
+        sql += ') values ';
         data.forEach(function (d, dataIndex) {
             sql += '(';
             attrs.forEach(function (attr, attrIdx) {
@@ -133,9 +135,11 @@ var SqlTranslator = /** @class */ (function () {
                     sql += ',';
                 }
             });
-            sql += ", '".concat(now, "', '").concat(now, "')");
             if (dataIndex < data.length - 1) {
-                sql += ',';
+                sql += '),';
+            }
+            else {
+                sql += ')';
             }
         });
         return sql;
@@ -537,7 +541,7 @@ var SqlTranslator = /** @class */ (function () {
                         currentNumber = cn2;
                     }
                     else {
-                        var rel = (0, relation_1.judgeRelation)(_this.schema, entity, attr);
+                        var rel = (0, relation_1.judgeRelation)(_this.schema, entity2, attr);
                         if (rel === 2) {
                             whereText += " ".concat(translateInner(attr, "".concat(path).concat(attr, "/"), filter2[attr]));
                         }
@@ -685,11 +689,11 @@ var SqlTranslator = /** @class */ (function () {
         var _a = this.analyzeJoin(entity, {
             filter: filter,
         }), fromText = _a.from, aliasDict = _a.aliasDict, extraWhere = _a.extraWhere, filterRefAlias = _a.filterRefAlias, currentNumber = _a.currentNumber;
-        var projText = 'count(1)';
+        var projText = 'count(1) cnt';
         var filterText = this.translateFilter(entity, selection, aliasDict, filterRefAlias, currentNumber, extraWhere, option).stmt;
         if (count) {
-            var subQuerySql = this.populateSelectStmt('1', fromText, Object.assign({}, selection, { indexFrom: 0 }), aliasDict, filterText, undefined, undefined, undefined, option);
-            return "select count(1) from (".concat(subQuerySql, ")");
+            var subQuerySql = this.populateSelectStmt('1', fromText, Object.assign({}, selection, { indexFrom: 0, count: count }), aliasDict, filterText, undefined, undefined, undefined, option);
+            return "select count(1) cnt from (".concat(subQuerySql, ") __tmp");
         }
         return this.populateSelectStmt(projText, fromText, selection, aliasDict, filterText, undefined, undefined, undefined, option);
     };

package/package.json

@@ -1,8 +1,8 @@
 {
 	"name": "oak-db",
-	"version": "1.0.1",
+	"version": "1.0.3",
 	"description": "oak-db",
-	"main": "src/index.ts",
+	"main": "lib/index.js",
 	"author": {
 		"name": "XuChang"
 	},
@@ -19,7 +19,7 @@
 		"luxon": "^2.4.0",
 		"mysql": "^2.18.1",
 		"mysql2": "^2.3.3",
-		"oak-domain": "^1.0.4",
+		"oak-domain": "1.1.10",
 		"uuid": "^8.3.2"
 	},
 	"license": "ISC",
@@ -30,7 +30,7 @@
 		"@types/node": "^17.0.42",
 		"@types/uuid": "^8.3.4",
 		"mocha": "^10.0.0",
-		"oak-general-business": "^1.0.2",
+		"oak-general-business": "1.0.13",
 		"ts-node": "~10.9.1",
 		"tslib": "^2.4.0",
 		"typescript": "~4.7.4"

package/src/index.ts

@@ -1,2 +0,0 @@
-export * from './MySQL/store';
-export { MySqlSelectOption, MysqlOperateOption} from './MySQL/translator';