sqlparser-devexpress 2.3.7 → 2.3.9

package/package.json

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

package/src/core/converter.js

@@ -138,18 +138,19 @@ function DevExpressConverter() {
         const right = ast.right !== undefined ? processAstNode(ast.right) : convertValue(ast.value);
         let operatorToken = ast.operator.toLowerCase();
 
-        if(operatorToken === "like") {
+        if (operatorToken === "like") {
             operatorToken = "contains";
-        }else if (operatorToken === "not like") {
+        } else if (operatorToken === "not like") {
             operatorToken = "notcontains";
         }
 
         let comparison = [left, operatorToken, 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}]];
+            comparison = [[left, operatorToken, right], 'or', [left, operatorToken, null, { type: "ISNULL", defaultValue: (ast.left ?? ast.value).args[1]?.value }, 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}]];
+            comparison = [[left, operatorToken, right], 'or', [right, operatorToken, null, { type: "ISNULL", defaultValue: ast.right.args[1]?.value }, null]];
         }
 
         // Apply short-circuit evaluation if enabled
@@ -229,8 +230,8 @@ function DevExpressConverter() {
         if (typeof val === "object") {
             if (val.type === "placeholder") {
                 const placeholderValue = resolvePlaceholderFromResultObject(val.value);
-                
-                if(val?.dataType === "string"){
+
+                if (val?.dataType === "string") {
                     return placeholderValue?.toString();
                 }
 

package/tests/parser.test.js

@@ -137,11 +137,11 @@ describe("Parser SQL to dx Filter Builder", () => {
             expected: [
                 ["SourceID", "=", 2],
                 "or",
-                ["SourceID", "=", null,{ "defaultValue": 0, "type": "ISNULL"}],
+                ["SourceID", "=", null, { "defaultValue": 0, "type": "ISNULL" }, null],
                 "or",
                 ["SourceID", "=", 0],
                 "or",
-                ["SourceID", "=", null,{ "defaultValue": 0, "type": "ISNULL"}]
+                ["SourceID", "=", null, { "defaultValue": 0, "type": "ISNULL" }, null]
             ]
         },
         {
@@ -153,14 +153,14 @@ describe("Parser SQL to dx Filter Builder", () => {
                     [
                         ["CompanyID", "=", 0],
                         "or",
-                        ["CompanyID", "=", null,{ "defaultValue": 0, "type": "ISNULL"}]
+                        ["CompanyID", "=", null, { "defaultValue": 0, "type": "ISNULL" }, null]
                     ]
                 ],
                 "and",
                 [
                     ["IsSubdealer", "=", true],
                     "or",
-                    ["IsSubdealer", "=", null,{ "defaultValue": 0, "type": "ISNULL"}]
+                    ["IsSubdealer", "=", null, { "defaultValue": 0, "type": "ISNULL" }, null]
                 ]
             ]
         },
@@ -187,7 +187,7 @@ describe("Parser SQL to dx Filter Builder", () => {
             expected: [
                 ["TicketID", "=", 123],
                 "or",
-                ["TicketID", "=", null,{ "defaultValue": 0, "type": "ISNULL"}]
+                ["TicketID", "=", null, { "defaultValue": 0, "type": "ISNULL" }, null]
             ]
         },
         {
@@ -195,14 +195,12 @@ describe("Parser SQL to dx Filter Builder", () => {
             expected: [
                 ["CompanyID", "=", 7],
                 "or",
-                ["CompanyID", "=", null,{ "defaultValue": 0, "type": "ISNULL"}],
+                ["CompanyID", "=", null, { "defaultValue": 0, "type": "ISNULL" }, null],
                 "or",
                 ["CompanyID", "=", 0],
                 "or",
-                ["CompanyID", "=", null,{ "defaultValue": 0, "type": "ISNULL"},
+                ["CompanyID", "=", null, { "defaultValue": 0, "type": "ISNULL" }, null]
 
-                ]
-                
             ]
         },
         {