format logical expression in case when expression (#33)

* format logical expression in case when * 2.7.1
themost-framework · Jun 7, 2023 · b102d8a · b102d8a
1 parent 0d99a21
commit b102d8a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 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/mssql",
-  "version": "2.7.0",
+  "version": "2.7.1",
   "description": "MOST Web Framework MSSQL Data Adapter",
   "main": "dist/index.js",
   "module": "dist/index.esm.js",

diff --git a/src/MSSqlFormatter.js b/src/MSSqlFormatter.js
@@ -270,12 +270,19 @@ class MSSqlFormatter extends SqlFormatter {
         return sprintf('CAST(%s AS NVARCHAR)', this.escape(p0));
     }
 
+    isLogical = function(obj) {
+        for (const key in obj) {
+            return (/^\$(and|or|not|nor)$/g.test(key));
+        }
+        return false;
+    }
+
     $cond(ifExpr, thenExpr, elseExpr) {
         // validate ifExpr which should an instance of QueryExpression or a comparison expression
         let ifExpression;
         if (ifExpr instanceof 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');