sqlparser-devexpress 2.3.9 → 2.3.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sqlparser-devexpress",
-  "version": "2.3.9",
+  "version": "2.3.10",
   "main": "src/index.js",
   "type": "module",
   "scripts": {

package/src/core/converter.js

@@ -135,7 +135,9 @@ function DevExpressConverter() {
         }
 
         const left = ast.left !== undefined ? processAstNode(ast.left) : convertValue(ast.field);
+        const leftDefault = ast.left?.args[1]?.value;
         const right = ast.right !== undefined ? processAstNode(ast.right) : convertValue(ast.value);
+        const rightDefault = ast.right?.args[1]?.value;
         let operatorToken = ast.operator.toLowerCase();
 
         if (operatorToken === "like") {
@@ -155,8 +157,8 @@ function DevExpressConverter() {
 
         // Apply short-circuit evaluation if enabled
         if (EnableShortCircuit) {
-            if (isAlwaysTrue(comparison)) return true;
-            if (isAlwaysFalse(comparison)) return false;
+            if (isAlwaysTrue(comparison, leftDefault, rightDefault)) return true;
+            if (isAlwaysFalse(comparison, leftDefault, rightDefault)) return false;
         }
 
         return comparison;
@@ -332,19 +334,23 @@ function DevExpressConverter() {
     /**
      * Checks if a condition is always true.
      * @param {Array} condition - The condition to check.
+     * @param {*} leftDefault - The default value for the left operand.
+     * @param {*} rightDefault - The default value for the right operand. 
      * @returns {boolean} True if the condition is always true.
      */
-    function isAlwaysTrue(condition) {
-        return Array.isArray(condition) && condition.length >= 3 && evaluateExpression(...condition) == true;
+    function isAlwaysTrue(condition, leftDefault, rightDefault) {
+        return Array.isArray(condition) && condition.length >= 3 && evaluateExpression(...condition, leftDefault, rightDefault) == true;
     }
 
     /**
      * Checks if a condition is always false.
      * @param {Array} condition - The condition to check.
+     * @param {*} leftDefault - The default value for the left operand.
+     * @param {*} rightDefault - The default value for the right operand. 
      * @returns {boolean} True if the condition is always false.
      */
-    function isAlwaysFalse(condition) {
-        return Array.isArray(condition) && condition.length >= 3 && evaluateExpression(...condition) == false;
+    function isAlwaysFalse(condition, leftDefault, rightDefault) {
+        return Array.isArray(condition) && condition.length >= 3 && evaluateExpression(...condition, leftDefault, rightDefault) == false;
     }
 
     /**
@@ -352,9 +358,14 @@ function DevExpressConverter() {
      * @param {*} left - The left operand.
      * @param {string} operator - The operator.
      * @param {*} right - The right operand.
+     * @param {*} leftDefault - The default value for the left operand.
+     * @param {*} rightDefault - The default value for the right
      * @returns {boolean|null} The result of the evaluation or null if not evaluable.
      */
-    function evaluateExpression(left, operator, right) {
+    function evaluateExpression(left, operator, right, leftDefault, rightDefault) {
+        if (left == null && leftDefault != undefined) left = leftDefault;
+        if (right == null && rightDefault != undefined) right = rightDefault;
+
         if ((left !== null && isNaN(left)) || (right !== null && isNaN(right))) return null;
 
         if (left === null || right === null) {

package/tests/parser.test.js

@@ -210,6 +210,10 @@ describe("Parser SQL to dx Filter Builder", () => {
                 "and",
                 ["BranchName", "notcontains", "42"]
             ]
+        },
+        {
+            input: "(RS2ID in ({SaleOrderStatusStmtGlobalRpt.StateID}) Or (ISNULL({SaleOrderStatusStmtGlobalRpt.StateID},0) =0)) And (RS3ID  in (0,{SaleOrderStatusStmtGlobalRpt.RegionID}) Or ISNULL({SaleOrderStatusStmtGlobalRpt.RegionID},0) =0 )",
+            expected: []
         }
     ];
 
@@ -270,5 +274,7 @@ const sampleData = {
     "LeadDocument.CompanyID": 7,
     "ServiceOrderDocument.SourceID": 2,
     "LeadDocument.AllowSubDealer": true,
-    "SupportResolution.TicketID": 123
+    "SupportResolution.TicketID": 123,
+    "SaleOrderStatusStmtGlobalRpt.StateID": null,
+    "SaleOrderStatusStmtGlobalRpt.RegionID": null,
 };