pqb 0.29.0 → 0.30.0

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import * as orchid_core from 'orchid-core';
-import { QueryResultRow, AdapterConfigBase, AdapterBase, QueryInput, Sql, RecordUnknown, RecordKeyTrue, EmptyObject, QueryBaseCommon, QueryColumns, QueryMetaBase, QueryReturnType, QueryThen, Expression, QueryColumn, MaybeArray, SelectableBase, TemplateLiteralArgs, PickOutputTypeAndOperators, PickQueryResult, OperatorToSQL, ColumnsShapeBase, ColumnsParsers, RecordString, PickQueryTable, getValueKey, PickQueryShape, PickQueryTableMetaResult, EmptyTuple, PickQueryMeta, PickQueryMetaResultReturnType, QueryColumnToNullable, PickQueryMetaShape, PickQueryTableMetaResultShape, QueryColumnBooleanOrNull, SQLQueryArgs, ColumnSchemaConfig, DateColumnData, Code, TimeInterval, ColumnTypeSchemaArg, ColumnDataBase, ArrayMethodsData, RawSQLBase, RawSQLValues, ExpressionTypeMethod, DynamicSQLArg, StaticSQLArgs, ForeignKeyTable, ColumnNameOfTable, BaseNumberData, PickColumnBaseData, ColumnWithDefault, StringTypeData, PrimaryKeyColumn, ParseColumn, EncodeColumn, PickQueryMetaResult, QueryColumnsInit, DefaultSelectColumns, CoreQueryScopes, DbBase, QueryCatch, TransactionState, ColumnTypeBase, PickQueryMetaResultWindows, CoreBaseOperators, PickQueryUniqueProperties, IsQuery, PickQueryMetaShapeResultReturnType, MergeObjects, PickQueryResultUniqueColumns, QueryInternalBase, PickQueryReturnType, PickType, ColumnShapeOutput, PickOutputType, Spread, UniqueColumn, TimestampHelpers, Codes, ColumnDataCheckBase, PickQueryTableMetaShape } from 'orchid-core';
+import { QueryResultRow, AdapterConfigBase, AdapterBase, QueryInput, Sql, RecordUnknown, RecordKeyTrue, EmptyObject, QueryBaseCommon, QueryColumns, QueryMetaBase, QueryReturnType, QueryThen, Expression, QueryColumn, MaybeArray, SelectableBase, TemplateLiteralArgs, PickOutputTypeAndOperators, PickQueryResult, OperatorToSQL, ColumnsShapeBase, ColumnsParsers, RecordString, PickQueryTable, FnUnknownToUnknown, getValueKey, PickQueryShape, PickQueryTableMetaResult, EmptyTuple, PickQueryMeta, PickQueryMetaResultReturnType, QueryColumnToNullable, PickQueryMetaShape, PickQueryTableMetaResultShape, QueryColumnBooleanOrNull, SQLQueryArgs, ColumnSchemaConfig, DateColumnData, Code, TimeInterval, ColumnTypeSchemaArg, ColumnDataBase, ArrayMethodsData, RawSQLBase, RawSQLValues, ExpressionTypeMethod, DynamicSQLArg, StaticSQLArgs, ForeignKeyTable, ColumnNameOfTable, BaseNumberData, PickColumnBaseData, ColumnWithDefault, StringTypeData, PrimaryKeyColumn, ParseColumn, EncodeColumn, PickQueryMetaResult, QueryColumnsInit, DefaultSelectColumns, CoreQueryScopes, DbBase, QueryCatch, TransactionState, ColumnTypeBase, PickQueryMetaResultWindows, CoreBaseOperators, PickQueryUniqueProperties, IsQuery, PickQueryMetaShapeResultReturnType, MergeObjects, PickQueryResultUniqueColumns, QueryInternalBase, PickQueryReturnType, PickType, ColumnShapeOutput, PickOutputType, PickQueryMetaReturnType, UniqueColumn, TimestampHelpers, Codes, ColumnDataCheckBase, PickQueryTableMetaShape } from 'orchid-core';
 import { PoolConfig, Pool, PoolClient } from 'pg';
 import { inspect } from 'node:util';
 import { AsyncLocalStorage } from 'node:async_hooks';
