Use logical expression in conditions (#76)

* use logical expression * 2.10.3
themost-framework · Oct 16, 2023 · 1ead4a3 · 1ead4a3
1 parent 43266e4
commit 1ead4a3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@themost/query",
-  "version": "2.10.2",
+  "version": "2.10.3",
   "description": "MOST Web Framework Codename ZeroGravity - Query Module",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",

diff --git a/src/formatter.js b/src/formatter.js
@@ -1226,7 +1226,7 @@ class SqlFormatter {
         let ifExpression;
         if (instanceOf(ifExpr, QueryExpression)) {
             ifExpression = this.formatWhere(ifExpr.$where);
-        } else if (this.isComparison(ifExpr)) {
+        } else if (this.isComparison(ifExpr) || this.isLogical(ifExpr)) {
             ifExpression = this.formatWhere(ifExpr);
         } else {
             throw new Error('Condition parameter should be an instance of query or comparison expression');
@@ -1255,7 +1255,7 @@ class SqlFormatter {
             let caseExpression;
             if (instanceOf(branch.case, QueryExpression)) {
                 caseExpression = this.formatWhere(branch.case.$where);
-            } else if (this.isComparison(branch.case)) {
+            } else if (this.isComparison(branch.case) || this.isLogical(branch.case)) {
                 caseExpression = this.formatWhere(branch.case);
             } else {
                 throw new Error('Case expression should be an instance of query or comparison expression');