sqlparser-devexpress 2.3.6 → 2.3.8

package/README.md

@@ -128,57 +128,11 @@ console.log("DevExpress Filter:", JSON.stringify(devexpressFilter, null, 2));
 
 ### **DevExtreme with React Example**
 
-First, install the necessary DevExtreme packages:
+To see an example of how to use `sqlparser-devexpress` with DevExtreme DataGrid in React, check out the live example on CodeSandbox:
 
-```sh
-npm install devextreme devextreme-react
-```
-
-Now, create a simple React component that integrates DevExtreme with the `sqlparser-devexpress` library:
-
-```javascript
-import React, { useState } from 'react';
-import DataGrid, { Column, FilterRow, HeaderFilter } from 'devextreme-react/data-grid';
-import 'devextreme/dist/css/dx.light.css';
-import { convertSQLToAst, convertAstToDevextreme } from 'sqlparser-devexpress';
-
-const App = () => {
-  const [data, setData] = useState([
-    { OrderID: 76548, Status: 1 },
-    { OrderID: 76549, Status: 3 },
-    { OrderID: 76550, Status: 2 },
-  ]);
-
-  const sqlQuery = "OrderID = {CustomerOrders.OrderID} OR Status IN (1, 3)";
-  const { ast, variables } = convertSQLToAst(sqlQuery);
-
-  // Extracted state for dynamic variables (usually fetched from your app state)
-  const sampleState = { "CustomerOrders.OrderID": 76548 };
-
-  const devexpressFilter = convertAstToDevextreme(ast, sampleState);
-
-  return (
-    <div>
-      <DataGrid dataSource={data} filterValue={devexpressFilter}>
-        <Column dataField="OrderID" />
-        <Column dataField="Status" />
-        <FilterRow visible={true} />
-        <HeaderFilter visible={true} />
-      </DataGrid>
-    </div>
-  );
-};
-
-export default App;
-```
-
-### **Explanation**:
-1. **DataGrid**: Displays the data with filtering.
-2. **convertSQLToAst**: Converts the SQL `WHERE` clause into an AST.
-3. **convertAstToDevextreme**: Converts the AST to the DevExtreme filter format.
-4. **filterValue**: Applies the filter to the `DataGrid`.
+[DevExtreme DataGrid with SQL Filter Example](https://codesandbox.io/p/sandbox/with-data-grid-with-sql-as-filter-string-my64v2)
 
-This is a simple integration where the filter from SQLParser is used to filter the grid data in a React app using DevExtreme's `DataGrid`.
+In this example, SQL `WHERE` clauses are parsed into an Abstract Syntax Tree (AST) and then transformed into a DevExpress-compatible filter format that is used directly in the DataGrid component for filtering data. 
 
 ## Roadmap
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sqlparser-devexpress",
-  "version": "2.3.6",
+  "version": "2.3.8",
   "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];
 
+        //TODO: the ISNULL custom metadata is causing issues on filters will need to check this on server
         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}]]; 
         } 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}]];
         }
 
         // Apply short-circuit evaluation if enabled
@@ -228,7 +229,13 @@ function DevExpressConverter() {
         // Handle object-based values
         if (typeof val === "object") {
             if (val.type === "placeholder") {
-                return resolvePlaceholderFromResultObject(val.value);
+                const placeholderValue = resolvePlaceholderFromResultObject(val.value);
+
+                if (val?.dataType === "string") {
+                    return placeholderValue?.toString();
+                }
+
+                return placeholderValue;
             }
 
             // Special handling for ISNULL function

package/src/core/parser.js

@@ -237,7 +237,7 @@ export function parse(input, variables = []) {
 			case "placeholder": {
 				const val = token.value.slice(1, -1);
 				if (!variables.includes(val)) variables.push(val);
-				return { type: "placeholder", value: val };
+				return {  ...token ,type: "placeholder", value: val };
 			}
 
 			case "paren": {

package/src/core/tokenizer.js

@@ -45,8 +45,17 @@ class Tokenizer {
       if (!type || type === "whitespace") return this.nextToken();
 
       let value = match.groups[type];
+      let dataType = null;
 
       // Remove surrounding single quotes from placeholders
+      if(type === "placeholder"){
+
+        if(value.startsWith("'") && value.endsWith("'")){
+          dataType = "string";
+        }
+
+        value = value.replace(/^[\s'"\(\)]+|[\s'"\(\)]+|[\s]+/g, "");
+      }
       if (type === "placeholder") value = value.replace(/^[\s'"\(\)]+|[\s'"\(\)]+|[\s]+/g, "");
 
       if (type === "operator") {
@@ -68,7 +77,7 @@ class Tokenizer {
       }
 
 
-      return { type, value };
+      return { type, value, ...(dataType !== null && { dataType }) };
     }
 
     // If no valid token is found, throw an error with the remaining input for debugging

package/src/debug.js

@@ -28,7 +28,7 @@
 //     return convertToDevExpressFormat({ ast: astTree, resultObject: sampleData });
 // }
 
-// const devexpress = parseFilterString("CompanyID not like '{CustomerOrders.OrderID}'", sampleData);
+// const devexpress = parseFilterString("(ISNULL(TicketID, 0) = ISNULL({CustomerOrders.OrderID}, 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);