sqlparser-devexpress 2.3.12 → 2.3.14

package/package.json

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

package/src/constants.js

@@ -10,4 +10,6 @@ export const OPERATOR_PRECEDENCE = {
 // Regular expression to check for unsupported SQL patterns (like SELECT-FROM or JOIN statements)
 export const UNSUPPORTED_PATTERN = /\bSELECT\b.*\bFROM\b|\bINNER\s+JOIN\b/i;
 
-export const LOGICAL_OPERATORS = ['and', 'or'];
+export const LOGICAL_OPERATORS = ['and', 'or'];
+
+export const LITERAL_TYPES = ["value", "placeholder"];

package/src/core/converter.js

@@ -1,4 +1,4 @@
-import { LOGICAL_OPERATORS } from "../constants.js";
+import { LITERAL_TYPES, LOGICAL_OPERATORS } from "../constants.js";
 
 /**
  * Main conversion function that sets up the global context
@@ -207,7 +207,7 @@ function DevExpressConverter() {
         }
 
         // handle short circuit evaluation for IN operator
-        if (EnableShortCircuit && ast.field?.type === "value" && ast.value?.type === "value") {
+        if (EnableShortCircuit && (LITERAL_TYPES.includes(ast.field?.type) && LITERAL_TYPES.includes(ast.value?.type))) {
             const fieldVal = convertValue(ast.field);
             if (Array.isArray(resolvedValue)) {
                 // normalize numeric strings if LHS is number
@@ -221,6 +221,16 @@ function DevExpressConverter() {
                     return list.includes(fieldVal);
                 else if (operator === "NOT IN")
                     return !list.includes(fieldVal);
+            } else if (!Array.isArray(resolvedValue)) {
+                // normalize numeric strings if LHS is number
+                const value = (typeof resolvedValue === "string" && !isNaN(resolvedValue) && typeof fieldVal === "number")
+                    ? Number(resolvedValue)
+                    : resolvedValue;
+
+                if (operator === "IN")
+                    return fieldVal == value;
+                else if (operator === "NOT IN")
+                    return fieldVal != value;
             }
         }
 

package/tests/parser.test.js

@@ -216,11 +216,11 @@ describe("Parser SQL to dx Filter Builder", () => {
             expected: []
         },
         {
-            input: "ID IN ('1,2') AND 0 IN ('0,2')",
+            input: "ID IN ({WorkOrderLine.CompanyIDs}) AND 0 IN ({WorkOrderLine.CompanyIDs})",
             expected: [
-                ["ID", "=", "1"],
+                ["ID", "=", "0"],
                 "or",
-                ["ID", "=", "2"]
+                ["ID", "=", "1"]
             ]
         }
     ];
@@ -285,4 +285,5 @@ const sampleData = {
     "SupportResolution.TicketID": 123,
     "SaleOrderStatusStmtGlobalRpt.StateID": null,
     "SaleOrderStatusStmtGlobalRpt.RegionID": null,
+    "WorkOrderLine.CompanyIDs": ["0,1"],
 };