Fix order by types to allow enums (#883)

edgedb · Mar 1, 2024 · 18536d1 · 18536d1
1 parent 18f0351
commit 18536d1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/integration-tests/lts/select.test.ts b/integration-tests/lts/select.test.ts
@@ -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);

diff --git a/packages/generate/src/syntax/select.ts b/packages/generate/src/syntax/select.ts
@@ -35,6 +35,7 @@ import type {
   BaseType,
   ExclusiveTuple,
   orLiteralValue,
+  EnumType,
 } from "./typesystem";
 
 import {
@@ -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;