knex 1.0.2 → 1.0.5

package/types/index.d.ts

@@ -30,6 +30,11 @@ type StrKey<T> = string & keyof T;
 
 // If T is unknown then convert to any, else retain original
 type UnknownToAny<T> = unknown extends T ? any : T;
+type CurlyCurlyToAny<T> = T extends unknown ? // distribute
+  (<U>() => U extends T ? 0 : 1) extends
+  (<U>() => U extends {} ? 0 : 1) ? any : T
+  : never;
+type UnknownOrCurlyCurlyToAny<T> = [UnknownToAny<T> | CurlyCurlyToAny<T>][0];
 type AnyToUnknown<T> = unknown extends T ? unknown : T;
 type AnyOrUnknownToOther<T1, T2> = unknown extends T1 ? T2 : T1;
 
@@ -193,7 +198,7 @@ declare namespace DeferredKeySelection {
     ? DeferredKeySelection<TBase, TKeys | TKey, true, TAliasMapping, TSingle, TIntersectProps, TUnionProps>
     : DeferredKeySelection<unknown, TKey, true>;
 
-  type AddAliases<TSelection, T> = TSelection extends DeferredKeySelection<
+  type AddAliases<TSelection, T extends {}> = TSelection extends DeferredKeySelection<
     infer TBase,
     infer TKeys,
     infer THasSelect,
@@ -219,7 +224,7 @@ declare namespace DeferredKeySelection {
 
   // Convenience utility to set base, keys and aliases in a single type
   // application
-  type Augment<T, TBase, TKey extends string, TAliasMapping = {}> = AddAliases<
+  type Augment<T, TBase, TKey extends string, TAliasMapping extends {} = {}> = AddAliases<
     AddKey<SetBase<T, TBase>, TKey>,
     TAliasMapping
   >;
@@ -234,7 +239,7 @@ declare namespace DeferredKeySelection {
     infer TIntersectProps,
     infer TUnionProps
   >
-    ? UnknownToAny<
+    ? UnknownOrCurlyCurlyToAny<
       // ^ We convert final result to any if it is unknown for backward compatibility.
       //   Historically knex typings have been liberal with returning any and changing
       //   default return type to unknown would be a major breaking change for users.
@@ -263,11 +268,11 @@ declare namespace DeferredKeySelection {
     : TSelection extends DeferredKeySelection.Any[]
     ? Knex.ResolveTableType<ResolveOne<TSelection[0]>>[]
     : TSelection extends (infer I)[]
-    ? UnknownToAny<Knex.ResolveTableType<I>>[]
-    : UnknownToAny<Knex.ResolveTableType<TSelection>>;
+    ? UnknownOrCurlyCurlyToAny<Knex.ResolveTableType<I>>[]
+    : UnknownOrCurlyCurlyToAny<Knex.ResolveTableType<TSelection>>;
 }
 
-type AggregationQueryResult<TResult, TIntersectProps2> = ArrayIfAlready<
+type AggregationQueryResult<TResult, TIntersectProps2 extends {}> = ArrayIfAlready<
   TResult,
   UnwrapArrayMember<TResult> extends DeferredKeySelection<
     infer TBase,
@@ -284,27 +289,6 @@ type AggregationQueryResult<TResult, TIntersectProps2> = ArrayIfAlready<
   : TIntersectProps2
 >;
 
-// Convenience alias and associated companion namespace for working
-// with DeferredSelection having TSingle=true.
-//
-// When TSingle=true in DeferredSelection, then we are effectively
-// deferring an index access operation (TBase[TKey]) over a potentially
-// unknown initial type of TBase and potentially never initial type of TKey
-
-type DeferredIndex<TBase, TKey extends string> = DeferredKeySelection<TBase, TKey, false, {}, true>;
-
-declare namespace DeferredIndex {
-  type Augment<
-    T,
-    TBase,
-    TKey extends string,
-    TAliasMapping = {}
-    > = DeferredKeySelection.SetSingle<
-      DeferredKeySelection.AddKey<DeferredKeySelection.SetBase<T, TBase>, TKey>,
-      true
-    >;
-}
-
 // If we have more categories of deferred selection in future,
 // this will combine all of them
 type ResolveResult<S> = DeferredKeySelection.Resolve<S>;
@@ -328,13 +312,13 @@ interface DMLOptions {
   includeTriggerModifications?: boolean;
 }
 
-export interface Knex<TRecord extends {} = any, TResult = Record<string, any>[]>
+export interface Knex<TRecord extends {} = any, TResult = any[]>
   extends Knex.QueryInterface<TRecord, TResult>, events.EventEmitter {
   <TTable extends Knex.TableNames>(
     tableName: TTable,
     options?: TableOptions
   ): Knex.QueryBuilder<Knex.TableType<TTable>, DeferredKeySelection<Knex.ResolveTableType<Knex.TableType<TTable>>, never>[]>;
-  <TRecord2 = TRecord, TResult2 = DeferredKeySelection<TRecord2, never>[]>(
+  <TRecord2 extends {} = TRecord, TResult2 = DeferredKeySelection<TRecord2, never>[]>(
     tableName?: Knex.TableDescriptor | Knex.AliasDict,
     options?: TableOptions
   ): Knex.QueryBuilder<TRecord2, TResult2>;
@@ -361,7 +345,7 @@ export interface Knex<TRecord extends {} = any, TResult = Record<string, any>[]>
   destroy(callback: Function): void;
   destroy(): Promise<void>;
 
-  batchInsert<TRecord2 = TRecord, TResult2 = number[]>(
+  batchInsert<TRecord2 extends {} = TRecord, TResult2 = number[]>(
     tableName: Knex.TableDescriptor,
     data: TRecord2 extends Knex.CompositeTableType<unknown>
       ? ReadonlyArray<Knex.ResolveTableType<TRecord2, 'insert'>>
@@ -370,7 +354,7 @@ export interface Knex<TRecord extends {} = any, TResult = Record<string, any>[]>
   ): Knex.BatchInsertBuilder<TRecord2, TResult2>;
 
   schema: Knex.SchemaBuilder;
-  queryBuilder<TRecord2 = TRecord, TResult2 = TResult>(): Knex.QueryBuilder<
+  queryBuilder<TRecord2 extends {} = TRecord, TResult2 = TResult>(): Knex.QueryBuilder<
     TRecord2,
     TResult2
   >;
@@ -426,7 +410,7 @@ export declare namespace Knex {
   interface ValueDict extends Dict<Value | Knex.QueryBuilder> {}
   interface AliasDict extends Dict<string> {}
 
-  type ColumnDescriptor<TRecord, TResult> =
+  type ColumnDescriptor<TRecord extends {}, TResult> =
     | string
     | Knex.Raw
     | Knex.QueryBuilder<TRecord, TResult>
@@ -473,7 +457,7 @@ export declare namespace Knex {
     ? TCompositeTableType[TScope]
     : TCompositeTableType;
 
-  interface OnConflictQueryBuilder<TRecord, TResult> {
+  interface OnConflictQueryBuilder<TRecord extends {}, TResult> {
     ignore(): QueryBuilder<TRecord, TResult>;
     merge(mergeColumns?: (keyof TRecord)[]): QueryBuilder<TRecord, TResult>;
     merge(data?: Extract<DbRecord<ResolveTableType<TRecord, 'update'>>, object>): QueryBuilder<TRecord, TResult>;
@@ -548,7 +532,11 @@ export declare namespace Knex {
     whereNotIn: WhereIn<TRecord, TResult>;
     orWhereNotIn: WhereIn<TRecord, TResult>;
     whereLike: Where<TRecord, TResult>;
+    andWhereLike: Where<TRecord, TResult>;
+    orWhereLike: Where<TRecord, TResult>;
     whereILike: Where<TRecord, TResult>;
+    andWhereILike: Where<TRecord, TResult>;
+    orWhereILike: Where<TRecord, TResult>;
     whereNull: WhereNull<TRecord, TResult>;
     orWhereNull: WhereNull<TRecord, TResult>;
     whereNotNull: WhereNull<TRecord, TResult>;
@@ -694,7 +682,7 @@ export declare namespace Knex {
     ): QueryBuilder<TRecord, DeferredKeySelection<TRecord, never>[]>;
     insert<
       TKey extends StrKey<ResolveTableType<TRecord>>,
-      TResult2 = DeferredIndex.Augment<
+      TResult2 = DeferredKeySelection.Augment<
         UnwrapArrayMember<TResult>,
         ResolveTableType<TRecord>,
         TKey
@@ -722,7 +710,7 @@ export declare namespace Knex {
     ): QueryBuilder<TRecord, TResult2>;
     insert<
       TKey extends string,
-      TResult2 = DeferredIndex.Augment<
+      TResult2 = DeferredKeySelection.Augment<
         UnwrapArrayMember<TResult>,
         TRecord,
         TKey
@@ -736,7 +724,7 @@ export declare namespace Knex {
     ): QueryBuilder<TRecord, TResult2>;
     insert<
       TKey extends string,
-      TResult2 = DeferredIndex.Augment<
+      TResult2 = DeferredKeySelection.Augment<
         UnwrapArrayMember<TResult>,
         TRecord,
         TKey
@@ -763,7 +751,7 @@ export declare namespace Knex {
     ): QueryBuilder<TRecord, DeferredKeySelection<TRecord, never>[]>;
     upsert<
       TKey extends StrKey<ResolveTableType<TRecord>>,
-      TResult2 = DeferredIndex.Augment<
+      TResult2 = DeferredKeySelection.Augment<
         UnwrapArrayMember<TResult>,
         ResolveTableType<TRecord>,
         TKey
@@ -791,7 +779,7 @@ export declare namespace Knex {
     ): QueryBuilder<TRecord, TResult2>;
     upsert<
       TKey extends string,
-      TResult2 = DeferredIndex.Augment<
+      TResult2 = DeferredKeySelection.Augment<
         UnwrapArrayMember<TResult>,
         TRecord,
         TKey
@@ -805,7 +793,7 @@ export declare namespace Knex {
     ): QueryBuilder<TRecord, TResult2>;
     upsert<
       TKey extends string,
-      TResult2 = DeferredIndex.Augment<
+      TResult2 = DeferredKeySelection.Augment<
         UnwrapArrayMember<TResult>,
         TRecord,
         TKey
@@ -830,7 +818,7 @@ export declare namespace Knex {
     update<
       K1 extends StrKey<ResolveTableType<TRecord, 'update'>>,
       K2 extends StrKey<ResolveTableType<TRecord>>,
-      TResult2 = DeferredIndex.Augment<
+      TResult2 = DeferredKeySelection.Augment<
         UnwrapArrayMember<TResult>,
         ResolveTableType<TRecord>,
         K2
@@ -872,7 +860,7 @@ export declare namespace Knex {
     ): QueryBuilder<TRecord, DeferredKeySelection<TRecord, never>[]>;
     update<
       TKey extends StrKey<ResolveTableType<TRecord>>,
-      TResult2 = DeferredIndex.Augment<
+      TResult2 = DeferredKeySelection.Augment<
         UnwrapArrayMember<TResult>,
         ResolveTableType<TRecord>,
         TKey
@@ -927,7 +915,7 @@ export declare namespace Knex {
     returning(column: '*', options?: DMLOptions): QueryBuilder<TRecord, DeferredKeySelection<TRecord, never>[]>;
     returning<
       TKey extends StrKey<ResolveTableType<TRecord>>,
-      TResult2 = DeferredIndex.Augment<
+      TResult2 = DeferredKeySelection.Augment<
         UnwrapArrayMember<TResult>,
         ResolveTableType<TRecord>,
         TKey
@@ -952,24 +940,15 @@ export declare namespace Knex {
     ): QueryBuilder<TRecord, TResult2>;
 
     onConflict<
-      TKey extends StrKey<ResolveTableType<TRecord>>,
-      TResult2 = DeferredIndex.Augment<
-        UnwrapArrayMember<TResult>,
-        TRecord,
-        TKey
-      >[]
+      TKey extends StrKey<ResolveTableType<TRecord>>
     >(
       column: TKey
-    ): OnConflictQueryBuilder<TRecord, TResult2>;
+    ): OnConflictQueryBuilder<TRecord, TResult>;
     onConflict<
-      TKey extends StrKey<ResolveTableType<TRecord>>,
-      TResult2 = DeferredKeySelection.SetSingle<
-        DeferredKeySelection.Augment<UnwrapArrayMember<TResult>, TRecord, TKey>,
-        false
-      >[]
+      TKey extends StrKey<ResolveTableType<TRecord>>
     >(
       columns: readonly TKey[]
-    ): OnConflictQueryBuilder<TRecord, TResult2>;
+    ): OnConflictQueryBuilder<TRecord, TResult>;
 
     onConflict(
       columns: string
@@ -991,7 +970,7 @@ export declare namespace Knex {
     ): QueryBuilder<TRecord, DeferredKeySelection<TRecord, never>[]>;
     del<
       TKey extends StrKey<TRecord>,
-      TResult2 = DeferredIndex.Augment<
+      TResult2 = DeferredKeySelection.Augment<
         UnwrapArrayMember<TResult>,
         TRecord,
         TKey
@@ -1023,7 +1002,7 @@ export declare namespace Knex {
     ): QueryBuilder<TRecord, DeferredKeySelection<TRecord, never>[]>;
     delete<
       TKey extends StrKey<ResolveTableType<TRecord>>,
-      TResult2 = DeferredIndex.Augment<
+      TResult2 = DeferredKeySelection.Augment<
         UnwrapArrayMember<TResult>,
         ResolveTableType<TRecord>,
         TKey
@@ -1052,7 +1031,7 @@ export declare namespace Knex {
     truncate(): QueryBuilder<TRecord, void>;
   }
 
-  interface As<TRecord, TResult> {
+  interface As<TRecord extends {}, TResult> {
     (columnName: keyof TRecord): QueryBuilder<TRecord, TResult>;
     (columnName: string): QueryBuilder<TRecord, TResult>;
   }
@@ -1068,7 +1047,7 @@ export declare namespace Knex {
         Dict,
         {}
       >
-    >;
+    > & {}; // filters out `null` and `undefined`
 
   interface AliasQueryBuilder<TRecord extends {} = any, TResult = unknown[]> {
     <
@@ -1125,11 +1104,11 @@ export declare namespace Knex {
     ColumnNameQueryBuilder<TRecord, TResult> {
     (): QueryBuilder<TRecord, TResult>;
 
-    <TResult2 = ArrayIfAlready<TResult, any>, TInnerRecord = any, TInnerResult = any>(
+    <TResult2 = ArrayIfAlready<TResult, any>, TInnerRecord extends {} = any, TInnerResult = any>(
       ...subQueryBuilders: readonly QueryBuilder<TInnerRecord, TInnerResult>[]
     ): QueryBuilder<TRecord, TResult2>;
 
-    <TResult2 = ArrayIfAlready<TResult, any>, TInnerRecord = any, TInnerResult = any>(
+    <TResult2 = ArrayIfAlready<TResult, any>, TInnerRecord extends {} = any, TInnerResult = any>(
       subQueryBuilders: readonly QueryBuilder<TInnerRecord, TInnerResult>[]
     ): QueryBuilder<TRecord, TResult2>;
   }
@@ -1141,53 +1120,53 @@ export declare namespace Knex {
     singleValue?: boolean;
   }
 
-  interface JsonExtract<TRecord extends {} = any, TResult extends {} = any> {
+  interface JsonExtract<TRecord extends {} = any, TResult = any> {
     (column: string | Raw | QueryBuilder, path: string, alias?: string, singleValue?: boolean): QueryBuilder<TRecord, TResult>;
     (column: JsonExtraction[] | any[][], singleValue?: boolean): QueryBuilder<TRecord, TResult>;
   }
 
-  interface JsonSet<TRecord extends {} = any, TResult extends {} = any> {
+  interface JsonSet<TRecord extends {} = any, TResult = any> {
     (column: string | Raw | QueryBuilder, path: string, value: any, alias?: string): QueryBuilder<TRecord, TResult>;
   }
 
-  interface JsonInsert<TRecord extends {} = any, TResult extends {} = any> {
+  interface JsonInsert<TRecord extends {} = any, TResult = any> {
     (column: string | Raw | QueryBuilder, path: string, value: any, alias?: string): QueryBuilder<TRecord, TResult>;
   }
 
-  interface JsonRemove<TRecord extends {} = any, TResult extends {} = any> {
+  interface JsonRemove<TRecord extends {} = any, TResult = any> {
     (column: string | Raw | QueryBuilder, path: string, alias?: string): QueryBuilder<TRecord, TResult>;
   }
 
-  interface HintComment<TRecord extends {} = any, TResult extends {} = any> {
+  interface HintComment<TRecord extends {} = any, TResult = any> {
     (hint: string): QueryBuilder<TRecord, TResult>;
     (hints: readonly string[]): QueryBuilder<TRecord, TResult>;
   }
 
-  interface Table<TRecord extends {} = any, TResult extends {} = any> {
+  interface Table<TRecord extends {} = any, TResult = any> {
     <
       TTable extends TableNames,
-      TRecord2 = TableType<TTable>,
+      TRecord2 extends {} = TableType<TTable>,
       TResult2 = DeferredKeySelection.ReplaceBase<TResult, ResolveTableType<TRecord2>>
       >(
       tableName: TTable,
       options?: TableOptions
     ): QueryBuilder<TRecord2, TResult2>;
     <
-      TRecord2 = unknown,
+      TRecord2 extends {} = {},
       TResult2 = DeferredKeySelection.ReplaceBase<TResult, TRecord2>
       >(
       tableName: TableDescriptor | AliasDict,
       options?: TableOptions
     ): QueryBuilder<TRecord2, TResult2>;
     <
-      TRecord2 = unknown,
+      TRecord2 extends {} = {},
       TResult2 = DeferredKeySelection.ReplaceBase<TResult, TRecord2>
       >(
       callback: Function,
       options?: TableOptions
     ): QueryBuilder<TRecord2, TResult2>;
     <
-      TRecord2 = unknown,
+      TRecord2 extends {} = {},
       TResult2 = DeferredKeySelection.ReplaceBase<TResult, TRecord2>
       >(
       raw: Raw,
@@ -1225,7 +1204,7 @@ export declare namespace Knex {
     ): QueryBuilder<TRecord2, TResult2>;
     <
       TTable extends TableNames,
-      TRecord2 = ResolveTableType<TRecord> &
+      TRecord2 extends {} = ResolveTableType<TRecord> &
       ResolveTableType<TableType<TTable>>,
       TResult2 = DeferredKeySelection.ReplaceBase<TResult, TRecord2>
       >(
@@ -1262,7 +1241,7 @@ export declare namespace Knex {
       TKey1 extends StrKey<ResolveTableType<TableType<TTable1>>> & StrKey<TRecord1>,
       TKey2 extends StrKey<ResolveTableType<TableType<TTable2>>>,
       TRecord1 = ResolveTableType<TRecord>,
-      TRecord2 = TRecord1 & ResolveTableType<TableType<TTable2>>,
+      TRecord2 extends {} = TRecord1 & ResolveTableType<TableType<TTable2>>,
       TResult2 = DeferredKeySelection.ReplaceBase<TResult, TRecord2>
       >(
       tableName: TTable2,
@@ -1275,7 +1254,7 @@ export declare namespace Knex {
       TKey1 extends StrKey<ResolveTableType<TableType<TTable1>>> & StrKey<TRecord1>,
       TKey2 extends StrKey<ResolveTableType<TableType<TTable2>>>,
       TRecord1 = ResolveTableType<TRecord>,
-      TRecord2 = TRecord1 & ResolveTableType<TableType<TTable2>>,
+      TRecord2 extends {} = TRecord1 & ResolveTableType<TableType<TTable2>>,
       TResult2 = DeferredKeySelection.ReplaceBase<TResult, TRecord2>
       >(
       tableName: TTable2,
@@ -1306,7 +1285,7 @@ export declare namespace Knex {
       TKey1 extends StrKey<ResolveTableType<TableType<TTable1>>> & StrKey<TRecord1>,
       TKey2 extends StrKey<ResolveTableType<TableType<TTable2>>>,
       TRecord1 = ResolveTableType<TRecord>,
-      TRecord2 = TRecord1 & ResolveTableType<TableType<TTable2>>,
+      TRecord2 extends {} = TRecord1 & ResolveTableType<TableType<TTable2>>,
       TResult2 = DeferredKeySelection.ReplaceBase<TResult, TRecord2>
       >(
       tableName: TTable2,
@@ -1320,7 +1299,7 @@ export declare namespace Knex {
       TKey1 extends StrKey<ResolveTableType<TableType<TTable1>>> & StrKey<TRecord1>,
       TKey2 extends StrKey<ResolveTableType<TableType<TTable2>>>,
       TRecord1 = ResolveTableType<TRecord>,
-      TRecord2 = TRecord1 & ResolveTableType<TableType<TTable2>>,
+      TRecord2 extends {} = TRecord1 & ResolveTableType<TableType<TTable2>>,
       TResult2 = DeferredKeySelection.ReplaceBase<TResult, TRecord2>
       >(
       tableName: TTable2,
@@ -1397,22 +1376,22 @@ export declare namespace Knex {
     type(type: string): JoinClause;
   }
 
-  interface JoinRaw<TRecord = any, TResult = unknown[]> {
+  interface JoinRaw<TRecord extends {} = any, TResult = unknown[]> {
     (tableName: string, binding?: Value | Value[] | ValueDict): QueryBuilder<
       TRecord,
       TResult
     >;
   }
 
-  interface Using<TRecord = any, TResult = unknown[]> {
+  interface Using<TRecord extends {} = any, TResult = unknown[]> {
     (tables: string[]): QueryBuilder<TRecord, TResult>;
   }
 
-  interface With<TRecord = any, TResult = unknown[]>
+  interface With<TRecord extends {} = any, TResult = unknown[]>
     extends WithRaw<TRecord, TResult>,
     WithWrapped<TRecord, TResult> {}
 
-  interface WithRaw<TRecord = any, TResult = unknown[]> {
+  interface WithRaw<TRecord extends {} = any, TResult = unknown[]> {
     (alias: string, raw: Raw | QueryBuilder): QueryBuilder<TRecord, TResult>;
     (alias: string, sql: string, bindings?: readonly Value[] | Object): QueryBuilder<
       TRecord,
@@ -1425,11 +1404,11 @@ export declare namespace Knex {
     >;
   }
 
-  interface WithSchema<TRecord = any, TResult = unknown[]> {
+  interface WithSchema<TRecord extends {} = any, TResult = unknown[]> {
     (schema: string): QueryBuilder<TRecord, TResult>;
   }
 
-  interface WithWrapped<TRecord = any, TResult = unknown[]> {
+  interface WithWrapped<TRecord extends {} = any, TResult = unknown[]> {
     (alias: string, queryBuilder: QueryBuilder): QueryBuilder<TRecord, TResult>;
     (
       alias: string,
@@ -1443,7 +1422,7 @@ export declare namespace Knex {
     ): QueryBuilder<TRecord, TResult>;
   }
 
-  interface Where<TRecord = any, TResult = unknown>
+  interface Where<TRecord extends {} = any, TResult = unknown>
     extends WhereRaw<TRecord, TResult>,
     WhereWrapped<TRecord, TResult>,
     WhereNull<TRecord, TResult> {
@@ -1473,13 +1452,13 @@ export declare namespace Knex {
       TResult
     >;
 
-    <T extends keyof ResolveTableType<TRecord>, TRecordInner, TResultInner>(
+    <T extends keyof ResolveTableType<TRecord>, TRecordInner extends {}, TResultInner>(
       columnName: T,
       operator: ComparisonOperator,
       value: QueryBuilder<TRecordInner, TResultInner>
     ): QueryBuilder<TRecord, TResult>;
 
-    <TRecordInner, TResultInner>(
+    <TRecordInner extends {}, TResultInner>(
       columnName: string,
       operator: string,
       value: QueryBuilder<TRecordInner, TResultInner>
@@ -1490,28 +1469,28 @@ export declare namespace Knex {
       TResult
     >;
 
-    <TRecordInner, TResultInner>(
+    <TRecordInner extends {}, TResultInner>(
       left: Raw,
       operator: string,
       right: QueryBuilder<TRecordInner, TResultInner>
     ): QueryBuilder<TRecord, TResult>;
   }
 
-  interface WhereRaw<TRecord = any, TResult = unknown[]>
+  interface WhereRaw<TRecord extends {} = any, TResult = unknown[]>
     extends RawQueryBuilder<TRecord, TResult> {
     (condition: boolean): QueryBuilder<TRecord, TResult>;
   }
 
-  interface WhereWrapped<TRecord = any, TResult = unknown[]> {
+  interface WhereWrapped<TRecord extends {} = any, TResult = unknown[]> {
     (callback: QueryCallback<TRecord, TResult>): QueryBuilder<TRecord, TResult>;
   }
 
-  interface WhereNull<TRecord = any, TResult = unknown[]> {
+  interface WhereNull<TRecord extends {} = any, TResult = unknown[]> {
     (columnName: keyof TRecord): QueryBuilder<TRecord, TResult>;
     (columnName: string): QueryBuilder<TRecord, TResult>;
   }
 
-  interface WhereBetween<TRecord = any, TResult = unknown[]> {
+  interface WhereBetween<TRecord extends {} = any, TResult = unknown[]> {
     <K extends keyof TRecord>(
       columnName: K,
       range: readonly [DbColumn<TRecord[K]>, DbColumn<TRecord[K]>]
@@ -1519,22 +1498,22 @@ export declare namespace Knex {
     (columnName: string, range: readonly [Value, Value]): QueryBuilder<TRecord, TResult>;
   }
 
-  interface WhereExists<TRecord = any, TResult = unknown[]> {
+  interface WhereExists<TRecord extends {} = any, TResult = unknown[]> {
     (callback: QueryCallback<TRecord, TResult>): QueryBuilder<TRecord, TResult>;
-    <TRecordInner, TResultInner>(
+    <TRecordInner extends {}, TResultInner>(
       query: QueryBuilder<TRecordInner, TResultInner>
     ): QueryBuilder<TRecord, TResult>;
   }
 
-  interface WhereJsonObject<TRecord = any, TResult = unknown[]> {
+  interface WhereJsonObject<TRecord extends {} = any, TResult = unknown[]> {
     (columnName: keyof TRecord, value: any): QueryBuilder<TRecord, TResult>;
   }
 
-  interface WhereJsonPath<TRecord = any, TResult = unknown[]> {
+  interface WhereJsonPath<TRecord extends {} = any, TResult = unknown[]> {
     (columnName: keyof TRecord, jsonPath: string, operator: string, value: any): QueryBuilder<TRecord, TResult>;
   }
 
-  interface WhereIn<TRecord = any, TResult = unknown[]> {
+  interface WhereIn<TRecord extends {} = any, TResult = unknown[]> {
     <K extends keyof ResolveTableType<TRecord>>(
       columnName: K,
       values: readonly DbColumn<ResolveTableType<TRecord>[K]>[] | QueryCallback
@@ -1551,19 +1530,19 @@ export declare namespace Knex {
       TRecord,
       TResult
     >;
-    <K extends keyof TRecord, TRecordInner, TResultInner>(
+    <K extends keyof TRecord, TRecordInner extends {}, TResultInner>(
       columnName: K,
       values: QueryBuilder<TRecordInner, TRecord[K]>
     ): QueryBuilder<TRecord, TResult>;
-    <TRecordInner, TResultInner>(
+    <TRecordInner extends {}, TResultInner>(
       columnName: string,
       values: Value[] | QueryBuilder<TRecordInner, TResultInner>
     ): QueryBuilder<TRecord, TResult>;
-    <K extends keyof TRecord, TRecordInner, TResultInner>(
+    <K extends keyof TRecord, TRecordInner extends {}, TResultInner>(
       columnNames: readonly K[],
       values: QueryBuilder<TRecordInner, TRecord[K]>
     ): QueryBuilder<TRecord, TResult>;
-    <TRecordInner, TResultInner>(
+    <TRecordInner extends {}, TResultInner>(
       columnNames: readonly string[],
       values: QueryBuilder<TRecordInner, TResultInner>
     ): QueryBuilder<TRecord, TResult>;
@@ -1573,7 +1552,7 @@ export declare namespace Knex {
   // by extracting out a common base interface will not work because order of overloads
   // is significant.
 
-  interface AsymmetricAggregation<TRecord = any, TResult = unknown[], TValue = any> {
+  interface AsymmetricAggregation<TRecord extends {} = any, TResult = unknown[], TValue = any> {
     <
       TOptions extends { "as": string },
       TResult2 = AggregationQueryResult<TResult, {[k in TOptions["as"]]: TValue}>
@@ -1593,7 +1572,7 @@ export declare namespace Knex {
     ): QueryBuilder<TRecord, TResult2>;
   }
 
-  interface TypePreservingAggregation<TRecord = any, TResult = unknown[], TValue = any> {
+  interface TypePreservingAggregation<TRecord extends {} = any, TResult = unknown[], TValue = any> {
     <
       TKey extends keyof ResolveTableType<TRecord>,
       TOptions extends { "as": string },
@@ -1625,7 +1604,7 @@ export declare namespace Knex {
     ): QueryBuilder<TRecord, TResult2>;
   }
 
-  interface AnalyticFunction<TRecord = any, TResult = unknown[]> {
+  interface AnalyticFunction<TRecord extends {} = any, TResult = unknown[]> {
     <
       TAlias extends string,
       TResult2 = AggregationQueryResult<TResult, {[x in TAlias]: number}>
@@ -1643,11 +1622,11 @@ export declare namespace Knex {
       >;
   }
 
-  interface GroupBy<TRecord = any, TResult = unknown[]>
+  interface GroupBy<TRecord extends {} = any, TResult = unknown[]>
     extends RawQueryBuilder<TRecord, TResult>,
     ColumnNameQueryBuilder<TRecord, TResult> {}
 
-  interface OrderBy<TRecord = any, TResult = unknown[]> {
+  interface OrderBy<TRecord extends {} = any, TResult = unknown[]> {
     (columnName: keyof TRecord | QueryBuilder, order?: 'asc' | 'desc', nulls?: 'first' | 'last'): QueryBuilder<
       TRecord,
       TResult
@@ -1671,10 +1650,10 @@ export declare namespace Knex {
     ): QueryBuilder<TRecord, TResult>;
   }
 
-  interface PartitionBy<TRecord = any, TResult = unknown[]>
+  interface PartitionBy<TRecord extends {} = any, TResult = unknown[]>
     extends OrderBy<TRecord, TResult> {}
 
-  interface Intersect<TRecord = any, TResult = unknown[]> {
+  interface Intersect<TRecord extends {} = any, TResult = unknown[]> {
     (
       callback: MaybeArray<QueryCallback | QueryBuilder<TRecord> | Raw>,
       wrap?: boolean
@@ -1684,10 +1663,10 @@ export declare namespace Knex {
     ): QueryBuilder<TRecord, TResult>;
   }
 
-  interface Union<TRecord = any, TResult = unknown[]>
+  interface Union<TRecord extends {} = any, TResult = unknown[]>
     extends Intersect<TRecord, TResult> {}
 
-  interface Having<TRecord = any, TResult = unknown[]>
+  interface Having<TRecord extends {} = any, TResult = unknown[]>
     extends WhereWrapped<TRecord, TResult> {
     <K extends keyof TRecord>(
       column: K,
@@ -1707,7 +1686,7 @@ export declare namespace Knex {
     >;
   }
 
-  interface HavingRange<TRecord = any, TResult = unknown[]> {
+  interface HavingRange<TRecord extends {} = any, TResult = unknown[]> {
     <K extends keyof TRecord>(
       columnName: K,
       values: readonly DbColumn<TRecord[K]>[]
@@ -1717,7 +1696,7 @@ export declare namespace Knex {
 
   // commons
 
-  interface ColumnNameQueryBuilder<TRecord = any, TResult = unknown[]> {
+  interface ColumnNameQueryBuilder<TRecord extends {} = any, TResult = unknown[]> {
     // When all columns are known to be keys of original record,
     // we can extend our selection by these columns
     (columnName: '*'): QueryBuilder<
@@ -1772,7 +1751,7 @@ export declare namespace Knex {
 
   type RawBinding = Value | QueryBuilder;
 
-  interface RawQueryBuilder<TRecord = any, TResult = unknown[]> {
+  interface RawQueryBuilder<TRecord extends {} = any, TResult = unknown[]> {
     <TResult2 = TResult>(
       sql: string,
       bindings?: readonly RawBinding[] | ValueDict | RawBinding
@@ -1833,7 +1812,7 @@ export declare namespace Knex {
     returning(column: '*'): BatchInsertBuilder<TRecord, DeferredKeySelection<TRecord, never>[]>;
     returning<
       TKey extends StrKey<ResolveTableType<TRecord>>,
-      TResult2 = DeferredIndex.Augment<
+      TResult2 = DeferredKeySelection.Augment<
         UnwrapArrayMember<TResult>,
         ResolveTableType<TRecord>,
         TKey
@@ -1860,12 +1839,12 @@ export declare namespace Knex {
   // QueryBuilder
   //
 
-  type QueryCallback<TRecord = any, TResult = unknown[]> = (
+  type QueryCallback<TRecord extends {} = any, TResult = unknown[]> = (
     this: QueryBuilder<TRecord, TResult>,
     builder: QueryBuilder<TRecord, TResult>
   ) => void;
 
-  type QueryCallbackWithArgs<TRecord = any, TResult = unknown[]> = (
+  type QueryCallbackWithArgs<TRecord extends {} = any, TResult = unknown[]> = (
     this: QueryBuilder<TRecord, TResult>,
     builder: QueryBuilder<TRecord, TResult>,
     ...args: any[]
@@ -2031,7 +2010,7 @@ export declare namespace Knex {
     createTableLike(
       tableName: string,
       tableNameLike: string,
-      callback: (tableBuilder: CreateTableBuilder) => any
+      callback?: (tableBuilder: CreateTableBuilder) => any
     ): SchemaBuilder;
     alterTable(
       tableName: string,
@@ -2210,7 +2189,7 @@ export declare namespace Knex {
     notNullable(): ColumnBuilder;
     nullable(): ColumnBuilder;
     comment(value: string): ColumnBuilder;
-    alter(options: Readonly<{alterNullable?: boolean, alterType?: boolean}>): ColumnBuilder;
+    alter(options?: Readonly<{alterNullable?: boolean, alterType?: boolean}>): ColumnBuilder;
     queryContext(context: any): ColumnBuilder;
     after(columnName: string): ColumnBuilder;
     first(): ColumnBuilder;
@@ -2662,7 +2641,7 @@ export declare namespace Knex {
   interface MigrationSource<TMigrationSpec> {
     getMigrations(loadExtensions: readonly string[]): Promise<TMigrationSpec[]>;
     getMigrationName(migration: TMigrationSpec): string;
-    getMigration(migration: TMigrationSpec): Migration;
+    getMigration(migration: TMigrationSpec): Promise<Migration>;
   }
 
   interface MigratorConfig {