@@ -436,7 +436,7 @@ type CommonQueryData = {
     logger: QueryLogger;
     autoPreparedStatements?: boolean;
     [toSQLCacheKey]?: Sql;
-    transform?: ((input: unknown) => unknown)[];
+    transform?: FnUnknownToUnknown[];
     language?: string;
     isSubQuery?: true;
     relChain?: (Query | RelationQuery)[];
@@ -3696,33 +3696,53 @@ declare class Clear {
 interface CreateSelf extends QueryBase {
     inputType: RecordUnknown;
 }
-type CreateData<T extends CreateSelf> = RelationsBase extends T['relations'] ? CreateDataWithDefaults<T, keyof T['meta']['defaults']> : CreateRelationsData<T>;
+type CreateData<T extends CreateSelf, BelongsToData = CreateBelongsToData<T>> = RelationsBase extends T['relations'] ? CreateDataWithDefaults<T, keyof T['meta']['defaults']> : CreateRelationsData<T, BelongsToData>;
 type CreateDataWithDefaults<T extends CreateSelf, Defaults extends PropertyKey> = {
-    [K in keyof T['inputType'] as K extends Defaults ? never : K]: CreateColumn<T['inputType'], K>;
+    [K in keyof T['inputType'] as K extends Defaults ? never : K]: K extends Defaults ? never : CreateColumn<T['inputType'], K>;
 } & {
     [K in Defaults]?: K extends keyof T['inputType'] ? CreateColumn<T['inputType'], K> : never;
 };
-type CreateDataWithDefaultsForRelations<T extends CreateSelf, Defaults extends PropertyKey, OmitFKeys extends PropertyKey> = {
-    [K in keyof T['inputType'] as K extends Defaults | OmitFKeys ? never : K]: CreateColumn<T['inputType'], K>;
+type CreateDataWithDefaultsForRelations<T extends CreateSelf, Defaults extends keyof T['inputType'], OmitFKeys extends PropertyKey> = {
+    [K in keyof T['inputType'] as K extends Defaults | OmitFKeys ? never : K]: K extends Defaults | OmitFKeys ? never : CreateColumn<T['inputType'], K>;
 } & {
-    [K in Defaults & keyof T['inputType'] as K extends OmitFKeys ? never : K]?: CreateColumn<T['inputType'], K>;
+    [K in Defaults as K extends OmitFKeys ? never : K]?: CreateColumn<T['inputType'], K>;
 };
 type CreateColumn<InputType, Key extends keyof InputType> = Expression | InputType[Key] | {
     __isQuery: true;
     then: QueryThen<InputType[Key]>;
 };
-type CreateRelationsData<T extends CreateSelf> = CreateDataWithDefaultsForRelations<T, keyof T['meta']['defaults'], T['relations'][keyof T['relations']]['relationConfig']['omitForeignKeyInCreate']> & CreateRelationsDataOmittingFKeys<T, T['relations'][keyof T['relations']]['relationConfig']['dataForCreate']> & T['relations'][keyof T['relations']]['relationConfig']['optionalDataForCreate'];
+type CreateRelationsData<T extends CreateSelf, BelongsToData> = CreateDataWithDefaultsForRelations<T, keyof T['meta']['defaults'], T['relations'][keyof T['relations']]['relationConfig']['omitForeignKeyInCreate']> & BelongsToData & T['relations'][keyof T['relations']]['relationConfig']['optionalDataForCreate'];
+type CreateBelongsToData<T extends CreateSelf> = CreateRelationsDataOmittingFKeys<T, T['relations'][keyof T['relations']]['relationConfig']['dataForCreate']>;
 type CreateRelationsDataOmittingFKeys<T extends CreateSelf, Union> = (Union extends RelationConfigDataForCreate ? (u: keyof Union['columns'] extends keyof T['meta']['defaults'] ? Omit<Union['columns'], keyof T['meta']['defaults']> & {
     [P in keyof T['meta']['defaults'] & keyof Union['columns']]?: Union['columns'][P];
 } & Partial<Union['nested']> : Union['columns'] | Union['nested']) => void : never) extends (u: infer Obj extends RecordUnknown) => void ? Obj : never;
-type CreateResult<T extends CreateSelf> = T extends {
+type CreateResult<T extends CreateSelf, BT> = T extends {
+    isCount: true;
+} ? SetQueryKind<T, 'create'> : QueryReturnsAll<T['returnType']> extends true ? SetQueryReturnsOneKindResult<T, 'create', NarrowCreateResult<T, BT>> : T['returnType'] extends 'pluck' ? SetQueryReturnsColumnKindResult<T, 'create', NarrowCreateResult<T, BT>> : SetQueryKindResult<T, 'create', NarrowCreateResult<T, BT>>;
+type CreateRawOrFromResult<T extends CreateSelf> = T extends {
     isCount: true;
 } ? SetQueryKind<T, 'create'> : QueryReturnsAll<T['returnType']> extends true ? SetQueryReturnsOneKind<T, 'create'> : T['returnType'] extends 'pluck' ? SetQueryReturnsColumnKind<T, 'create'> : SetQueryKind<T, 'create'>;
-type InsertResult<T extends CreateSelf> = T['meta']['hasSelect'] extends true ? QueryReturnsAll<T['returnType']> extends true ? SetQueryReturnsOneKind<T, 'create'> : T['returnType'] extends 'pluck' ? SetQueryReturnsColumnKind<T, 'create'> : SetQueryKind<T, 'create'> : SetQueryReturnsRowCount<T, 'create'>;
-type CreateManyResult<T extends CreateSelf> = T extends {
+type InsertResult<T extends CreateSelf, BT> = T['meta']['hasSelect'] extends true ? QueryReturnsAll<T['returnType']> extends true ? SetQueryReturnsOneKindResult<T, 'create', NarrowCreateResult<T, BT>> : T['returnType'] extends 'pluck' ? SetQueryReturnsColumnKindResult<T, 'create', NarrowCreateResult<T, BT>> : SetQueryKindResult<T, 'create', NarrowCreateResult<T, BT>> : SetQueryReturnsRowCount<T, 'create'>;
+type InsertRawOrFromResult<T extends CreateSelf> = T['meta']['hasSelect'] extends true ? QueryReturnsAll<T['returnType']> extends true ? SetQueryReturnsOneKind<T, 'create'> : T['returnType'] extends 'pluck' ? SetQueryReturnsColumnKind<T, 'create'> : SetQueryKind<T, 'create'> : SetQueryReturnsRowCount<T, 'create'>;
+type CreateManyResult<T extends CreateSelf, BT> = T extends {
+    isCount: true;
+} ? SetQueryKindResult<T, 'create', NarrowCreateResult<T, BT>> : T['returnType'] extends 'one' | 'oneOrThrow' ? SetQueryReturnsAllKindResult<T, 'create', NarrowCreateResult<T, BT>> : T['returnType'] extends 'value' | 'valueOrThrow' ? SetQueryReturnsPluckColumnKindResult<T, 'create', NarrowCreateResult<T, BT>> : SetQueryKindResult<T, 'create', NarrowCreateResult<T, BT>>;
+type CreateManyRawOrFromResult<T extends CreateSelf> = T extends {
     isCount: true;
 } ? SetQueryKind<T, 'create'> : T['returnType'] extends 'one' | 'oneOrThrow' ? SetQueryReturnsAllKind<T, 'create'> : T['returnType'] extends 'value' | 'valueOrThrow' ? SetQueryReturnsPluckColumnKind<T, 'create'> : SetQueryKind<T, 'create'>;
-type InsertManyResult<T extends CreateSelf> = T['meta']['hasSelect'] extends true ? T['returnType'] extends 'one' | 'oneOrThrow' ? SetQueryReturnsAllKind<T, 'create'> : T['returnType'] extends 'value' | 'valueOrThrow' ? SetQueryReturnsPluckColumnKind<T, 'create'> : SetQueryKind<T, 'create'> : SetQueryReturnsRowCount<T, 'create'>;
+type InsertManyResult<T extends CreateSelf, BT> = T['meta']['hasSelect'] extends true ? T['returnType'] extends 'one' | 'oneOrThrow' ? SetQueryReturnsAllKindResult<T, 'create', NarrowCreateResult<T, BT>> : T['returnType'] extends 'value' | 'valueOrThrow' ? SetQueryReturnsPluckColumnKindResult<T, 'create', NarrowCreateResult<T, BT>> : SetQueryKindResult<T, 'create', NarrowCreateResult<T, BT>> : SetQueryReturnsRowCount<T, 'create'>;
+type InsertManyRawOrFromResult<T extends CreateSelf> = T['meta']['hasSelect'] extends true ? T['returnType'] extends 'one' | 'oneOrThrow' ? SetQueryReturnsAllKind<T, 'create'> : T['returnType'] extends 'value' | 'valueOrThrow' ? SetQueryReturnsPluckColumnKind<T, 'create'> : SetQueryKind<T, 'create'> : SetQueryReturnsRowCount<T, 'create'>;
+/**
+ * When creating a record with a *belongs to* nested record,
+ * un-nullify foreign key columns of the result.
+ *
+ * The same should work as well with any non-null columns passed to `create`, but it's to be implemented later.
+ */
+type NarrowCreateResult<T extends CreateSelf, BT> = [
+    T['relations'][keyof T['relations'] & keyof BT]['relationConfig']['omitForeignKeyInCreate']
+] extends [never] ? T['result'] : {
+    [K in keyof T['result']]: K extends T['relations'][keyof T['relations'] & keyof BT]['relationConfig']['omitForeignKeyInCreate'] ? QueryColumn<Exclude<T['result'][K]['type'], null>, T['result'][K]['operators']> : T['result'][K];
+};
 type IgnoreResult<T extends CreateSelf> = T['returnType'] extends 'oneOrThrow' ? SetQueryReturnsOneOptional<T> : T['returnType'] extends 'valueOrThrow' ? SetQueryReturnsColumnOptional<T, T['result']['value']> : T;
 interface CreateRawData<T extends CreateSelf> {
     columns: (keyof T['shape'])[];
@@ -3757,23 +3777,23 @@ interface CreateCtx {
     returnTypeAll?: true;
     resultAll: RecordUnknown[];
 }
-declare const _queryCreate: <T extends CreateSelf>(q: T, data: CreateData<T>) => CreateResult<T>;
-declare const _queryInsert: <T extends CreateSelf>(q: T, data: CreateData<T>) => InsertResult<T>;
-declare const _queryCreateMany: <T extends CreateSelf>(q: T, data: CreateData<T>[]) => CreateManyResult<T>;
-declare const _queryInsertMany: <T extends CreateSelf>(q: T, data: CreateData<T>[]) => InsertManyResult<T>;
-declare const _queryCreateRaw: <T extends CreateSelf>(q: T, args: CreateRawArgs<T, CreateRawData<T>>) => CreateResult<T>;
-declare const _queryInsertRaw: <T extends CreateSelf>(q: T, args: CreateRawArgs<T, CreateRawData<T>>) => InsertResult<T>;
-declare const _queryCreateManyRaw: <T extends CreateSelf>(q: T, args: CreateRawArgs<T, CreateManyRawData<T>>) => CreateManyResult<T>;
-declare const _queryInsertManyRaw: <T extends CreateSelf>(q: T, args: CreateRawArgs<T, CreateManyRawData<T>>) => InsertManyResult<T>;
+declare const _queryCreate: <T extends CreateSelf, BT extends CreateRelationsDataOmittingFKeys<T, T["relations"][keyof T["relations"]]["relationConfig"]["dataForCreate"]>>(q: T, data: CreateData<T, BT>) => CreateResult<T, BT>;
+declare const _queryInsert: <T extends CreateSelf, BT extends CreateRelationsDataOmittingFKeys<T, T["relations"][keyof T["relations"]]["relationConfig"]["dataForCreate"]>>(q: T, data: CreateData<T, BT>) => InsertResult<T, BT>;
+declare const _queryCreateMany: <T extends CreateSelf, BT extends CreateRelationsDataOmittingFKeys<T, T["relations"][keyof T["relations"]]["relationConfig"]["dataForCreate"]>>(q: T, data: CreateData<T, BT>[]) => CreateManyResult<T, BT>;
+declare const _queryInsertMany: <T extends CreateSelf, BT extends CreateRelationsDataOmittingFKeys<T, T["relations"][keyof T["relations"]]["relationConfig"]["dataForCreate"]>>(q: T, data: CreateData<T, BT>[]) => InsertManyResult<T, BT>;
+declare const _queryCreateRaw: <T extends CreateSelf>(q: T, args: CreateRawArgs<T, CreateRawData<T>>) => CreateRawOrFromResult<T>;
+declare const _queryInsertRaw: <T extends CreateSelf>(q: T, args: CreateRawArgs<T, CreateRawData<T>>) => InsertRawOrFromResult<T>;
+declare const _queryCreateManyRaw: <T extends CreateSelf>(q: T, args: CreateRawArgs<T, CreateManyRawData<T>>) => CreateManyRawOrFromResult<T>;
+declare const _queryInsertManyRaw: <T extends CreateSelf>(q: T, args: CreateRawArgs<T, CreateManyRawData<T>>) => InsertManyRawOrFromResult<T>;
 declare const _queryCreateFrom: <T extends CreateSelf, Q extends Query & {
     returnType: 'one' | 'oneOrThrow';
-}>(q: T, query: Q, data?: Omit<CreateData<T>, keyof Q['result']>) => CreateResult<T>;
+}>(q: T, query: Q, data?: Omit<CreateData<T, CreateBelongsToData<T>>, keyof Q['result']>) => CreateRawOrFromResult<T>;
 declare const _queryInsertFrom: <T extends CreateSelf, Q extends Query & {
     returnType: 'one' | 'oneOrThrow';
-}>(q: T, query: Q, data?: Omit<CreateData<T>, keyof Q['result']>) => InsertResult<T>;
-declare const _queryCreateManyFrom: <T extends CreateSelf>(q: T, query: Query) => CreateManyResult<T>;
-declare const _queryInsertManyFrom: <T extends CreateSelf>(q: T, query: Query) => InsertManyResult<T>;
-declare const _queryDefaults: <T extends CreateSelf, Data extends Partial<CreateData<T>>>(q: T, data: Data) => AddQueryDefaults<T, { [K in keyof Data]: true; }>;
+}>(q: T, query: Q, data?: Omit<CreateData<T, CreateBelongsToData<T>>, keyof Q['result']>) => InsertRawOrFromResult<T>;
+declare const _queryCreateManyFrom: <T extends CreateSelf>(q: T, query: Query) => CreateManyRawOrFromResult<T>;
+declare const _queryInsertManyFrom: <T extends CreateSelf>(q: T, query: Query) => InsertManyRawOrFromResult<T>;
+declare const _queryDefaults: <T extends CreateSelf, Data extends Partial<CreateData<T, CreateRelationsDataOmittingFKeys<T, T["relations"][keyof T["relations"]]["relationConfig"]["dataForCreate"]>>>>(q: T, data: Data) => AddQueryDefaults<T, { [K in keyof Data]: true; }>;
 /**
  * Names of all create methods,
  * is used in {@link RelationQuery} to remove these methods if chained relation shouldn't have them,
@@ -3808,13 +3828,13 @@ declare class Create {
      *
      * @param data - data for the record, may have values, raw SQL, queries, relation operations.
      */
-    create<T extends CreateSelf>(this: T, data: CreateData<T>): CreateResult<T>;
+    create<T extends CreateSelf, BT extends CreateBelongsToData<T>>(this: T, data: CreateData<T, BT>): CreateResult<T, BT>;
     /**
      * Works exactly as {@link create}, except that it returns inserted row count by default.
      *
      * @param data - data for the record, may have values, raw SQL, queries, relation operations.
      */
-    insert<T extends CreateSelf>(this: T, data: CreateData<T>): InsertResult<T>;
+    insert<T extends CreateSelf, BT extends CreateBelongsToData<T>>(this: T, data: CreateData<T, BT>): InsertResult<T, BT>;
     /**
      * `createMany` and `insertMany` will create a batch of records.
      *
@@ -3834,13 +3854,13 @@ declare class Create {
      *
      * @param data - array of records data, may have values, raw SQL, queries, relation operations
      */
-    createMany<T extends CreateSelf>(this: T, data: CreateData<T>[]): CreateManyResult<T>;
+    createMany<T extends CreateSelf, BT extends CreateBelongsToData<T>>(this: T, data: CreateData<T, BT>[]): CreateManyResult<T, BT>;
     /**
      * Works exactly as {@link createMany}, except that it returns inserted row count by default.
      *
      * @param data - array of records data, may have values, raw SQL, queries, relation operations
      */
-    insertMany<T extends CreateSelf>(this: T, data: CreateData<T>[]): InsertManyResult<T>;
+    insertMany<T extends CreateSelf, BT extends CreateBelongsToData<T>>(this: T, data: CreateData<T, BT>[]): InsertManyResult<T, BT>;
     /**
      * `createRaw` and `insertRaw` are for creating one record with a raw SQL expression.
      *
@@ -3859,13 +3879,13 @@ declare class Create {
      *
      * @param args - object with columns list and raw SQL for values
      */
-    createRaw<T extends CreateSelf>(this: T, ...args: CreateRawArgs<T, CreateRawData<T>>): CreateResult<T>;
+    createRaw<T extends CreateSelf>(this: T, ...args: CreateRawArgs<T, CreateRawData<T>>): CreateRawOrFromResult<T>;
     /**
      * Works exactly as {@link createRaw}, except that it returns inserted row count by default.
      *
      * @param args - object with columns list and raw SQL for values
      */
-    insertRaw<T extends CreateSelf>(this: T, ...args: CreateRawArgs<T, CreateRawData<T>>): InsertResult<T>;
+    insertRaw<T extends CreateSelf>(this: T, ...args: CreateRawArgs<T, CreateRawData<T>>): InsertRawOrFromResult<T>;
     /**
      * `createManyRaw` and `insertManyRaw` are for creating many record with raw SQL expressions.
      *
@@ -3884,13 +3904,13 @@ declare class Create {
      *
      * @param args - object with columns list and array of raw SQL for values
      */
-    createManyRaw<T extends CreateSelf>(this: T, ...args: CreateRawArgs<T, CreateManyRawData<T>>): CreateManyResult<T>;
+    createManyRaw<T extends CreateSelf>(this: T, ...args: CreateRawArgs<T, CreateManyRawData<T>>): CreateManyRawOrFromResult<T>;
     /**
      * Works exactly as {@link createManyRaw}, except that it returns inserted row count by default.
      *
      * @param args - object with columns list and array of raw SQL for values
      */
-    insertManyRaw<T extends CreateSelf>(this: T, ...args: CreateRawArgs<T, CreateManyRawData<T>>): InsertManyResult<T>;
+    insertManyRaw<T extends CreateSelf>(this: T, ...args: CreateRawArgs<T, CreateManyRawData<T>>): InsertManyRawOrFromResult<T>;
     /**
      * These methods are for creating a single record, for batch creating see {@link createManyFrom}.
      *
@@ -3932,7 +3952,7 @@ declare class Create {
      */
     createFrom<T extends CreateSelf, Q extends Query & {
         returnType: 'one' | 'oneOrThrow';
-    }>(this: T, query: Q, data?: Omit<CreateData<T>, keyof Q['result']>): CreateResult<T>;
+    }>(this: T, query: Q, data?: Omit<CreateData<T, CreateBelongsToData<T>>, keyof Q['result']>): CreateRawOrFromResult<T>;
     /**
      * Works exactly as {@link createFrom}, except that it returns inserted row count by default.
      *
@@ -3941,7 +3961,7 @@ declare class Create {
      */
     insertFrom<T extends CreateSelf, Q extends Query & {
         returnType: 'one' | 'oneOrThrow';
-    }>(this: T, query: Q, data?: Omit<CreateData<T>, keyof Q['result']>): InsertResult<T>;
+    }>(this: T, query: Q, data?: Omit<CreateData<T, CreateBelongsToData<T>>, keyof Q['result']>): InsertRawOrFromResult<T>;
     /**
      * Similar to `createFrom`, but intended to create many records.
      *
@@ -3955,13 +3975,13 @@ declare class Create {
      *
      * @param query - query to create new records from
      */
-    createManyFrom<T extends CreateSelf>(this: T, query: Query): CreateManyResult<T>;
+    createManyFrom<T extends CreateSelf>(this: T, query: Query): CreateManyRawOrFromResult<T>;
     /**
      * Works exactly as {@link createManyFrom}, except that it returns inserted row count by default.
      *
      * @param query - query to create new records from
      */
-    insertManyFrom<T extends CreateSelf>(this: T, query: Query): InsertManyResult<T>;
+    insertManyFrom<T extends CreateSelf>(this: T, query: Query): InsertManyRawOrFromResult<T>;
     /**
      * `defaults` allows setting values that will be used later in `create`.
      *
@@ -3984,7 +4004,7 @@ declare class Create {
      *
      * @param data - default values for `create` and `createMany` which will follow `defaults`
      */
-    defaults<T extends CreateSelf, Data extends Partial<CreateData<T>>>(this: T, data: Data): AddQueryDefaults<T, {
+    defaults<T extends CreateSelf, Data extends Partial<CreateData<T, CreateBelongsToData<T>>>>(this: T, data: Data): AddQueryDefaults<T, {
         [K in keyof Data]: true;
     }>;
     /**
@@ -5691,14 +5711,14 @@ declare class SearchMethods {
     search<T extends PickQueryMeta, As extends string>(this: T, arg: SearchArg<T, As>): WhereSearchResult<T, As>;
 }
 
-type OrCreateArg<T extends Query> = CreateData<T> | (() => CreateData<T>);
-type UpsertArg<T extends Query, Data> = {
+type OrCreateArg<T extends Query, BT> = CreateData<T, BT> | (() => CreateData<T, BT>);
+type UpsertArg<T extends Query, Data, BT> = {
     update: Data;
-    create: CreateData<T> | ((update: Data) => CreateData<T>);
-} | UpsertArgWithData<T, Data>;
-type UpsertArgWithData<T extends Query, Data> = {
+    create: CreateData<T, BT> | ((update: Data) => CreateData<T, BT>);
+} | UpsertArgWithData<T, Data, BT>;
+type UpsertArgWithData<T extends Query, Data, BT> = {
     data: Data;
-    create: UpsertCreate<keyof Data, CreateData<T>> | ((update: Data) => UpsertCreate<keyof Data, CreateData<T>>);
+    create: UpsertCreate<keyof Data, CreateData<T, BT>> | ((update: Data) => UpsertCreate<keyof Data, CreateData<T, BT>>);
 };
 type UpsertCreate<DataKey extends PropertyKey, CD> = {
     [K in keyof CD as K extends DataKey ? never : K]: CD[K];
@@ -5803,7 +5823,7 @@ declare class QueryUpsertOrCreate {
      *
      * @param data - `update` property for the data to update, `create` property for the data to create
      */
-    upsert<T extends UpsertThis, Update extends UpdateData<T>>(this: T, data: UpsertArg<T, Update>): UpsertResult<T>;
+    upsert<T extends UpsertThis, Update extends UpdateData<T>, BT extends CreateBelongsToData<T>>(this: T, data: UpsertArg<T, Update, BT>): UpsertResult<T>;
     /**
      * `orCreate` creates a record only if it was not found by conditions.
      *
@@ -5835,7 +5855,7 @@ declare class QueryUpsertOrCreate {
      *
      * @param data - the same data as for `create`, it may be returned from a callback
      */
-    orCreate<T extends UpsertThis>(this: T, data: OrCreateArg<T>): UpsertResult<T>;
+    orCreate<T extends UpsertThis, BT extends CreateBelongsToData<T>>(this: T, data: OrCreateArg<T, BT>): UpsertResult<T>;
 }
 
 declare abstract class RawSqlMethods<ColumnTypes> {
@@ -6756,6 +6776,11 @@ type SetQueryReturnsAllKind<T extends PickQueryMetaResult, Kind extends string>
         [K in keyof T['meta']]: K extends 'kind' ? Kind : T['meta'][K];
     } : K extends 'returnType' ? 'all' : K extends 'then' ? QueryThen<ColumnShapeOutput<T['result']>[]> : T[K];
 } & QueryMetaHasWhere;
+type SetQueryReturnsAllKindResult<T extends PickQueryMetaResult, Kind extends string, Result extends QueryColumns> = {
+    [K in keyof T]: K extends 'meta' ? {
+        [K in keyof T['meta']]: K extends 'kind' ? Kind : T['meta'][K];
+    } : K extends 'returnType' ? 'all' : K extends 'result' ? Result : K extends 'then' ? QueryThen<ColumnShapeOutput<T['result']>[]> : T[K];
+} & QueryMetaHasWhere;
 type SetQueryReturnsOneOptional<T extends PickQueryResult> = {
     [K in keyof T]: K extends 'returnType' ? 'one' : K extends 'then' ? QueryThen<ColumnShapeOutput<T['result']> | undefined> : T[K];
 };
@@ -6767,6 +6792,11 @@ type SetQueryReturnsOneKind<T extends PickQueryMetaResult, Kind extends string>
         [K in keyof T['meta']]: K extends 'kind' ? Kind : T['meta'][K];
     } : K extends 'returnType' ? 'oneOrThrow' : K extends 'then' ? QueryThen<ColumnShapeOutput<T['result']>> : T[K];
 };
