sqlparser-devexpress 2.4.1 → 2.4.2

package/package.json

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

package/src/core/converter.js

@@ -160,14 +160,31 @@ function DevExpressConverter() {
             includeExtradata = true;
         }
         let comparison = [left, operatorToken, right];
+
         if (includeExtradata)
             comparison = [left, operatorToken, right, { type: originalOperator }, right];
 
         // Last null because of special case when using dropdown it https://github.com/DevExpress/DevExtreme/blob/25_1/packages/devextreme/js/__internal/data/m_utils.ts#L18 it takes last value as null
         if ((ast.left && isFunctionNullCheck(ast.left, true)) || (ast.value && isFunctionNullCheck(ast.value, false))) {
-            comparison = [[left, operatorToken, right], 'or', [left, operatorToken, null, { type: "ISNULL", defaultValue: (ast.left ?? ast.value).args[1]?.value }, null]];
+            const nullCheckArg = (ast.left ?? ast.value).args[1]?.value;
+            let baseComparison = comparison;
+
+            if (Array.isArray(right) && (right.includes("or") || right.includes("and"))) {
+                const valueRight = right.shift();
+                baseComparison = [[left, operatorToken, valueRight], ...right];
+            }
+
+            comparison = [baseComparison, 'or', [left, operatorToken, null, { type: "ISNULL", defaultValue: nullCheckArg }, null]];
         } else if (ast.right && isFunctionNullCheck(ast.right, true)) {
-            comparison = [[left, operatorToken, right], 'or', [right, operatorToken, null, { type: "ISNULL", defaultValue: ast.right.args[1]?.value }, null]];
+            const nullCheckArg = ast.right.args[1]?.value;
+            let baseComparison = comparison;
+
+            if (Array.isArray(right) && (right.includes("or") || right.includes("and"))) {
+                const valueRight = right.shift();
+                baseComparison = [[left, operatorToken, valueRight], ...right];
+            }
+
+            comparison = [baseComparison, 'or', [right, operatorToken, null, { type: "ISNULL", defaultValue: nullCheckArg }, null]];
         }
 
         // Apply short-circuit evaluation if enabled

package/src/debug.js

@@ -28,7 +28,7 @@
 //     return convertToDevExpressFormat({ ast: astTree, resultObject: sampleData, isValueNullShortCircuit: true });
 // }
 
-// const devexpress = parseFilterString("(ISNULL(TicketID, 0) = ISNULL({CustomerOrders.OrderID}, 0))", sampleData);
+// const devexpress = parseFilterString("ISNULL(CompanyID,0) = ISNULL({CustomerOrders.OrderID},0) OR (ISNULL(CompanyID,0) = 0)", sampleData);
 // console.log("DevExpress Filter:", JSON.stringify(devexpress, null, 2));
 // // const devexpress = parseFilterString("(RS2ID in ({LeadStatementGlobalRpt.StateID}) Or ({LeadStatementGlobalRpt.StateID} =0)) And (RS3ID  in (0,{LeadStatementGlobalRpt.RegionID}) Or {LeadStatementGlobalRpt.RegionID} =0 )", sampleData);
 

package/tests/parser.test.js

@@ -302,6 +302,36 @@ describe("Parser SQL to dx Filter Builder", () => {
                 "or",
                 ["IsChecked", "=", true]
             ]
+        },
+        {
+            input: "ISNULL(CompanyID,0) = ISNULL({TransferOutwardDocument.CompanyID},0) OR (ISNULL(CompanyID,0) = 0)",
+            expected: [
+                [
+
+                    ["CompanyID", "=", 7],
+                    "or",
+                    [
+                        ["CompanyID", "=", 0],
+                        "or",
+                        ["CompanyID", "=", null,
+                            {
+                                "type": "ISNULL",
+                                "defaultValue": 0
+                            }, null
+                        ],
+                        "or",
+                        ["CompanyID", "=", false]
+                    ]
+                ],
+                "or",
+                [
+                    "CompanyID", "=", null,
+                    {
+                        "type": "ISNULL",
+                        "defaultValue": 0
+                    }, null
+                ]
+            ]
         }
     ];