Merge pull request #14 from RohitM-IN/development

Added support for LIKE and NOT LIKE operators in convertor, and fixed bugs related to IS NULL

Author: RohitM-IN

README.md

@@ -126,6 +126,14 @@ console.log("DevExpress Filter:", JSON.stringify(devexpressFilter, null, 2));
   const devexpressFilter = convertAstToDevextreme(ast, sampleState, false); // Disables short-circuiting
   ```
 
+### **DevExtreme with React Example**
+
+To see an example of how to use `sqlparser-devexpress` with DevExtreme DataGrid in React, check out the live example on CodeSandbox:
+
+[DevExtreme DataGrid with SQL Filter Example](https://codesandbox.io/p/sandbox/with-data-grid-with-sql-as-filter-string-my64v2)
+
+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
 
 - Support for additional SQL operators and functions.

package.json

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

src/@types/default.d.ts

@@ -12,7 +12,7 @@ export interface ParsedResult {
 
 export interface ConvertToDevExpressFormatParams {
     ast: any; // Define a more specific type if possible
-    resultObject: StateDataObject;
+    resultObject?: StateDataObject | null;
     enableShortCircuit?: boolean;
 }
 
@@ -30,6 +30,6 @@ export function convertSQLToAst(
 
 export function convertAstToDevextreme(
     ast: any, // Define a more specific type if possible
-    state: StateDataObject,
+    state?: StateDataObject | null,
     enableShortCircuit?: boolean,
 ): any;

src/core/converter.js

@@ -136,7 +136,13 @@ function DevExpressConverter() {
 
         const left = ast.left !== undefined ? processAstNode(ast.left) : convertValue(ast.field);
         const right = ast.right !== undefined ? processAstNode(ast.right) : convertValue(ast.value);
-        const operatorToken = ast.operator.toLowerCase();
+        let operatorToken = ast.operator.toLowerCase();
+
+        if(operatorToken === "like") {
+            operatorToken = "contains";
+        }else if (operatorToken === "not like") {
+            operatorToken = "notcontains";
+        }
 
         let comparison = [left, operatorToken, right];
 

src/core/parser.js

@@ -173,6 +173,15 @@ export function parse(input, variables = []) {
 			if (currentToken.type === "function") {
 				const functionNode = parseFunction();
 
+				if(fieldType === "identifier" && functionNode.type === "function") {
+					return {
+						type: "comparison",
+						field,
+						operator,
+						value: functionNode
+					}
+				}
+
 				// Wrap the function inside a comparison if it's directly after an operator
 				const leftComparison = {
 					type: "comparison",

src/index.js

@@ -16,7 +16,7 @@ export function convertSQLToAst(filterString, enableConsoleLogs = false) {
     return parsedResult;
 }
 
-export function convertAstToDevextreme(ast, state, enableShortCircuit = true) {
+export function convertAstToDevextreme(ast, state = null, enableShortCircuit = true) {
     return convertToDevExpressFormat({ ast, resultObject: state, enableShortCircuit })
 }
 

tests/parser.test.js

@@ -204,6 +204,14 @@ describe("Parser SQL to dx Filter Builder", () => {
                 ]
 
             ]
+        },
+        {
+            input: "CompanyName like '{LeadDocument.CompanyID}' AND BranchName not like '{LeadDocument.BranchID}'",
+            expected: [
+                ["CompanyName", "contains", "7"],
+                "and",
+                ["BranchName", "notcontains", "42"]
+            ]
         }
     ];