Skip to content

Commit cde389a

Browse files
RohitM-INRohitM-IN
authored
Merge pull request #11 from RohitM-IN/development
Bug Fixes & refactor code
2 parents 2f06e6d + 96fe6c6 commit cde389a

File tree

6 files changed

+168
-47
lines changed

6 files changed

+168
-47
lines changed

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "sqlparser-devexpress",
3-
"version": "2.3.1",
3+
"version": "2.3.3",
44
"main": "src/index.js",
55
"type": "module",
66
"scripts": {

‎src/core/converter.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -140,9 +140,9 @@ function DevExpressConverter() {
140140

141141
let comparison = [left, operatorToken, right];
142142

143-
if (isFunctionNullCheck(ast.left, true)) {
143+
if ((ast.left && isFunctionNullCheck(ast.left, true)) || (ast.value && isFunctionNullCheck(ast.value, false))) {
144144
comparison = [[left, operatorToken, right], 'or', [left, operatorToken, null]];
145-
} else if (isFunctionNullCheck(ast.right, true)) {
145+
} else if (ast.right && isFunctionNullCheck(ast.right, true)) {
146146
comparison = [[left, operatorToken, right], 'or', [right, operatorToken, null]];
147147
}
148148

@@ -248,7 +248,7 @@ function DevExpressConverter() {
248248
if (!resultObject) return `{${placeholder}}`;
249249

250250

251-
return resultObject.hasOwnProperty(placeholder) ? resultObject[placeholder] : `{${placeholder}}`;
251+
return resultObject.hasOwnProperty(placeholder) ? resultObject[placeholder] : `{${placeholder.value ?? placeholder}}`;
252252
}
253253

254254
/**

‎src/core/parser.js

+72-23
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { LITERALS, OPERATOR_PRECEDENCE, UNSUPPORTED_PATTERN } from "../constants.js";
1+
import { LITERALS, LOGICAL_OPERATORS, OPERATOR_PRECEDENCE, UNSUPPORTED_PATTERN } from "../constants.js";
22
import { Tokenizer } from "./tokenizer.js";
33

44

@@ -78,38 +78,43 @@ export function parse(input, variables = []) {
7878
}
7979

8080
function parseFunction() {
81-
const funcName = currentToken.value.toUpperCase();
81+
const functionName = currentToken.value.toUpperCase();
8282
next();
8383

84-
expectedToken(currentToken, "(", `Expected ( after ${funcName}`);
84+
expectedToken(currentToken, "(", `Expected ( after ${functionName}`);
8585

8686
next();
8787

88-
const args = [];
88+
const functionArgs = [];
8989
while (currentToken && currentToken.value !== ")") {
90-
args.push(parseExpression());
90+
functionArgs.push(parseExpression());
9191
if (currentToken && currentToken.value === ",") next();
9292
}
9393

94-
expectedToken(currentToken, ")", `Expected ) after ${funcName}`);
94+
expectedToken(currentToken, ")", `Expected ) after ${functionName}`);
9595

9696
next(); // Consume the closing parenthesis
9797

9898
// Check if the next token is an operator and process it
9999
if (currentToken && currentToken.type === "operator") {
100100
const operator = currentToken.value;
101101
next(); // Move to the next token after the operator
102-
const value = parseValue(); // Parse the value after the operator
102+
const rightOperand = parseValue(); // Parse the value after the operator
103+
const nodeType = LOGICAL_OPERATORS.includes(operator.toLowerCase()) ? "logical" : "comparison";
104+
105+
if(nodeType === "logical") {
106+
return { type: "logical", operator, left: { type: "function", name: functionName, args: functionArgs }, right: rightOperand };
107+
}
103108

104109
return {
105110
type: "comparison",
106-
left: { type: "function", name: funcName, args },
111+
left: { type: "function", name: functionName, args: functionArgs },
107112
operator,
108-
value
113+
value: rightOperand
109114
};
110115
}
111116

112-
return { type: "function", name: funcName, args };
117+
return { type: "function", name: functionName, args: functionArgs };
113118
}
114119

115120
// Parses logical expressions using operator precedence
@@ -165,6 +170,21 @@ export function parse(input, variables = []) {
165170

166171
if (operator === "between") return parseBetweenComparison(field, operator);
167172

173+
if (currentToken.type === "function") {
174+
const functionNode = parseFunction();
175+
176+
// Wrap the function inside a comparison if it's directly after an operator
177+
const leftComparison = {
178+
type: "comparison",
179+
field,
180+
operator,
181+
value: functionNode.left
182+
};
183+
184+
functionNode.left = leftComparison;
185+
return functionNode;
186+
}
187+
168188
// For other comparison operators, parse a single right-hand value
169189
const valueType = currentToken.type;
170190
const value = parseValue(operator);
@@ -184,30 +204,59 @@ export function parse(input, variables = []) {
184204
function parseValue(operatorToken) {
185205
if (!currentToken) throw new Error("Unexpected end of input");
186206

207+
// Handle function without consuming the token
208+
if (currentToken.type === "function") {
209+
return parseFunction();
210+
}
211+
187212
const token = currentToken;
188213
next(); // Move to the next token
189214

190-
if (token.type === "number") return Number(token.value);
191-
if (token.type === "string") return token.value.slice(1, -1).replace(/''/g, "");
192-
if (token.type === "identifier") return token.value;
193-
if (token.type === "null") return null;
215+
switch (token.type) {
216+
case "number":
217+
return Number(token.value);
194218

195-
// Handle placeholders like `{VariableName}`
196-
if (token.type === "placeholder") {
197-
const val = token.value.slice(1, -1);
198-
if (!variables.includes(val)) variables.push(val);
199-
return { type: "placeholder", value: val };
200-
}
219+
case "string":
220+
return token.value.slice(1, -1).replace(/''/g, "");
201221

202-
operatorToken = operatorToken.toUpperCase();
222+
case "identifier":
223+
return token.value;
203224

204-
// Handle IN operator which requires a list of values
205-
if (operatorToken && (operatorToken === "IN" || operatorToken === "NOT IN")) return parseInList(token);
225+
case "null":
226+
return null;
227+
228+
case "placeholder": {
229+
const val = token.value.slice(1, -1);
230+
if (!variables.includes(val)) variables.push(val);
231+
return { type: "placeholder", value: val };
232+
}
233+
234+
case "paren": {
235+
if (currentToken.type === "function") {
236+
return parseFunction();
237+
}
238+
// Handle ({Placeholder}) syntax for placeholders inside parentheses
239+
const nextToken = tokenizer.peekNextToken();
240+
if (currentToken && currentToken.type === "placeholder" &&
241+
nextToken && nextToken.type === "paren") {
242+
const val = parseValue();
243+
return { type: "placeholder", value: val };
244+
}
245+
break;
246+
}
247+
}
248+
249+
// Handle IN or NOT IN operator (outside switch as intended)
250+
operatorToken = operatorToken?.toUpperCase();
251+
if (operatorToken === "IN" || operatorToken === "NOT IN") {
252+
return parseInList(token);
253+
}
206254

207255
throw new Error(`Unexpected value: ${token.value}`);
208256
}
209257

210258

259+
211260
// Start parsing and return the AST with extracted variables
212261
return { ast: parseExpression(), variables };
213262
}

‎src/debug.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
// return convertToDevExpressFormat({ ast: astTree, resultObject: sampleData });
2929
// }
3030

31-
// const devexpress = parseFilterString("OrderID = {CustomerOrders.OrderID} AND Status IN (1, 3)", sampleData);
31+
// const devexpress = parseFilterString("(ISNULL(TicketID, 0) = ISNULL({CustomerOrders.OrderID}, 0))", sampleData);
3232
// console.log("DevExpress Filter:", JSON.stringify(devexpress, null, 2));
3333
// // const devexpress = parseFilterString("(RS2ID in ({LeadStatementGlobalRpt.StateID}) Or ({LeadStatementGlobalRpt.StateID} =0)) And (RS3ID in (0,{LeadStatementGlobalRpt.RegionID}) Or {LeadStatementGlobalRpt.RegionID} =0 )", sampleData);
3434

‎tests/error.test.js

+66
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
import { describe, expect, it } from "vitest";
2+
import { convertToDevExpressFormat } from "../src/core/converter";
3+
import { parse } from "../src/core/parser";
4+
import { sanitizeQuery } from "../src/core/sanitizer";
5+
import { convertAstToDevextreme, convertSQLToAst } from "../src";
6+
7+
describe("Parser SQL to dx Filter Builder", () => {
8+
const testCases = [
9+
{
10+
input: "NULL",
11+
expected: []
12+
},
13+
{
14+
input: "SELECT DISTINCT O.OrderID AS ID, O.CustomerName, O.OrderType, O.CustomerName AS [Online Order], O.OrderDate AS OrderDate, D.DeliveryStatus, O.OrderDate AS [Online Order Date], O.CompanyID, CAST(CAST(O.OrderDate AS DATE) AS VARCHAR(10)) AS DocumentDate FROM Orders O INNER JOIN Payment P ON P.OrderID = O.OrderID INNER JOIN Shipment S ON S.PaymentID = P.PaymentID INNER JOIN Delivery D ON D.ShipmentID = S.ShipmentID ",
15+
expect: null
16+
},
17+
{
18+
input: "CompanyID = CompanyID2 = {AccountingRule.CompanyID}",
19+
expected: "Error: Invalid comparison: CompanyID = CompanyID2",
20+
},
21+
{
22+
input: "( CompanyID = {AccountingRule.CompanyID}",
23+
expected: "Error: Missing closing parenthesis"
24+
}
25+
26+
];
27+
28+
testCases.forEach(({ input, expected }, index) => {
29+
it(`Test Case ${index + 1}: ${input}`, () => {
30+
31+
if (expected == undefined) {
32+
expected = null
33+
}
34+
35+
let astwithVariables;
36+
try {
37+
astwithVariables = convertSQLToAst(input);
38+
} catch (error) {
39+
expect(error.message).toEqual(expected.replace("Error: ", ""));
40+
return;
41+
}
42+
43+
if (astwithVariables == null) {
44+
expect(null).toEqual(expected);
45+
return;
46+
}
47+
48+
const variables = astwithVariables.variables;
49+
const ast = astwithVariables.ast;
50+
51+
const result = convertAstToDevextreme(ast, sampleData);
52+
53+
if (result == null || result == true || result == false) {
54+
expect([]).toEqual(expected);
55+
return;
56+
}
57+
58+
expect(result).toEqual(expected);
59+
});
60+
});
61+
});
62+
63+
64+
const sampleData = {
65+
"AccountingRule.CompanyID": 42,
66+
};

‎tests/parser.test.js

+25-19
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,6 @@ describe("Parser SQL to dx Filter Builder", () => {
102102
["ItemGroupType", "=", ""]
103103
]
104104
},
105-
{
106-
input: "NULL",
107-
expected: []
108-
},
109105
{
110106
input: "((ISNULL({0}, 0) = 0 AND CompanyID = {1}) OR CompanyID IS NULL) OR BranchID = {0} | [LeadDocument.BranchID] | [LeadDocument.CompanyID]",
111107
expected: [
@@ -122,10 +118,6 @@ describe("Parser SQL to dx Filter Builder", () => {
122118
["BranchID", "=", 42]
123119
]
124120
},
125-
{
126-
input: "SELECT DISTINCT OP.DocID ID,OP.DocName,OP.DocType,OP.DocName [Work Purchase Order],OP.DocDate DocDate,SP.WoStatus,OP.DocDate [Work Purchase Order Date], OP.CompanyID, cast(cast(OP.DocDate as date) as varchar(10)) DocumentDate FROM OpenDocuments OP inner join PurchaseHeader PH on PH.Id=op.DocID inner JOIN PurchasePosting PP ON PP.DocID = PH.ID inner JOIN SalePosting SP ON SP.PurchasePostingLineID = PP.ID",
127-
expect: null
128-
},
129121
{
130122
input: "FromDate Between '10-10-2021' AND '10-10-2022'",
131123
expected: [
@@ -152,10 +144,6 @@ describe("Parser SQL to dx Filter Builder", () => {
152144
["SourceID", "=", null]
153145
]
154146
},
155-
{
156-
input: "CompanyID = CompanyID2 = {AccountingRule.CompanyID}",
157-
expected: "Error: Invalid comparison: CompanyID = CompanyID2",
158-
},
159147
{
160148
input: "(CompanyID = {LeadDocument.CompanyID} OR ISNULL(CompanyID,0) = 0) AND (ISNULL(IsSubdealer,0) = {LeadDocument.AllowSubDealer})",
161149
expected: [
@@ -193,6 +181,27 @@ describe("Parser SQL to dx Filter Builder", () => {
193181
"or",
194182
["AddressType", "=", 2]
195183
]
184+
},
185+
{
186+
input: "(ISNULL(TicketID, 0) = ISNULL({SupportResolution.TicketID}, 0))",
187+
expected: [
188+
["TicketID", "=", 123],
189+
"or",
190+
["TicketID", "=", null]
191+
]
192+
},
193+
{
194+
input: "CompanyID = ISNULL({LeadDocument.CompanyID},0) OR (ISNULL(CompanyID,0) = 0))",
195+
expected: [
196+
["CompanyID", "=", 7],
197+
"or",
198+
["CompanyID", "=", null],
199+
"or",
200+
["CompanyID", "=", 0],
201+
"or",
202+
["CompanyID", "=", null]
203+
204+
]
196205
}
197206
];
198207

@@ -204,12 +213,8 @@ describe("Parser SQL to dx Filter Builder", () => {
204213
}
205214

206215
let astwithVariables;
207-
try {
208-
astwithVariables = convertSQLToAst(input);
209-
} catch (error) {
210-
expect(error.message).toEqual(expected.replace("Error: ", ""));
211-
return;
212-
}
216+
astwithVariables = convertSQLToAst(input);
217+
213218

214219
if (astwithVariables == null) {
215220
expect(null).toEqual(expected);
@@ -256,5 +261,6 @@ const sampleData = {
256261
"LeadDocument.BranchID": 42,
257262
"LeadDocument.CompanyID": 7,
258263
"ServiceOrderDocument.SourceID": 2,
259-
"LeadDocument.AllowSubDealer": true
264+
"LeadDocument.AllowSubDealer": true,
265+
"SupportResolution.TicketID": 123
260266
};

0 commit comments

Comments
 (0)