Skip to content

Fix for double quoted strings passed into functions #221

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 12, 2025
Merged

Fix for double quoted strings passed into functions #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c3fc8e
fix(double-quote): fixing logic for double-quote arguments
Feb 12, 2025
b5bf34c
4.2.6
Feb 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion lib/make/makeProjectionExpressionPart.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ exports.makeProjectionExpressionPart = makeProjectionExpressionPart;

/**
* Makes a projection expression sub part.
*
* @param {import('../types').Expression} expr - the expression to make a projection from
* @param {import('../types').NoqlContext} context - The Noql context to use when generating the output
* @param {number} [depth] - the current recursive depth
Expand Down Expand Up @@ -124,6 +123,9 @@ function makeArg(expr, depth, context) {
if (expr.type === 'case') {
return makeCaseConditionModule.makeCaseCondition(expr, context);
}
if (expr.type === 'double_quote_string') {
return `$${expr.value}`;
}
if (expr.value !== undefined) {
return {$literal: expr.value};
}
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@synatic/noql",
"version": "4.2.5",
"version": "4.2.6",
"description": "Convert SQL statements to mongo queries or aggregates",
"main": "index.js",
"files": [
Expand Down
42 changes: 42 additions & 0 deletions test/bug-fix-tests/bug-fix.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1333,5 +1333,47 @@
}
]
}
},
"ifNull": {
"case-1": {
"expectedResults": [
{
"SKU": "almonds"
},
{
"SKU": "Not Specified"
}
]
},
"case-2": {
"expectedResults": [
{
"SKU": "almonds"
},
{
"SKU": "Not Specified"
}
]
},
"case-3": {
"expectedResults": [
{
"City": "Sasebo"
},
{
"City": "Not Specified"
}
]
},
"case-4": {
"expectedResults": [
{
"SKU": "almonds"
},
{
"SKU": "Not Specified"
}
]
}
}
}
184 changes: 184 additions & 0 deletions test/bug-fix-tests/bug-fix.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3095,4 +3095,188 @@ order by CurrentDv asc , SQ asc`;
});
});
});

describe('ifNull', () => {
it('should handle ifNull for a simple statement', async () => {
const sql = `
SELECT ifNull(sku, 'Not Specified') as SKU
FROM inventory
WHERE id in (1,5)`;
const {pipeline, results} = await queryResultTester({
queryString: sql,
casePath: 'ifNull.case-1',
mode,
unsetId: true,
});
assert.deepStrictEqual(results, [
{
SKU: 'almonds',
},
{
SKU: 'Not Specified',
},
]);
assert.deepStrictEqual(pipeline, [
{
$match: {
id: {
$in: [1, 5],
},
},
},
{
$project: {
SKU: {
$ifNull: [
'$sku',
{
$literal: 'Not Specified',
},
],
},
},
},
{
$unset: '_id',
},
]);
});
it('should handle ifNull for a simple statement with a table alias', async () => {
const sql = `
SELECT ifNull(i.sku, 'Not Specified') as SKU
FROM inventory i
WHERE id in (1,5)`;
const {pipeline, results} = await queryResultTester({
queryString: sql,
casePath: 'ifNull.case-2',
mode,
unsetId: true,
});
assert.deepStrictEqual(results, [
{
SKU: 'almonds',
},
{
SKU: 'Not Specified',
},
]);
assert.deepStrictEqual(pipeline, [
{
$project: {
i: '$$ROOT',
},
},
{
$match: {
'i.id': {
$in: [1, 5],
},
},
},
{
$project: {
SKU: {
$ifNull: [
'$i.sku',
{
$literal: 'Not Specified',
},
],
},
},
},
{
$unset: '_id',
},
]);
});
it('should handle ifNull for a simple statement with a nested field', async () => {
const sql = `
SELECT ifNull(Address.City, 'Not Specified') as City
FROM customers
WHERE id in (1,599)`;
const {pipeline, results} = await queryResultTester({
queryString: sql,
casePath: 'ifNull.case-3',
mode,
unsetId: true,
});
assert.deepStrictEqual(results, [
{
City: 'Sasebo',
},
{
City: 'Not Specified',
},
]);
assert.deepStrictEqual(pipeline, [
{
$match: {
id: {
$in: [1, 599],
},
},
},
{
$project: {
City: {
$ifNull: [
'$Address.City',
{
$literal: 'Not Specified',
},
],
},
},
},
{
$unset: '_id',
},
]);
});
it('should handle ifNull for a simple statement with double quotes', async () => {
const sql = `
SELECT ifNull("sku", 'Not Specified') as SKU
FROM inventory
WHERE id in (1,5)`;
const {pipeline, results} = await queryResultTester({
queryString: sql,
casePath: 'ifNull.case-4',
mode,
unsetId: true,
});
assert.deepStrictEqual(results, [
{
SKU: 'almonds',
},
{
SKU: 'Not Specified',
},
]);
assert.deepStrictEqual(pipeline, [
{
$match: {
id: {
$in: [1, 5],
},
},
},
{
$project: {
SKU: {
$ifNull: [
'$sku',
{
$literal: 'Not Specified',
},
],
},
},
},
{
$unset: '_id',
},
]);
});
});
});
3 changes: 1 addition & 2 deletions test/exampleData/customers.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[
{
"_id":"61b0fdcbdee485f7c0682db6",
"_id": "61b0fdcbdee485f7c0682db6",
"Address": {
"Address": "1913 Hanoi Way",
"City": "Sasebo",
Expand Down Expand Up @@ -248750,7 +248750,6 @@
{
"Address": {
"Address": "1325 Fukuyama Street",
"City": "Tieli",
"Country": "China",
"District": "Heilongjiang"
},
Expand Down
4 changes: 2 additions & 2 deletions test/individualTests/upgrade.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ describe('node-sql-parser upgrade tests', function () {
SELECT id,
item,
orderDate as od1,
date_add(orderDate,'hour',2,"America/New_York") as od2,
date_add(orderDate,'hour',2,'America/New_York') as od2,
unset(_id)
FROM orders
WHERE id=2
Expand Down Expand Up @@ -345,7 +345,7 @@ describe('node-sql-parser upgrade tests', function () {
SELECT id,
item,
orderDate as od1,
date_subtract(orderDate,'hour',2,"America/New_York") as od2,
date_subtract(orderDate,'hour',2,'America/New_York') as od2,
unset(_id)
FROM orders
WHERE id=2
Expand Down
Loading