dbgate-sqltree 5.2.2 → 5.2.4-alpha.1

package/lib/evaluateCondition.js

@@ -4,7 +4,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.evaluateCondition = void 0;
-const lodash_1 = __importDefault(require("lodash"));
+const cloneDeepWith_1 = __importDefault(require("lodash/cloneDeepWith"));
+const escapeRegExp_1 = __importDefault(require("lodash/escapeRegExp"));
 const evaluateExpression_1 = require("./evaluateExpression");
 function isEmpty(value) {
     if (value == null)
@@ -16,7 +17,7 @@ function isLike(value, test) {
         return false;
     if (!test)
         return false;
-    const regex = new RegExp(`^${lodash_1.default.escapeRegExp(test).replace(/%/g, '.*')}$`, 'i');
+    const regex = new RegExp(`^${(0, escapeRegExp_1.default)(test).replace(/%/g, '.*')}$`, 'i');
     const res = !!value.toString().match(regex);
     return res;
 }
@@ -60,6 +61,17 @@ function evaluateCondition(condition, values) {
             return !isLike((0, evaluateExpression_1.evaluateExpression)(condition.left, values), (0, evaluateExpression_1.evaluateExpression)(condition.right, values));
         case 'not':
             return !evaluateCondition(condition.condition, values);
+        case 'anyColumnPass':
+            return Object.keys(values).some(columnName => {
+                const replaced = (0, cloneDeepWith_1.default)(condition.placeholderCondition, (expr) => {
+                    if (expr.exprType == 'placeholder')
+                        return {
+                            exprType: 'column',
+                            columnName,
+                        };
+                });
+                return evaluateCondition(replaced, values);
+            });
     }
 }
 exports.evaluateCondition = evaluateCondition;

package/lib/types.d.ts

@@ -86,7 +86,11 @@ export interface RawTemplateCondition {
     templateSql: string;
     expr: Expression;
 }
-export declare type Condition = BinaryCondition | NotCondition | TestCondition | CompoudCondition | LikeCondition | ExistsCondition | NotExistsCondition | BetweenCondition | InCondition | RawTemplateCondition;
+export interface AnyColumnPassEvalOnlyCondition {
+    conditionType: 'anyColumnPass';
+    placeholderCondition: Condition;
+}
+export declare type Condition = BinaryCondition | NotCondition | TestCondition | CompoudCondition | LikeCondition | ExistsCondition | NotExistsCondition | BetweenCondition | InCondition | RawTemplateCondition | AnyColumnPassEvalOnlyCondition;
 export interface Source {
     name?: NamedObjectInfo;
     alias?: string;

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "5.2.2",
+  "version": "5.2.4-alpha.1",
   "name": "dbgate-sqltree",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -27,7 +27,7 @@
   ],
   "devDependencies": {
     "@types/node": "^13.7.0",
-    "dbgate-types": "^5.2.2",
+    "dbgate-types": "^5.2.4-alpha.1",
     "typescript": "^4.4.3"
   },
   "dependencies": {