oak-db 3.3.4 → 3.3.6

package/lib/sqlTranslator.js

@@ -172,10 +172,13 @@ class SqlTranslator {
             attrs.forEach((attr, attrIdx) => {
                 const attrDef = attributes[attr];
                 const { type: dataType } = attrDef;
-                const value = this.translateAttrValue(dataType, d[attr]);
-                sql += value;
-                if (attrIdx < attrs.length - 1) {
-                    sql += ',';
+                // undefined应该不要处理
+                if (d[attr] !== undefined) {
+                    const value = this.translateAttrValue(dataType, d[attr]);
+                    sql += value;
+                    if (attrIdx < attrs.length - 1) {
+                        sql += ',';
+                    }
                 }
             });
             if (dataIndex < data.length - 1) {
@@ -599,8 +602,8 @@ class SqlTranslator {
                              *
                             * in代表外键连接后至少有一行数据
                             * not in代表外键连接后一行也不能有
-                            * all代表反外键连接条件的一行也不能有（符合的是否至少要有一行？直觉上没这个限制）
-                            * not all 代表反外键连接条件的至少有一行
+                            * all代表反连接条件的一行也不能有（符合的是否至少要有一行？直觉上没这个限制）
+                            * not all 代表反连接条件的至少有一行
                             *
                             * 目前将这种子查询翻译成了exists查询，当外表很大而子查询结果集很小时可能有性能问题，取决于MySQL执行器的能力
                             * by Xc 20230726
@@ -614,7 +617,7 @@ class SqlTranslator {
                                 });
                             }
                             const fk = foreignKey || 'entityId';
-                            const joinFilter = ['not in', 'in'].includes(predicate) ? {
+                            const joinFilter = {
                                 $expr12: {
                                     $eq: [
                                         {
@@ -626,29 +629,20 @@ class SqlTranslator {
                                         }
                                     ],
                                 }
-                            } : {
-                                $expr12: {
-                                    $ne: [
-                                        {
-                                            '#attr': fk,
-                                        },
-                                        {
-                                            '#refId': refAlia2,
-                                            '#refAttr': 'id',
-                                        }
-                                    ],
-                                }
                             };
                             if (!foreignKey) {
                                 Object.assign(joinFilter, {
                                     entity: entity2,
                                 });
                             }
+                            const conditionalPredicate = ['all', 'not all'].includes(predicate) ? {
+                                $not: filter2[attr],
+                            } : filter2[attr];
                             const { stmt, currentNumber: ct2 } = this.translateSelectInner(subEntity, {
                                 data: {
                                     id: 1,
                                 },
-                                filter: (0, filter_1.combineFilters)(subEntity, this.schema, [joinFilter, filter2[attr]]),
+                                filter: (0, filter_1.combineFilters)(subEntity, this.schema, [joinFilter, conditionalPredicate]),
                                 indexFrom: 0,
                                 count: 1,
                             }, currentNumber, filterRefAlias, option);
@@ -928,7 +922,8 @@ class SqlTranslator {
         (0, assert_1.default)(!sorter, '当前remove不支持sorter行为');
         const { aliasDict, filterRefAlias, from: fromText, currentNumber } = this.analyzeJoin(entity, { filter, sorter });
         const alias = aliasDict['./'];
-        const { stmt: filterText } = this.translateFilter(entity, filter, aliasDict, filterRefAlias, currentNumber, { includedDeleted: true });
+        // 这里原来includeDeleted传的是true，不知道原因，但不合理
+        const { stmt: filterText } = this.translateFilter(entity, filter, aliasDict, filterRefAlias, currentNumber, { includedDeleted: option?.includedDeleted });
         // const sorterText = sorter && sorter.length > 0 ? this.translateSorter(entity, sorter, aliasDict) : undefined;
         const { attributes } = this.schema[entity];
         let updateText = '';

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "oak-db",
-	"version": "3.3.4",
+	"version": "3.3.6",
 	"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": "^5.1.13",
+		"oak-domain": "^5.1.20",
 		"uuid": "^8.3.2"
 	},
 	"license": "ISC",