InferResult should output plural. (#1064)

kysely-org · Jul 7, 2024 · 9d88f3d · 9d88f3d
1 parent aa45498
commit 9d88f3d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -2,9 +2,9 @@ name: tests
 
 on:
   push:
-    branches: [master]
+    branches: [master, v*]
   pull_request:
-    branches: [master]
+    branches: [master, v*]
 
 jobs:
   node:

diff --git a/src/util/infer-result.ts b/src/util/infer-result.ts
@@ -56,5 +56,5 @@ type ResolveResult<O> = O extends
   | UpdateResult
   | DeleteResult
   | MergeResult
-  ? O
+  ? O[]
   : Simplify<O>[]
diff --git a/test/typings/test-d/infer-result.test-d.ts b/test/typings/test-d/infer-result.test-d.ts
@@ -47,7 +47,7 @@ function testInferResultInsertQuery(db: Kysely<Database>) {
   })
   const compiledQuery0 = query0.compile()
 
-  type Expected0 = InsertResult
+  type Expected0 = InsertResult[]
   expectType<Equals<Expected0, InferResult<typeof query0>>>(true)
   expectType<Equals<Expected0, InferResult<typeof compiledQuery0>>>(true)
 
@@ -74,7 +74,7 @@ function testInferResultUpdateQuery(db: Kysely<Database>) {
     .where('pet.id', '=', '1')
   const compiledQuery0 = query0.compile()
 
-  type Expected0 = UpdateResult
+  type Expected0 = UpdateResult[]
   expectType<Equals<Expected0, InferResult<typeof query0>>>(true)
   expectType<Equals<Expected0, InferResult<typeof compiledQuery0>>>(true)
 
@@ -111,7 +111,7 @@ function testInferResultDeleteQuery(db: Kysely<Database>) {
   const query0 = db.deleteFrom('pet').where('id', '=', '1')
   const compiledQuery0 = query0.compile()
 
-  type Expected0 = DeleteResult
+  type Expected0 = DeleteResult[]
   expectType<Equals<Expected0, InferResult<typeof query0>>>(true)
   expectType<Equals<Expected0, InferResult<typeof compiledQuery0>>>(true)
 
@@ -138,7 +138,7 @@ function testInferResultMergeQuery(db: Kysely<Database>) {
     .thenDelete()
   const compiledQuery0 = query0.compile()
 
-  type Expected0 = MergeResult
+  type Expected0 = MergeResult[]
   expectType<Equals<Expected0, InferResult<typeof query0>>>(true)
   expectType<Equals<Expected0, InferResult<typeof compiledQuery0>>>(true)
 }