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.

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

Jump to bottom

Fix order by types to allow enums #883

Merged
merged 2 commits into from Mar 1, 2024
Merged

Fix order by types to allow enums #883

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
1d77842
Fix order by types to allow enums
CarsonF Mar 1, 2024
948d900
Adapt test
CarsonF Mar 1, 2024
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
3 changes: 2 additions & 1 deletion integration-tests/lts/select.test.ts
View file
Open in desktop
Expand Up @@ -1050,10 +1050,11 @@ SELECT __scope_0_defaultPerson {
title: true,
characters: (char) => ({
name: true,
order_by: char.name,
order_by: char.name, // assert order by scalar
...e.is(e.Hero, { secret_identity: true }),
}),
filter_single: e.op(movie.title, "=", "The Avengers"),
order_by: movie.genre, // assert order by enum
}));

const result = await query.run(client);
Expand Down
6 changes: 5 additions & 1 deletion packages/generate/src/syntax/select.ts
View file
Open in desktop
Expand Up @@ -35,6 +35,7 @@ import type {
BaseType,
ExclusiveTuple,
orLiteralValue,
EnumType,
} from "./typesystem";

import {
Expand Down Expand Up @@ -62,7 +63,10 @@ export const EMPTY_LAST: "EMPTY LAST" = "EMPTY LAST";
export type OrderByDirection = "ASC" | "DESC";
export type OrderByEmpty = "EMPTY FIRST" | "EMPTY LAST";

export type OrderByExpr = TypeSet<ScalarType | ObjectType, Cardinality>;
export type OrderByExpr = TypeSet<
ScalarType | EnumType | ObjectType,
Cardinality
>;
export type OrderByObjExpr = {
expression: OrderByExpr;
direction?: OrderByDirection;
Expand Down