oak-db 1.0.5 → 1.0.7

package/lib/MySQL/store.js

@@ -56,10 +56,12 @@ var MysqlStore = /** @class */ (function (_super) {
                     }
                     else {
                         (0, assert_1.default)(typeof rel === 'string');
-                        if (!r[attrHead]) {
-                            r[attrHead] = {};
+                        if (typeof r["".concat(attrHead, "Id")] === 'string') {
+                            if (!r[attrHead]) {
+                                r[attrHead] = {};
+                            }
+                            resolveAttribute(rel, r[attrHead], attrTail, value);
                         }
-                        resolveAttribute(rel, r[attrHead], attrTail, value);
                     }
                 }
                 else if (attributes[attr]) {

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 = [
     {
@@ -471,14 +470,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 +546,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 +563,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

@@ -704,15 +704,17 @@ var SqlTranslator = /** @class */ (function () {
     };
     SqlTranslator.prototype.translateRemove = function (entity, operation, option) {
         var filter = operation.filter, sorter = operation.sorter, indexFrom = operation.indexFrom, count = operation.count;
+        (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 sorterText = sorter && sorter.length > 0 ? this.translateSorter(entity, sorter, aliasDict) : undefined;
-        return this.populateRemoveStmt(alias, fromText, aliasDict, filterText, sorterText, indexFrom, count, option);
+        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);
     };
     SqlTranslator.prototype.translateUpdate = function (entity, operation, option) {
         var attributes = this.schema[entity].attributes;
         var filter = operation.filter, sorter = operation.sorter, indexFrom = operation.indexFrom, count = operation.count, data = operation.data;
+        (0, assert_1.default)(!sorter, '当前update不支持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 updateText = '';
@@ -725,8 +727,8 @@ var SqlTranslator = /** @class */ (function () {
             updateText += "`".concat(alias, "`.`").concat(attr, "` = ").concat(value);
         }
         var filterText = this.translateFilter(entity, operation, aliasDict, filterRefAlias, currentNumber, extraWhere).stmt;
-        var sorterText = sorter && this.translateSorter(entity, sorter, aliasDict);
-        return this.populateUpdateStmt(updateText, fromText, aliasDict, filterText, sorterText, indexFrom, count, option);
+        // const sorterText = sorter && this.translateSorter(entity, sorter, aliasDict);
+        return this.populateUpdateStmt(updateText, fromText, aliasDict, filterText, /* sorterText */ undefined, indexFrom, count, option);
     };
     SqlTranslator.prototype.translateDestroyEntity = function (entity, truncate) {
         var schema = this.schema;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "oak-db",
-	"version": "1.0.5",
+	"version": "1.0.7",
 	"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.12",
+		"oak-domain": "^1.1.13",
 		"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.13",
+		"oak-general-business": "file:../oak-general-business",
 		"ts-node": "~10.9.1",
 		"tslib": "^2.4.0",
 		"typescript": "~4.7.4"