Skip to content
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.

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

Fix e.group codegen when grouping a nested e.select #450

Merged
merged 1 commit into from
Sep 26, 2022
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
52 changes: 52 additions & 0 deletions qb/test/group.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,58 @@ test("basic group", async () => {
expect(result[1].elements[0].characters[0].name).toBeDefined();
});

test("group nested select", async () => {
if (await version_lt(client, 2)) return;
const query = e.group(
e.select(e.Movie, m => ({
filter: e.op(m.release_year, ">", 2015),
})),
movie => {
const release_year = movie.release_year;
return {
release_year: true,
title: true,
characters: {name: true},
by: {
release_year,
},
};
}
);

type query = $infer<typeof query>;
const result = await query.run(client);
tc.assert<
tc.IsExact<
query,
{
grouping: string[];
key: {
release_year: number | null;
};
elements: {
release_year: number;
title: string;
characters: {
name: string;
}[];
}[];
}[]
>
>(true);

expect(result).toMatchObject([
{
grouping: ["release_year"],
},
]);
expect(result.length).toEqual(1);
expect(result[0].elements.length).toEqual(1);
expect(result[0].elements[0].title).toBeDefined();
expect(result[0].elements[0].release_year).toBeDefined();
expect(result[0].elements[0].characters[0].name).toBeDefined();
});

test("multiple keys", async () => {
if (await version_lt(client, 2)) return;
const query = e.group(e.Movie, movie => {
Expand Down
2 changes: 1 addition & 1 deletion src/syntax/toEdgeQL.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1045,7 +1045,7 @@ function renderEdgeQL(
const selectStatement: string[] = [];
const groupStatement: string[] = [];

const groupTarget = renderEdgeQL(expr.__scope__, ctx);
const groupTarget = renderEdgeQL(expr.__scope__, ctx, false);
groupStatement.push(`GROUP ${groupTarget}`);

// render scoped withvars in using
Expand Down