fix: add ResolveTableType for .merge() (#5605)

knex · Jul 4, 2023 · c8da0df · c8da0df
1 parent 9e5fdfa
commit c8da0df
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/types/index.d.ts b/types/index.d.ts
@@ -566,7 +566,7 @@ export declare namespace Knex {
 
   interface OnConflictQueryBuilder<TRecord extends {}, TResult> {
     ignore(): QueryBuilder<TRecord, TResult>;
-    merge(mergeColumns?: (keyof TRecord)[]): QueryBuilder<TRecord, TResult>;
+    merge(mergeColumns?: (keyof ResolveTableType<TRecord, 'update'>)[]): QueryBuilder<TRecord, TResult>;
     merge(
       data?: Extract<DbRecord<ResolveTableType<TRecord, 'update'>>, object>
     ): QueryBuilder<TRecord, TResult>;