Fix incorrect type of QueryBuilder.first('*') result

Resolves #3619
knex · Jan 9, 2020 · 40521b6 · 40521b6
1 parent 4feefdf
commit 40521b6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/types/index.d.ts b/types/index.d.ts
@@ -1258,7 +1258,7 @@ declare namespace Knex {
     // we can extend our selection by these columns
     (columnName: '*'): QueryBuilder<
       TRecord,
-      DeferredKeySelection<TRecord, string>[]
+      ArrayIfAlready<TResult, DeferredKeySelection<TRecord, string>>
     >;
 
     <

diff --git a/types/test.ts b/types/test.ts
@@ -117,6 +117,14 @@ const main = async () => {
   // $ExpectType any
   await knex('users').first('id');
 
+  // $ExpectType any
+  await knex
+    .first('*')
+    .from('table')
+    .where({
+      whatever: 'whatever'
+    });
+
   // $ExpectType any
   await knex('users').first('id', 'name');
 
@@ -1336,4 +1344,5 @@ const main = async () => {
 
   // $ExpectType any
   knex.queryBuilder().queryContext();
+
 };