Skip to content

Fix for using the new sorting with $replaceRoot #219

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 3 commits into from
Jan 15, 2025
Merged

Fix for using the new sorting with $replaceRoot #219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4f83ede
fix for using the new sort with $replaceRoot
Jan 15, 2025
e20c49f
ensuring existing tests are in test mode and not write
Jan 15, 2025
4e363eb
4.2.5
Jan 15, 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
19 changes: 19 additions & 0 deletions lib/make/makeAggregatePipeline.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -598,6 +598,14 @@ function makeAggregatePipeline(ast, context = {}) {
pipeline,
(p) => !!p.$project
);
const replaceRootAfterPreviousProject = pipeline.findIndex(
(step, index) => {
if (index < previousProjectIndex) {
return false;
}
return !!step.$replaceRoot;
}
);

// previous project stage found
if (previousProjectIndex > -1) {
Expand Down Expand Up @@ -669,13 +677,24 @@ function makeAggregatePipeline(ast, context = {}) {
for (const key of unsetKeys) {
projectObj[key] = 1;
}
let replaceRoot = null;
if (
replaceRootAfterPreviousProject > previousProjectIndex
) {
replaceRoot = pipeline[replaceRootAfterPreviousProject];
pipeline.splice(replaceRootAfterPreviousProject, 1);
}
pipeline.splice(previousProjectIndex, 1);
pipeline.push({$project: projectObj});
pipeline.push({$sort: sortObj});
pipeline.push({$unset: unsetKeys});

if (removePrefixes.length > 0) {
pipeline.push({$unset: removePrefixes});
}
if (replaceRoot) {
pipeline.push(replaceRoot);
}
} else {
pipeline.push({$sort: sortObj});
}
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.4",
"version": "4.2.5",
"description": "Convert SQL statements to mongo queries or aggregates",
"main": "index.js",
"files": [
Expand Down
25 changes: 25 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 @@ -1308,5 +1308,30 @@
},
"sort-after-project": {
"case-1": {}
},
"invalid-sort-order": {
"case-1": {
"expectedResults": [
{
"RecordId": "recordId",
"AncestorInstanceId": null,
"AncestorRecordId": null,
"AncestorRecordNumber": null,
"ChecklistStatusId": "ChecklistStatusId",
"CurrentDv": "2021-08-28T06:57:40.097Z",
"InsertDv": "2021-08-28T06:54:50.200Z",
"InstanceId": "InstanceId",
"IsInUseByOtherRecords": 0,
"ModuleId": "ModuleId",
"ProcessFlowId": "ProcessFlowId",
"RecordNumber": 1,
"RecordStatus": "active",
"SQ": 12345,
"CreatedByUserId": "admin",
"LatestModifiedByUserId": "admin",
"DeletedByUserId": null
}
]
}
}
}
185 changes: 13 additions & 172 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 @@ -83,7 +83,7 @@ describe('bug-fixes', function () {
// const res = await queryResultTester({
// queryString: queryString,
// casePath: 'bugfix.current-date.case2',
// mode: 'write',
// mode,
// });
// const correctHcp = [
// {
Expand Down Expand Up @@ -387,7 +387,7 @@ describe('bug-fixes', function () {
await queryResultTester({
queryString: queryString,
casePath: 'bugfix.ntile.case1',
mode: 'write',
mode,
outputPipeline: true,
});
});
Expand Down Expand Up @@ -1159,7 +1159,7 @@ describe('bug-fixes', function () {
await queryResultTester({
queryString: queryString,
casePath: 'deeply-nested-divide.case1',
mode: 'write',
mode,
outputPipeline: false,
});
});
Expand Down Expand Up @@ -1189,7 +1189,7 @@ describe('bug-fixes', function () {
const {pipeline} = await queryResultTester({
queryString: queryString,
casePath: 'and-or-nor.case-1',
mode: 'write',
mode,
outputPipeline: false,
skipDbQuery: true,
optimizeJoins: true,
Expand Down Expand Up @@ -2117,7 +2117,7 @@ describe('bug-fixes', function () {
await queryResultTester({
queryString: queryString,
casePath: 'nin.case-2',
mode: 'write',
mode,
outputPipeline: true,
skipDbQuery: true,
optimizeJoins: false,
Expand Down Expand Up @@ -2199,7 +2199,7 @@ describe('bug-fixes', function () {
await queryResultTester({
queryString: queryString,
casePath: 'nested-case.case-1',
mode: 'write',
mode,
outputPipeline: false,
skipDbQuery: true,
optimizeJoins: false,
Expand Down Expand Up @@ -2257,7 +2257,7 @@ describe('bug-fixes', function () {
await queryResultTester({
queryString: queryString,
casePath: 'nested-case.case-2',
mode: 'write',
mode,
outputPipeline: false,
skipDbQuery: false,
optimizeJoins: false,
Expand Down Expand Up @@ -3077,181 +3077,22 @@ from (select RecordId,
CreatedByUserId,
LatestModifiedByUserId,
DeletedByUserId
from \`global-list-module-records--vbfr-std-glb-module-record\`
from \`global-list-module-records-vbfr-std-glb-module-record\`
where RecordStatus in ('active')
and InstanceId in ('19F881AA-94BA-4F9A-8E04-C37B172AF652' )
and InstanceId in ('InstanceId' )
) as records
where 1=1
order by CurrentDv asc , SQ asc`;
await queryResultTester({
queryString: sql,
casePath: 'nested-case.case-2',
mode: 'write',
casePath: 'invalid-sort-order.case-1',
mode,
outputPipeline: false,
skipDbQuery: true,
expectZeroResults: false,
skipDbQuery: false,
optimizeJoins: false,
unsetId: true,
schemas: {
// 'global-list-module-records--vbfr-std-glb-module-record': {
// type: 'object',
// properties: {
// _id: {
// type: 'string',
// format: 'mongoid',
// },
// RecordId: {
// type: 'string',
// stringLength: 36,
// },
// AncestorInstanceId: {
// type: 'null',
// },
// AncestorRecordId: {
// type: 'null',
// },
// AncestorRecordNumber: {
// type: 'null',
// },
// AuditSQ: {
// type: 'null',
// },
// ChecklistStatusId: {
// type: ['null', 'string'],
// stringLength: 36,
// },
// CreatedByUserId: {
// type: 'string',
// stringLength: 36,
// },
// CurrentDv: {
// type: 'string',
// format: 'date-time',
// },
// DeletedByUserId: {
// type: 'null',
// },
// InsertDv: {
// type: 'string',
// format: 'date-time',
// },
// InstanceId: {
// type: 'string',
// stringLength: 36,
// },
// IsInUseByOtherRecords: {
// type: 'integer',
// },
// LatestModifiedByUserId: {
// type: 'string',
// stringLength: 36,
// },
// ModuleId: {
// type: 'string',
// stringLength: 36,
// },
// ProcessFlowId: {
// type: 'string',
// stringLength: 36,
// },
// RecordNumber: {
// type: 'integer',
// },
// RecordStatus: {
// type: 'string',
// stringLength: 6,
// },
// SQ: {
// type: 'integer',
// },
// _dateUpdated: {
// type: 'string',
// format: 'date-time',
// },
// },
// },
},
});
const aggr = makeMongoAggregate(sql);
assert.deepStrictEqual(
aggr,
{
pipeline: [
{
$match: {
$and: [
{
RecordStatus: {
$in: ['active'],
},
},
{
InstanceId: {
$in: [
'19F881AA-94BA-4F9A-8E04-C37B172AF652',
],
},
},
],
},
},
{
$project: {
RecordId: '$RecordId',
AncestorInstanceId: '$AncestorInstanceId',
AncestorRecordId: '$AncestorRecordId',
AncestorRecordNumber: '$AncestorRecordNumber',
ChecklistStatusId: '$ChecklistStatusId',
CurrentDv: '$CurrentDv',
InsertDv: '$InsertDv',
InstanceId: '$InstanceId',
IsInUseByOtherRecords: '$IsInUseByOtherRecords',
ModuleId: '$ModuleId',
ProcessFlowId: '$ProcessFlowId',
RecordNumber: '$RecordNumber',
RecordStatus: '$RecordStatus',
SQ: '$SQ',
CreatedByUserId: '$CreatedByUserId',
LatestModifiedByUserId:
'$LatestModifiedByUserId',
DeletedByUserId: '$DeletedByUserId',
},
},
{
$match: {
$expr: {
$eq: [1, 1],
},
},
},
{
$replaceRoot: {
newRoot: '$records',
},
},
{
$project: {
records: '$$ROOT',
CurrentDv: 1,
SQ: 1,
},
},
{
$sort: {
CurrentDv: 1,
SQ: 1,
},
},
{
$unset: ['CurrentDv', 'SQ'],
},
],
collections: [
'global-list-module-records--vbfr-std-glb-module-record',
],
type: 'aggregate',
},
'Invalid sort order'
);
});
});
});
21 changes: 21 additions & 0 deletions test/exampleData/global-list-module-records-vbfr-std-glb-module-record.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
[
{
"RecordId": "recordId",
"AncestorInstanceId": null,
"AncestorRecordId": null,
"AncestorRecordNumber": null,
"ChecklistStatusId": "ChecklistStatusId",
"CurrentDv": "2021-08-28T06:57:40.097Z",
"InsertDv": "2021-08-28T06:54:50.200Z",
"InstanceId": "InstanceId",
"IsInUseByOtherRecords": 0,
"ModuleId": "ModuleId",
"ProcessFlowId": "ProcessFlowId",
"RecordNumber": 1,
"RecordStatus": "active",
"SQ": 12345,
"CreatedByUserId": "admin",
"LatestModifiedByUserId": "admin",
"DeletedByUserId": null
}
]
6 changes: 3 additions & 3 deletions test/joins/joins.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ describe('joins', function () {
const {pipeline, results} = await queryResultTester({
queryString,
casePath: 'left-join.no-alias.case-1',
mode: 'write',
mode,
skipDbQuery: false,
});
const lookup = pipeline.find((p) => !!p.$lookup);
Expand Down Expand Up @@ -695,7 +695,7 @@ describe('joins', function () {
const {pipeline} = await queryResultTester({
queryString,
casePath: 'optimize.explicit',
mode: 'write',
mode,
unsetId: false,
});

Expand All @@ -708,7 +708,7 @@ describe('joins', function () {
const {pipeline} = await queryResultTester({
queryString,
casePath: 'optimize.explicit',
mode: 'write',
mode,
});

assert.deepStrictEqual(pipeline, expectedPipeline);
Expand Down
Loading
Loading