fixes #1039

kysely-org · Jun 13, 2024 · 873671b · 873671b
1 parent 9519ffd
commit 873671b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/query-creator.ts b/src/query-creator.ts
@@ -171,7 +171,7 @@ export class QueryCreator<DB> {
     from: TE[],
   ): SelectQueryBuilder<DB, ExtractTableAlias<DB, TE>, {}>
 
-  selectFrom<TE extends TableExpression<DB, keyof DB>>(
+  selectFrom<TE extends TableExpression<DB, never>>(
     from: TE[],
   ): SelectQueryBuilder<From<DB, TE>, FromTables<DB, never, TE>, {}>
 
@@ -187,7 +187,7 @@ export class QueryCreator<DB> {
     {}
   >
 
-  selectFrom<TE extends TableExpression<DB, keyof DB>>(
+  selectFrom<TE extends TableExpression<DB, never>>(
     from: TE,
   ): SelectQueryBuilder<From<DB, TE>, FromTables<DB, never, TE>, {}>
 

diff --git a/test/typings/test-d/select-from.test-d.ts b/test/typings/test-d/select-from.test-d.ts
@@ -37,6 +37,16 @@ async function testFromSingle(db: Kysely<Database>) {
     .execute()
   expectType<{ strs: number }>(r4)
 
+  // Subquery factory list
+  const [r4_2] = await db
+    .selectFrom([
+      (eb) => eb.selectFrom('movie').select('movie.stars as strs').as('m'),
+      (eb) => eb.selectFrom('pet').select('id').as('p'),
+    ])
+    .selectAll(['m', 'p'])
+    .execute()
+  expectType<{ strs: number; id: string }>(r4_2)
+
   // Table with schema
   const [r5] = await db
     .selectFrom('some_schema.movie')