+type SetQueryReturnsOneKindResult<T extends PickQueryMetaResult, Kind extends string, Result extends QueryColumns> = {
+    [K in keyof T]: K extends 'meta' ? {
+        [K in keyof T['meta']]: K extends 'kind' ? Kind : T['meta'][K];
+    } : K extends 'returnType' ? 'oneOrThrow' : K extends 'result' ? Result : K extends 'then' ? QueryThen<ColumnShapeOutput<Result>> : T[K];
+};
 type SetQueryReturnsRows<T extends PickQueryResult> = {
     [K in keyof T]: K extends 'returnType' ? 'rows' : K extends 'then' ? QueryThen<ColumnShapeOutput<T['result']>[keyof T['result']][][]> : T[K];
 };
@@ -6783,6 +6813,13 @@ type SetQueryReturnsPluckColumnKind<T extends PickQueryMetaResult, Kind extends
         pluck: T['result']['value'];
     } : K extends 'returnType' ? 'pluck' : K extends 'then' ? QueryThen<T['result']['value']['outputType'][]> : T[K];
 } & QueryMetaHasSelect;
+type SetQueryReturnsPluckColumnKindResult<T extends PickQueryMetaResult, Kind extends string, Result extends QueryColumns> = {
+    [K in keyof T]: K extends 'meta' ? {
+        [K in keyof T['meta']]: K extends 'kind' ? Kind : T['meta'][K];
+    } : K extends 'result' ? {
+        pluck: T['result']['value'];
+    } : K extends 'returnType' ? 'pluck' : K extends 'result' ? Result : K extends 'then' ? QueryThen<T['result']['value']['outputType'][]> : T[K];
+} & QueryMetaHasSelect;
 type SetQueryReturnsValueOrThrow<T extends PickQueryMeta, Arg extends GetStringArg<T>> = SetQueryReturnsColumnOrThrow<T, T['meta']['selectable'][Arg]['column']> & T['meta']['selectable'][Arg]['column']['operators'];
 type SetQueryReturnsValueOptional<T extends PickQueryMeta, Arg extends GetStringArg<T>> = SetQueryReturnsColumnOptional<T, T['meta']['selectable'][Arg]['column']> & T['meta']['selectable'][Arg]['column']['operators'];
 type SetQueryReturnsColumnOrThrow<T, Column extends PickOutputType> = {
@@ -6802,6 +6839,13 @@ type SetQueryReturnsColumnKind<T extends PickQueryMetaResult, Kind extends strin
         value: T['result']['pluck'];
     } : K extends 'returnType' ? 'valueOrThrow' : K extends 'then' ? QueryThen<T['result']['pluck']['outputType']> : T[K];
 } & QueryMetaHasSelect;
