Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/makeJoinForPipeline.js
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,9 @@ function tableJoin(
? `${localPart.schema ? localPart.schema + '.' : ''}${
localPart.table
}.${localPart.column}`
: `${previousJoin.as || previousJoin.table}.${localPart.column}`;
: previousJoin.as
? `${previousJoin.as}.${localPart.column}`
: localPart.column;
const foreignField = fromPart.column;
pipeline.push({
$lookup: {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@synatic/noql",
"version": "4.1.14",
"version": "4.1.15",
"description": "Convert SQL statements to mongo queries or aggregates",
"main": "index.js",
"files": [
Expand Down
2 changes: 1 addition & 1 deletion test/aggregateTests/joins.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"$lookup": {
"from": "inventory",
"as": "inventory",
"localField": "orders.item",
"localField": "item",
"foreignField": "sku"
}
},
Expand Down
18 changes: 18 additions & 0 deletions test/joins/join-cases.json
Original file line number Diff line number Diff line change
Expand Up @@ -916,6 +916,24 @@
"i": []
}
]
},
"no-alias": {
"case-1": {
"expectedResults": [
{
"item": "almonds",
"sku": [
"almonds"
]
},
{
"item": "pecans",
"sku": [
"pecans"
]
}
]
}
}
},
"n-level-join": {
Expand Down
21 changes: 21 additions & 0 deletions test/joins/joins.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,27 @@ describe('joins', function () {
casePath: 'left-join.basic-reversed',
});
});

it('should not need table aliases', async () => {
const queryString = `
select item,
inventory.sku
from
\`orders\`
left outer JOIN \`inventory\` on \`inventory\`.\`sku\` = \`item\`
LIMIT 2
`;
const {pipeline, results} = await queryResultTester({
queryString,
casePath: 'left-join.no-alias.case-1',
mode: 'write',
skipDbQuery: false,
});
const lookup = pipeline.find((p) => !!p.$lookup);
for (const result of results) {
assert.deepEqual(result.item, result.sku[0]);
}
});
});

describe('join order of queries', () => {
Expand Down
Loading