oak-db 3.3.0 → 3.3.2

package/lib/MySQL/store.js

@@ -192,18 +192,18 @@ class MysqlStore extends CascadeStore_1.CascadeStore {
                 const rel = (0, relation_1.judgeRelation)(schema, e, attr);
                 if (rel === 2) {
                     // 边界，如果是toModi的对象，这里的外键确实有可能为空
-                    (0, assert_1.default)(schema[e].toModi || r.entity !== attr || r.entityId === r[attr].id, `对象${e}取数据时，发现entityId与连接的对象的主键不一致，rowId是${r.id}，其entityId值为${r.entityId}，连接的对象的主键为${r[attr].id}`);
+                    // assert(schema[e].toModi || r.entity !== attr || r.entityId === r[attr].id, `对象${<string>e}取数据时，发现entityId与连接的对象的主键不一致，rowId是${r.id}，其entityId值为${r.entityId}，连接的对象的主键为${r[attr].id}`);
                     if (r[attr].id === null) {
                         (0, assert_1.default)(schema[e].toModi || r.entity !== attr);
                         delete r[attr];
                         continue;
                     }
-                    (0, assert_1.default)(r.entity === attr, `对象${e}取数据时，发现entity值与连接的外键对象不一致，rowId是${r.id}，其entity值为${r.entity}，连接的对象为${attr}`);
+                    // assert(r.entity === attr, `对象${<string>e}取数据时，发现entity值与连接的外键对象不一致，rowId是${r.id}，其entity值为${r.entity}，连接的对象为${attr}`);
                     removeNullObjects(r[attr], attr);
                 }
                 else if (typeof rel === 'string') {
                     // 边界，如果是toModi的对象，这里的外键确实有可能为空
-                    (0, assert_1.default)(schema[e].toModi || r[`${attr}Id`] === r[attr].id, `对象${e}取数据时，发现其外键与连接的对象的主键不一致，rowId是${r.id}，其${attr}Id值为${r[`${attr}Id`]}，连接的对象的主键为${r[attr].id}`);
+                    // assert(schema[e].toModi || r[`${attr}Id`] === r[attr].id, `对象${<string>e}取数据时，发现其外键与连接的对象的主键不一致，rowId是${r.id}，其${attr}Id值为${r[`${attr}Id`]}，连接的对象的主键为${r[attr].id}`);
                     if (r[attr].id === null) {
                         (0, assert_1.default)(schema[e].toModi || r[`${attr}Id`] === null);
                         delete r[attr];

package/lib/MySQL/translator.js

@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
 const assert_1 = tslib_1.__importDefault(require("assert"));
 const util_1 = require("util");
 const lodash_1 = require("lodash");
+const types_1 = require("oak-domain/lib/types");
 const sqlTranslator_1 = require("../sqlTranslator");
 const GeoTypes = [
     {
@@ -920,9 +921,12 @@ class MySqlTranslator extends sqlTranslator_1.SqlTranslator {
             }
             return sql;
         }
-        const now = Date.now();
-        const updateText2 = updateText ? `${updateText}, \`${alias}\`.\`$$deleteAt$$\` = '${now}'` : `\`${alias}\`.\`$$deleteAt$$\` = '${now}'`;
-        let sql = `update ${fromText} set ${updateText2}`;
+        // 新的remove应该包含$$deleteAt$$的值了
+        /* const now = Date.now();
+
+        const updateText2 = updateText ? `${updateText}, \`${alias}\`.\`$$deleteAt$$\` = '${now}'` : `\`${alias}\`.\`$$deleteAt$$\` = '${now}'`; */
+        (0, assert_1.default)(updateText.includes(types_1.DeleteAtAttribute));
+        let sql = `update ${fromText} set ${updateText}`;
         if (filterText) {
             sql += ` where ${filterText}`;
         }

package/lib/MySQL/types/Configuration.js

@@ -1,2 +1,2 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/index.d.ts

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

package/lib/index.js

@@ -1,4 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-tslib_1.__exportStar(require("./MySQL/store"), exports);
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./MySQL/store"), exports);