sqlparser-devexpress 2.5.1 → 2.5.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sqlparser-devexpress",
-  "version": "2.5.1",
+  "version": "2.5.3",
   "main": "src/index.js",
   "type": "module",
   "scripts": {
@@ -13,7 +13,7 @@
   "types": "src/@types/default.d.ts",
   "repository": {
     "type": "git",
-    "url": "https://github.com/RohitM-IN/SQLParser.git"
+    "url": "git+https://github.com/RohitM-IN/SQLParser.git"
   },
   "keywords": [
     "sql",

package/src/core/converter.js

@@ -402,8 +402,11 @@ function DevExpressConverter() {
     function resolvePlaceholderFromResultObject(placeholder) {
         if (!resultObject) return `{${placeholder}}`;
 
+        // Case-insensitive lookup
+        const lowerPlaceholder = placeholder.toLowerCase();
+        const matchingKey = Object.keys(resultObject).find(key => key.toLowerCase() === lowerPlaceholder);
 
-        return resultObject.hasOwnProperty(placeholder) ? resultObject[placeholder] : `{${placeholder.value ?? placeholder}}`;
+        return matchingKey ? resultObject[matchingKey] : `{${placeholder.value ?? placeholder}}`;
     }
 
     /**
@@ -518,13 +521,17 @@ function DevExpressConverter() {
             return null; // Any comparison with null should return null
         }
 
+        // Normalize boolean values to numbers for comparison with numbers
+        const normalizedLeft = normalizeBool(left);
+        const normalizedRight = normalizeBool(right);
+
         switch (operator) {
-            case '=': case '==': return left === right;
-            case '<>': case '!=': return left !== right;
-            case '>': return left > right;
-            case '>=': return left >= right;
-            case '<': return left < right;
-            case '<=': return left <= right;
+            case '=': case '==': return normalizedLeft === normalizedRight;
+            case '<>': case '!=': return normalizedLeft !== normalizedRight;
+            case '>': return normalizedLeft > normalizedRight;
+            case '>=': return normalizedLeft >= normalizedRight;
+            case '<': return normalizedLeft < normalizedRight;
+            case '<=': return normalizedLeft <= normalizedRight;
             default: return null; // Invalid operator
         }
     }

package/tests/parser.test.js

@@ -388,6 +388,24 @@ describe("Parser SQL to dx Filter Builder", () => {
                 ["AllowSubDealer", "=", true],
                 'or',
                 ["AllowSubDealer", "=", null, { "type": "ISNULL", "position": "column", "defaultValue": 1 }, null]
+            ],
+        },
+        {
+            input: "(CompanyID = {LeadDocument.CompanyID} OR CompanyID IS NULL) AND ItemGroupType IN ({Item.AllowedItemGroupTypeOne}) AND ({PurchaseOrderDocument.IsMultiBrand} = 0 OR ({PurchaseOrderDocument.IsMultiBrand} = 1 AND Make IN ({PurchaseOrderDocument.AllowedApplicableMake})))",
+            expected: [
+                [
+                    ["CompanyID", "=", 7],
+                    "or",
+                    ["CompanyID", "=", null, { "type": "IS" }, null]
+                ],
+                "and",
+                ["ItemGroupType", "=", "1"]
+            ]
+        },
+        {
+            input: "AccountID = {AccountingRule.CompanyId}",
+            expected: [
+                "AccountID", "=", 42
             ]
         }
     ];
@@ -428,6 +446,7 @@ describe("Parser SQL to dx Filter Builder", () => {
 
 
 const sampleData = {
+    "Example.ZeroValue": 0,
     "CoreEntity0022.CompanyGroupID": 42,
     "CoreEntity0022.BranchID": 7,
     "Employee.District": 0,
@@ -441,6 +460,7 @@ const sampleData = {
     "Item.ID": 42,
     "Item.BranchID": 7,
     "Item.AllowedItemGroupType": "1,2",
+    "Item.AllowedItemGroupTypeOne": "1",
     "WorkOrderLine.ApplicableUoms": ["UOM1", "UOM2", "UOM3"],
     "WorkOrderLine.CompanyID": 2,
     "WorkOrderDocument.CompanyID": 42,
@@ -456,4 +476,6 @@ const sampleData = {
     "SaleOrderStatusStmtGlobalRpt.StateID": null,
     "SaleOrderStatusStmtGlobalRpt.RegionID": null,
     "WorkOrderLine.CompanyIDs": ["0,1"],
+    "PurchaseOrderDocument.IsMultiBrand": false,
+    "PurchaseOrderDocument.AllowedApplicableMake": "0"
 };