+type SetQueryReturnsColumnKindResult<T extends PickQueryMetaResult, Kind extends string, Result extends QueryColumns> = {
+    [K in keyof T]: K extends 'meta' ? {
+        [K in keyof T['meta']]: K extends 'kind' ? Kind : T['meta'][K];
+    } : K extends 'result' ? {
+        value: T['result']['pluck'];
+    } : K extends 'returnType' ? 'valueOrThrow' : K extends 'result' ? Result : K extends 'then' ? QueryThen<Result['pluck']['outputType']> : T[K];
+} & QueryMetaHasSelect;
 type SetQueryReturnsRowCount<T extends PickQueryMetaResult, Kind extends string> = {
     [K in keyof T]: K extends 'meta' ? {
         [K in keyof T['meta']]: K extends 'kind' ? Kind : T['meta'][K];
@@ -6820,6 +6864,11 @@ type SetQueryKind<T extends PickQueryMeta, Kind extends string> = {
         [K in keyof T['meta']]: K extends 'kind' ? Kind : T['meta'][K];
     } : T[K];
 };
+type SetQueryKindResult<T extends PickQueryMetaReturnType, Kind extends string, Result extends QueryColumns> = {
+    [K in keyof T]: K extends 'meta' ? {
+        [K in keyof T['meta']]: K extends 'kind' ? Kind : T['meta'][K];
+    } : K extends 'result' ? Result : K extends 'then' ? QueryThen<GetQueryResult<T, Result>> : T[K];
+};
 type SetQueryTableAlias<T extends PickQueryMetaTableShape, As extends string> = {
     [K in keyof T]: K extends 'meta' ? {
         [K in keyof T['meta'] | 'as']: K extends 'as' ? As : K extends 'selectable' ? Omit<T['meta']['selectable'], `${AliasOrTable<T>}.${keyof T['shape'] & string}`> & {
@@ -6830,12 +6879,12 @@ type SetQueryTableAlias<T extends PickQueryMetaTableShape, As extends string> =
         } : T['meta'][K];
     } : T[K];
 };
-type SetQueryWith<T, WithData extends WithDataItems> = {
+type SetQueryWith<T, WithData> = {
     [K in keyof T]: K extends 'withData' ? WithData : T[K];
 };
-type AddQueryWith<T extends PickQueryWithData, With extends WithDataItem> = SetQueryWith<T, Spread<[T['withData'], {
-    [K in With['table']]: With;
-}]>>;
+type AddQueryWith<T extends PickQueryWithData, With extends WithDataItem> = SetQueryWith<T, {
+    [K in keyof T['withData'] | With['table']]: K extends With['table'] ? With : K extends keyof T['withData'] ? T['withData'][K] : never;
+}>;
 
 interface ColumnData extends ColumnDataBase {
     maxChars?: number;
@@ -7498,4 +7547,4 @@ type CopyResult<T extends PickQueryMeta> = SetQueryKind<T, 'copy'>;
  */
 declare function copyTableData<T extends PickQueryMetaShape>(query: T, arg: CopyArg<T>): CopyResult<T>;
 
-export { Adapter, AdapterConfig, AdapterOptions, AddQueryDefaults, AddQuerySelect, AddQueryWith, AfterHook, AggregateMethods, AggregateOptions, AliasOrTable, ArrayColumn, ArrayColumnValue, ArrayData, AsMethods, AsQueryArg, BaseOperators, BigIntColumn, BigSerialColumn, BitColumn, BitVaryingColumn, BooleanColumn, BooleanQueryColumn, BoxColumn, ByteaColumn, CharColumn, CidrColumn, CircleColumn, CitextColumn, Clear, ClearStatement, CloneSelfKeys, ColumnData, ColumnExpression, ColumnFromDbParams, ColumnInfoQueryData, ColumnOperators, ColumnRefExpression, ColumnType, ColumnsByType, ColumnsShape, ColumnsShapeToNullableObject, ColumnsShapeToObject, ColumnsShapeToObjectArray, ColumnsShapeToPluck, CommonQueryData, ComputedColumnsBase, CopyOptions, CopyQueryData, Create, CreateColumn, CreateCtx, CreateData, CreateKind, CreateMethodsNames, CreateRelationsData, CreateRelationsDataOmittingFKeys, CreateSelf, CustomTypeColumn, DateBaseColumn, DateColumn, DateColumnInput, DateTimeBaseClass, DateTimeTzBaseClass, Db, DbDomainArg, DbDomainArgRecord, DbExtension, DbOptions, DbResult, DbSharedOptions, DbTableConstructor, DbTableOptionScopes, DbTableOptions, DecimalColumn, DecimalColumnData, DefaultColumnTypes, DefaultSchemaConfig, Delete, DeleteArgs, DeleteMethodsNames, DeleteQueryData, DeleteResult, DomainColumn, DoublePrecisionColumn, DynamicRawSQL, EnumColumn, ExpressionOutput, FnExpression, FnExpressionArgs, FnExpressionArgsPairs, FnExpressionArgsValue, For, From, FromArg, FromArgOptions, FromQuerySelf, FromResult, GetArg, GetColumnInfo, GetQueryResult, GetResult, GetResultOptional, GetStringArg, GroupArg, Having, HavingItem, HookAction, HookSelect, IdentityColumn, InetColumn, InsertQueryData, IntegerBaseColumn, IntegerColumn, IntervalColumn, IsolationLevel, JSONColumn, JSONTextColumn, Join, JoinArgs, JoinCallback, JoinFirstArg, JoinItem, JoinItemArgs, JoinLateralCallback, JoinLateralItem, JoinLateralResult, JoinOverrides, JoinQueryBuilder, JoinQueryMethod, JoinResult, JoinedParsers, JoinedShapes, JsonItem, JsonMethods, JsonModifiers, LimitedTextBaseColumn, LineColumn, LsegColumn, MacAddr8Column, MacAddrColumn, MapTableScopesOption, MergeQuery, MergeQueryMethods, MoneyColumn, MoreThanOneRowError, NoPrimaryKeyOption, NotFoundError, NumberAsStringBaseColumn, NumberBaseColumn, NumberColumnData, OnConflictMerge, OnConflictQueryBuilder, OnConflictSet, OnConflictTarget, OnMethods, Operator, Operators, OperatorsAny, OperatorsArray, OperatorsBoolean, OperatorsDate, OperatorsJson, OperatorsNumber, OperatorsText, OperatorsTime, OrCreateArg, OrchidOrmError, OrchidOrmInternalError, OrderArg, OrderArgSelf, OrderArgs, OrderItem, OrderTsQueryConfig, Over, PathColumn, PickColumnData, PickQueryBaseQuery, PickQueryDataShapeAndJoinedShapes, PickQueryInternal, PickQueryMetaRelations, PickQueryMetaResultRelations, PickQueryMetaResultRelationsWindows, PickQueryMetaResultRelationsWindowsColumnTypes, PickQueryMetaResultRelationsWithDataReturnType, PickQueryMetaResultRelationsWithDataReturnTypeShape, PickQueryMetaResultReturnTypeWithDataWindows, PickQueryMetaResultReturnTypeWithDataWindowsTable, PickQueryMetaShapeRelationsWithData, PickQueryMetaTable, PickQueryMetaTableShape, PickQueryMetaTableShapeReturnTypeWithData, PickQueryMetaWithData, PickQueryQ, PickQueryQAndBaseQuery, PickQueryQAndInternal, PickQueryRelations, PickQueryRelationsWithData, PickQueryShapeResultSinglePrimaryKey, PickQueryShapeSinglePrimaryKey, PickQuerySinglePrimaryKey, PickQueryWindows, PickQueryWithData, PointColumn, PolygonColumn, Query, QueryAfterHook, QueryArraysResult, QueryBase, QueryBaseThen, QueryBeforeHook, QueryData, QueryDataJoinTo, QueryDefaultReturnData, QueryError, QueryErrorName, QueryGet, QueryGetSelf, QueryHelperResult, QueryHookSelect, QueryHooks, QueryInternal, QueryLog, QueryLogObject, QueryLogOptions, QueryLogger, QueryMetaHasSelect, QueryMetaHasWhere, QueryMethods, QueryResult, QueryReturnsAll, QueryScopeData, QueryScopes, QuerySourceItem, QueryTransform, QueryTransformFn, QueryUpsertOrCreate, QueryWithComputed, QueryWithTable, RawSQL, RawSqlMethods, RealColumn, RecordOfColumnsShapeBase, RelationConfigBase, RelationConfigDataForCreate, RelationJoinQuery, RelationQuery, RelationQueryBase, RelationsBase, SearchArg, SearchMethods, SearchWeight, SearchWeightRecord, Select, SelectArg, SelectAs, SelectItem, SelectQueryData, SelectSubQueryResult, SelectableFromShape, SelectableOfType, SelectableOrExpression, SelectableOrExpressionOfType, SerialColumn, SerialColumnData, SetQueryKind, SetQueryReturnsAll, SetQueryReturnsAllKind, SetQueryReturnsColumnInfo, SetQueryReturnsColumnKind, SetQueryReturnsColumnOptional, SetQueryReturnsColumnOrThrow, SetQueryReturnsOne, SetQueryReturnsOneKind, SetQueryReturnsOneOptional, SetQueryReturnsPluck, SetQueryReturnsPluckColumn, SetQueryReturnsPluckColumnKind, SetQueryReturnsRowCount, SetQueryReturnsRows, SetQueryReturnsValueOptional, SetQueryReturnsValueOrThrow, SetQueryReturnsVoid, SetQueryReturnsVoidKind, SetQueryTableAlias, SetQueryWith, ShapeColumnPrimaryKeys, ShapeUniqueColumns, SimpleJoinItem, SimpleJoinItemNonSubQueryArgs, SmallIntColumn, SmallSerialColumn, SortDir, SqlFn, StringColumn$1 as StringColumn, TableData, TableDataFn, TableDataInput, TableDataItem, TableDataItemsUniqueColumnTuples, TableDataItemsUniqueColumns, TableDataItemsUniqueConstraints, TableDataMethods, TextBaseColumn, TextColumn, TextColumnData, Then, TimeColumn, TimestampColumn, TimestampTZColumn, ToSQLCtx, ToSQLOptions, ToSQLQuery, Transaction, TransactionAdapter, TransactionOptions, TransformMethods, TruncateQueryData, TsQueryColumn, TsVectorColumn, TypeParsers, UUIDColumn, UnhandledTypeError, Union, UnionArg, UnionItem, UnionKind, UniqueConstraints, UniqueQueryTypeOrExpression, UniqueTableDataItem, UnknownColumn, Update, UpdateArg, UpdateCtx, UpdateCtxCollect, UpdateData, UpdateQueryData, UpdateQueryDataItem, UpdateQueryDataObject, UpdateSelf, UpdatedAtDataInjector, UpsertArg, UpsertResult, UpsertThis, VarCharColumn, VirtualColumn, Where, WhereArg, WhereArgs, WhereInArg, WhereInColumn, WhereInItem, WhereInValues, WhereItem, WhereJsonPathEqualsItem, WhereNotArgs, WhereOnItem, WhereOnJoinItem, WhereQueryBuilder, WhereResult, WhereSearchItem, WhereSearchResult, WindowArg, WindowArgDeclaration, WindowDeclaration, WindowItem, With, WithDataBase, WithDataItem, WithDataItems, WithItem, WithOptions, WrapQueryArg, XMLColumn, _initQueryBuilder, _queryAfterSaveCommit, _queryAll, _queryAs, _queryChangeCounter, _queryCreate, _queryCreateFrom, _queryCreateMany, _queryCreateManyFrom, _queryCreateManyRaw, _queryCreateRaw, _queryDefaults, _queryDelete, _queryExec, _queryFindBy, _queryFindByOptional, _queryGet, _queryGetOptional, _queryHookAfterCreate, _queryHookAfterCreateCommit, _queryHookAfterDelete, _queryHookAfterDeleteCommit, _queryHookAfterQuery, _queryHookAfterSave, _queryHookAfterUpdate, _queryHookAfterUpdateCommit, _queryHookBeforeCreate, _queryHookBeforeDelete, _queryHookBeforeQuery, _queryHookBeforeSave, _queryHookBeforeUpdate, _queryInsert, _queryInsertFrom, _queryInsertMany, _queryInsertManyFrom, _queryInsertManyRaw, _queryInsertRaw, _queryJoinOn, _queryJoinOnJsonPathEquals, _queryJoinOrOn, _queryOr, _queryOrNot, _queryRows, _querySelect, _queryTake, _queryTakeOptional, _queryUpdate, _queryUpdateOrThrow, _queryUpdateRaw, _queryWhere, _queryWhereExists, _queryWhereIn, _queryWhereNot, _queryWhereNotSql, _queryWhereSql, addComputedColumns, addParserForRawExpression, addParserForSelectItem, addQueryOn, anyShape, checkIfASimpleQuery, cloneQuery, cloneQueryBaseUnscoped, columnCheckToCode, columnCode, columnForeignKeysToCode, columnIndexesToCode, columnsShapeToCode, constraintInnerToCode, constraintToCode, copyTableData, countSelect, createDb, defaultSchemaConfig, extendQuery, foreignKeyArgumentToCode, getClonedQueryData, getColumnInfo, getColumnTypes, getPrimaryKeys, getQueryAs, getShapeFromSelect, handleResult, identityToCode, indexInnerToCode, indexToCode, instantiateColumn, isDefaultTimeStamp, isQueryReturnsAll, isSelectingCount, joinSubQuery, logColors, logParamToLogObject, makeColumnTypes, makeColumnsByType, makeExpression, makeFnExpression, makeRegexToFindInSql, makeSQL, parseRecord, parseResult, parseTableData, parseTableDataInput, primaryKeyInnerToCode, processSelectArg, pushLimitSQL, pushQueryArray, pushQueryOn, pushQueryOrOn, pushQueryValue, pushTableDataCode, queryFrom, queryFromSql, queryJson, queryMethodByReturnType, queryTypeWithLimitOne, queryWrap, quote, quoteString, raw, referencesArgsToCode, resolveSubQueryCallback, saveSearchAlias, setParserForSelectedString, setQueryObjectValue, setQueryOperators, simplifyColumnDefault, sqlFn, sqlQueryArgsToExpression, tableDataMethods, templateLiteralToSQL, testTransaction, throwIfNoWhere, toSQL, toSQLCacheKey };
+export { Adapter, AdapterConfig, AdapterOptions, AddQueryDefaults, AddQuerySelect, AddQueryWith, AfterHook, AggregateMethods, AggregateOptions, AliasOrTable, ArrayColumn, ArrayColumnValue, ArrayData, AsMethods, AsQueryArg, BaseOperators, BigIntColumn, BigSerialColumn, BitColumn, BitVaryingColumn, BooleanColumn, BooleanQueryColumn, BoxColumn, ByteaColumn, CharColumn, CidrColumn, CircleColumn, CitextColumn, Clear, ClearStatement, CloneSelfKeys, ColumnData, ColumnExpression, ColumnFromDbParams, ColumnInfoQueryData, ColumnOperators, ColumnRefExpression, ColumnType, ColumnsByType, ColumnsShape, ColumnsShapeToNullableObject, ColumnsShapeToObject, ColumnsShapeToObjectArray, ColumnsShapeToPluck, CommonQueryData, ComputedColumnsBase, CopyOptions, CopyQueryData, Create, CreateBelongsToData, CreateColumn, CreateCtx, CreateData, CreateKind, CreateMethodsNames, CreateRelationsData, CreateRelationsDataOmittingFKeys, CreateSelf, CustomTypeColumn, DateBaseColumn, DateColumn, DateColumnInput, DateTimeBaseClass, DateTimeTzBaseClass, Db, DbDomainArg, DbDomainArgRecord, DbExtension, DbOptions, DbResult, DbSharedOptions, DbTableConstructor, DbTableOptionScopes, DbTableOptions, DecimalColumn, DecimalColumnData, DefaultColumnTypes, DefaultSchemaConfig, Delete, DeleteArgs, DeleteMethodsNames, DeleteQueryData, DeleteResult, DomainColumn, DoublePrecisionColumn, DynamicRawSQL, EnumColumn, ExpressionOutput, FnExpression, FnExpressionArgs, FnExpressionArgsPairs, FnExpressionArgsValue, For, From, FromArg, FromArgOptions, FromQuerySelf, FromResult, GetArg, GetColumnInfo, GetQueryResult, GetResult, GetResultOptional, GetStringArg, GroupArg, Having, HavingItem, HookAction, HookSelect, IdentityColumn, InetColumn, InsertQueryData, IntegerBaseColumn, IntegerColumn, IntervalColumn, IsolationLevel, JSONColumn, JSONTextColumn, Join, JoinArgs, JoinCallback, JoinFirstArg, JoinItem, JoinItemArgs, JoinLateralCallback, JoinLateralItem, JoinLateralResult, JoinOverrides, JoinQueryBuilder, JoinQueryMethod, JoinResult, JoinedParsers, JoinedShapes, JsonItem, JsonMethods, JsonModifiers, LimitedTextBaseColumn, LineColumn, LsegColumn, MacAddr8Column, MacAddrColumn, MapTableScopesOption, MergeQuery, MergeQueryMethods, MoneyColumn, MoreThanOneRowError, NoPrimaryKeyOption, NotFoundError, NumberAsStringBaseColumn, NumberBaseColumn, NumberColumnData, OnConflictMerge, OnConflictQueryBuilder, OnConflictSet, OnConflictTarget, OnMethods, Operator, Operators, OperatorsAny, OperatorsArray, OperatorsBoolean, OperatorsDate, OperatorsJson, OperatorsNumber, OperatorsText, OperatorsTime, OrCreateArg, OrchidOrmError, OrchidOrmInternalError, OrderArg, OrderArgSelf, OrderArgs, OrderItem, OrderTsQueryConfig, Over, PathColumn, PickColumnData, PickQueryBaseQuery, PickQueryDataShapeAndJoinedShapes, PickQueryInternal, PickQueryMetaRelations, PickQueryMetaResultRelations, PickQueryMetaResultRelationsWindows, PickQueryMetaResultRelationsWindowsColumnTypes, PickQueryMetaResultRelationsWithDataReturnType, PickQueryMetaResultRelationsWithDataReturnTypeShape, PickQueryMetaResultReturnTypeWithDataWindows, PickQueryMetaResultReturnTypeWithDataWindowsTable, PickQueryMetaShapeRelationsWithData, PickQueryMetaTable, PickQueryMetaTableShape, PickQueryMetaTableShapeReturnTypeWithData, PickQueryMetaWithData, PickQueryQ, PickQueryQAndBaseQuery, PickQueryQAndInternal, PickQueryRelations, PickQueryRelationsWithData, PickQueryShapeResultSinglePrimaryKey, PickQueryShapeSinglePrimaryKey, PickQuerySinglePrimaryKey, PickQueryWindows, PickQueryWithData, PointColumn, PolygonColumn, Query, QueryAfterHook, QueryArraysResult, QueryBase, QueryBaseThen, QueryBeforeHook, QueryData, QueryDataJoinTo, QueryDefaultReturnData, QueryError, QueryErrorName, QueryGet, QueryGetSelf, QueryHelperResult, QueryHookSelect, QueryHooks, QueryInternal, QueryLog, QueryLogObject, QueryLogOptions, QueryLogger, QueryMetaHasSelect, QueryMetaHasWhere, QueryMethods, QueryResult, QueryReturnsAll, QueryScopeData, QueryScopes, QuerySourceItem, QueryTransform, QueryTransformFn, QueryUpsertOrCreate, QueryWithComputed, QueryWithTable, RawSQL, RawSqlMethods, RealColumn, RecordOfColumnsShapeBase, RelationConfigBase, RelationConfigDataForCreate, RelationJoinQuery, RelationQuery, RelationQueryBase, RelationsBase, SearchArg, SearchMethods, SearchWeight, SearchWeightRecord, Select, SelectArg, SelectAs, SelectItem, SelectQueryData, SelectSubQueryResult, SelectableFromShape, SelectableOfType, SelectableOrExpression, SelectableOrExpressionOfType, SerialColumn, SerialColumnData, SetQueryKind, SetQueryKindResult, SetQueryReturnsAll, SetQueryReturnsAllKind, SetQueryReturnsAllKindResult, SetQueryReturnsColumnInfo, SetQueryReturnsColumnKind, SetQueryReturnsColumnKindResult, SetQueryReturnsColumnOptional, SetQueryReturnsColumnOrThrow, SetQueryReturnsOne, SetQueryReturnsOneKind, SetQueryReturnsOneKindResult, SetQueryReturnsOneOptional, SetQueryReturnsPluck, SetQueryReturnsPluckColumn, SetQueryReturnsPluckColumnKind, SetQueryReturnsPluckColumnKindResult, SetQueryReturnsRowCount, SetQueryReturnsRows, SetQueryReturnsValueOptional, SetQueryReturnsValueOrThrow, SetQueryReturnsVoid, SetQueryReturnsVoidKind, SetQueryTableAlias, SetQueryWith, ShapeColumnPrimaryKeys, ShapeUniqueColumns, SimpleJoinItem, SimpleJoinItemNonSubQueryArgs, SmallIntColumn, SmallSerialColumn, SortDir, SqlFn, StringColumn$1 as StringColumn, TableData, TableDataFn, TableDataInput, TableDataItem, TableDataItemsUniqueColumnTuples, TableDataItemsUniqueColumns, TableDataItemsUniqueConstraints, TableDataMethods, TextBaseColumn, TextColumn, TextColumnData, Then, TimeColumn, TimestampColumn, TimestampTZColumn, ToSQLCtx, ToSQLOptions, ToSQLQuery, Transaction, TransactionAdapter, TransactionOptions, TransformMethods, TruncateQueryData, TsQueryColumn, TsVectorColumn, TypeParsers, UUIDColumn, UnhandledTypeError, Union, UnionArg, UnionItem, UnionKind, UniqueConstraints, UniqueQueryTypeOrExpression, UniqueTableDataItem, UnknownColumn, Update, UpdateArg, UpdateCtx, UpdateCtxCollect, UpdateData, UpdateQueryData, UpdateQueryDataItem, UpdateQueryDataObject, UpdateSelf, UpdatedAtDataInjector, UpsertArg, UpsertResult, UpsertThis, VarCharColumn, VirtualColumn, Where, WhereArg, WhereArgs, WhereInArg, WhereInColumn, WhereInItem, WhereInValues, WhereItem, WhereJsonPathEqualsItem, WhereNotArgs, WhereOnItem, WhereOnJoinItem, WhereQueryBuilder, WhereResult, WhereSearchItem, WhereSearchResult, WindowArg, WindowArgDeclaration, WindowDeclaration, WindowItem, With, WithDataBase, WithDataItem, WithDataItems, WithItem, WithOptions, WrapQueryArg, XMLColumn, _initQueryBuilder, _queryAfterSaveCommit, _queryAll, _queryAs, _queryChangeCounter, _queryCreate, _queryCreateFrom, _queryCreateMany, _queryCreateManyFrom, _queryCreateManyRaw, _queryCreateRaw, _queryDefaults, _queryDelete, _queryExec, _queryFindBy, _queryFindByOptional, _queryGet, _queryGetOptional, _queryHookAfterCreate, _queryHookAfterCreateCommit, _queryHookAfterDelete, _queryHookAfterDeleteCommit, _queryHookAfterQuery, _queryHookAfterSave, _queryHookAfterUpdate, _queryHookAfterUpdateCommit, _queryHookBeforeCreate, _queryHookBeforeDelete, _queryHookBeforeQuery, _queryHookBeforeSave, _queryHookBeforeUpdate, _queryInsert, _queryInsertFrom, _queryInsertMany, _queryInsertManyFrom, _queryInsertManyRaw, _queryInsertRaw, _queryJoinOn, _queryJoinOnJsonPathEquals, _queryJoinOrOn, _queryOr, _queryOrNot, _queryRows, _querySelect, _queryTake, _queryTakeOptional, _queryUpdate, _queryUpdateOrThrow, _queryUpdateRaw, _queryWhere, _queryWhereExists, _queryWhereIn, _queryWhereNot, _queryWhereNotSql, _queryWhereSql, addComputedColumns, addParserForRawExpression, addParserForSelectItem, addQueryOn, anyShape, checkIfASimpleQuery, cloneQuery, cloneQueryBaseUnscoped, columnCheckToCode, columnCode, columnForeignKeysToCode, columnIndexesToCode, columnsShapeToCode, constraintInnerToCode, constraintToCode, copyTableData, countSelect, createDb, defaultSchemaConfig, extendQuery, foreignKeyArgumentToCode, getClonedQueryData, getColumnInfo, getColumnTypes, getPrimaryKeys, getQueryAs, getShapeFromSelect, handleResult, identityToCode, indexInnerToCode, indexToCode, instantiateColumn, isDefaultTimeStamp, isQueryReturnsAll, isSelectingCount, joinSubQuery, logColors, logParamToLogObject, makeColumnTypes, makeColumnsByType, makeExpression, makeFnExpression, makeRegexToFindInSql, makeSQL, parseRecord, parseResult, parseTableData, parseTableDataInput, primaryKeyInnerToCode, processSelectArg, pushLimitSQL, pushQueryArray, pushQueryOn, pushQueryOrOn, pushQueryValue, pushTableDataCode, queryFrom, queryFromSql, queryJson, queryMethodByReturnType, queryTypeWithLimitOne, queryWrap, quote, quoteString, raw, referencesArgsToCode, resolveSubQueryCallback, saveSearchAlias, setParserForSelectedString, setQueryObjectValue, setQueryOperators, simplifyColumnDefault, sqlFn, sqlQueryArgsToExpression, tableDataMethods, templateLiteralToSQL, testTransaction, throwIfNoWhere, toSQL, toSQLCacheKey };

package/dist/index.js

@@ -11126,10 +11126,6 @@ class Db {
         hasParsers = true;
         parsers[key] = column.parseFn;
       }
-      const { modifyQuery: mq } = column.data;
-      if (mq) {
-        modifyQuery = orchidCore.pushOrNewArray(modifyQuery, (q) => mq(q, column));
-      }
       if (column.data.name) {
         hasCustomName = true;
       } else if (snakeCase) {
@@ -11139,6 +11135,10 @@ class Db {
           column.data.name = snakeName;
         }
       }
+      const { modifyQuery: mq } = column.data;
+      if (mq) {
+        modifyQuery = orchidCore.pushOrNewArray(modifyQuery, (q) => mq(q, column));
+      }
       if (typeof column.data.default === "function") {
         const arr = this.internal.runtimeDefaultColumns;
         if (!arr)