oak-db 3.3.7 → 3.3.9

package/lib/sqlTranslator.js

@@ -617,43 +617,58 @@ class SqlTranslator {
                                 });
                             }
                             const fk = foreignKey || 'entityId';
-                            const joinFilter = {
-                                $expr12: {
-                                    $eq: [
-                                        {
-                                            '#attr': fk,
-                                        },
-                                        {
-                                            '#refId': refAlia2,
-                                            '#refAttr': 'id',
-                                        }
-                                    ],
+                            // 对in和not in优化，不要用exists查询
+                            if (['in', 'not in'].includes(predicate)) {
+                                const { stmt, currentNumber: ct2 } = this.translateSelectInner(subEntity, {
+                                    data: {
+                                        [fk]: 1,
+                                    },
+                                    filter: filter2[attr]
+                                }, currentNumber, filterRefAlias, option);
+                                currentNumber = ct2;
+                                whereText += `(${refAlia2}.id ${predicate} (${stmt}))`;
+                            }
+                            else {
+                                /**
+                                 * 只剩下all/not all
+                                 * 翻译成键值不等条件下的not exist/exist
+                                 */
+                                const joinFilter = {
+                                    $expr83: {
+                                        [['all', 'not all'].includes(predicate) ? '$ne' : '$eq']: [
+                                            {
+                                                '#attr': fk,
+                                            },
+                                            {
+                                                '#refId': refAlia2,
+                                                '#refAttr': 'id',
+                                            }
+                                        ],
+                                    }
+                                };
+                                if (!foreignKey) {
+                                    Object.assign(joinFilter, {
+                                        entity: entity2,
+                                    });
                                 }
-                            };
-                            if (!foreignKey) {
-                                Object.assign(joinFilter, {
-                                    entity: entity2,
-                                });
+                                const { stmt, currentNumber: ct2 } = this.translateSelectInner(subEntity, {
+                                    data: {
+                                        id: 1,
+                                    },
+                                    filter: (0, filter_1.combineFilters)(subEntity, this.schema, [joinFilter, filter2[attr]]),
+                                    indexFrom: 0,
+                                    count: 1,
+                                }, currentNumber, filterRefAlias, option);
+                                currentNumber = ct2;
+                                const PREDICATE_DICT = {
+                                    // in 和 not in已经不会命中了（优化到上面的路径中）
+                                    'in': 'exists',
+                                    'not in': 'not exists',
+                                    'all': 'not exists',
+                                    'not all': 'exists',
+                                };
+                                whereText += ` ${PREDICATE_DICT[predicate]} (${stmt})`;
                             }
-                            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, conditionalPredicate]),
-                                indexFrom: 0,
-                                count: 1,
-                            }, currentNumber, filterRefAlias, option);
-                            currentNumber = ct2;
-                            const PREDICATE_DICT = {
-                                'in': 'exists',
-                                'not in': 'not exists',
-                                'all': 'not exists',
-                                'not all': 'exists',
-                            };
-                            whereText += ` ${PREDICATE_DICT[predicate]} (${stmt})`;
                         }
                         else {
                             (0, assert_1.default)(attributes.hasOwnProperty(attr), `非法的属性${attr}`);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "oak-db",
-	"version": "3.3.7",
+	"version": "3.3.9",
 	"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.24",
+		"oak-domain": "^5.1.27",
 		"uuid": "^8.3.2"
 	},
 	"license": "ISC",