pqb 0.41.4 → 0.42.0

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { PoolConfig, Pool, PoolClient } from 'pg';
 import * as orchid_core from 'orchid-core';
-import { QueryResultRow, AdapterConfigBase, AdapterBase, QueryInput, SingleSqlItem, Sql, RecordUnknown, RecordKeyTrue, EmptyObject, QueryBaseCommon, QueryColumns, QueryMetaBase, QueryReturnType, QueryThen, Expression, MaybeArray, TemplateLiteralArgs, QueryColumn, MaybePromise, FnUnknownToUnknown, RecordString, ColumnsShapeBase, ColumnsParsers, PickQueryTable, BatchParsers, HookSelect, QueryLogObject, QueryLogger, QueryDataTransform, ExpressionChain, PickQueryShape, ColumnSchemaConfig, RawSQLBase, RawSQLValues, ExpressionTypeMethod, DynamicSQLArg, ExpressionData, StaticSQLArgs, SQLQueryArgs, PickQueryTableMetaResult, EmptyTuple, PickQueryMeta, PickQueryMetaResultReturnType, QueryColumnToNullable, SelectableBase, PickQueryMetaShape, PickQueryTableMetaResultShape, PickQueryMetaResultWindows, PickOutputTypeAndOperators, PickQueryResult, ValExpression, PickOutputType, DateColumnData, ColumnToCodeCtx, Code, TimeInterval, ColumnTypeSchemaArg, ColumnDataBase, ArrayMethodsData, ForeignKeyTable, ColumnNameOfTable, BaseNumberData, PickColumnBaseData, ColumnWithDefault, StringTypeData, PrimaryKeyColumn, ColumnTypeBase, ParseColumn, ParseNullColumn, EncodeColumn, QueryColumnsInit, QueryLogOptions, DefaultSelectColumns, DbBase, QueryCatch, TransactionState, QueryColumnOfDataType, PickQueryUniqueProperties, PickQueryMetaResult, IsQuery, PickQueryTableMetaResultInputType, getValueKey, PickQueryResultUniqueColumns, QueryInternalBase, PickQueryReturnType, PickType, ColumnShapeOutput, OperatorsNullable, PickQueryMetaReturnType, UniqueColumn, TimestampHelpers, Codes, ColumnDataCheckBase } from 'orchid-core';
+import { QueryResultRow, AdapterConfigBase, AdapterBase, QueryInput, SingleSqlItem, Sql, IsQuery, RecordUnknown, Expression, MaybeArray, TemplateLiteralArgs, EmptyObject, QueryColumns, QueryColumn, MaybePromise, FnUnknownToUnknown, QueryMetaBase, QueryReturnType, RecordString, ColumnsShapeBase, ColumnsParsers, PickQueryTable, BatchParsers, HookSelect, QueryLogObject, QueryLogger, QueryDataTransform, ExpressionChain, PickQueryShape, ColumnSchemaConfig, RawSQLBase, RawSQLValues, ExpressionTypeMethod, DynamicSQLArg, ExpressionData, StaticSQLArgs, SQLQueryArgs, PickQueryTableMetaResult, EmptyTuple, PickQueryMeta, PickQueryMetaResultReturnType, QueryColumnToNullable, QueryThen, SelectableBase, PickQueryMetaShape, PickQueryTableMetaResultShape, PickQueryMetaResultWindows, PickOutputTypeAndOperators, PickQueryResult, ValExpression, PickOutputType, DateColumnData, ColumnToCodeCtx, Code, TimeInterval, ColumnTypeSchemaArg, ColumnDataBase, ArrayMethodsData, ForeignKeyTable, ColumnNameOfTable, BaseNumberData, PickColumnBaseData, ColumnWithDefault, StringTypeData, PrimaryKeyColumn, ColumnTypeBase, ParseColumn, ParseNullColumn, EncodeColumn, QueryColumnsInit, QueryLogOptions, DefaultSelectColumns, DefaultSelectOutput, ColumnShapeInput, QueryCatch, TransactionState, QueryColumnOfDataType, PickQueryUniqueProperties, PickQueryMetaResult, PickQueryTableMetaResultInputType, getValueKey, PickQueryReturnType, PickQueryResultUniqueColumns, QueryInternalBase, PickType, RecordKeyTrue, ColumnShapeOutput, OperatorsNullable, PickQueryMetaReturnType, UniqueColumn, TimestampHelpers, Codes, ColumnDataCheckBase } from 'orchid-core';
 import { inspect } from 'node:util';
 import { AsyncLocalStorage } from 'node:async_hooks';
 
@@ -56,11 +56,16 @@ declare class TransactionAdapter implements Adapter {
 }
 
 interface RelationJoinQuery {
-    (joiningQuery: Query, baseQuery: Query): Query;
+    (joiningQuery: IsQuery, baseQuery: IsQuery): IsQuery;
 }
 interface RelationConfigBase {
-    query: Query;
+    query: IsQuery;
     joinQuery: RelationJoinQuery;
+    reverseJoin: RelationJoinQuery;
+    params: unknown;
+    queryRelated(params: unknown): unknown;
+    modifyRelatedQuery?(relatedQuery: IsQuery): (query: IsQuery) => void;
+    maybeSingle: unknown;
     omitForeignKeyInCreate: PropertyKey;
     dataForCreate?: RelationConfigDataForCreate;
     optionalDataForCreate: unknown;
@@ -77,34 +82,6 @@ interface RelationsBase {
 interface RelationQueryBase extends Query {
     relationConfig: RelationConfigBase;
 }
-type RelationQuery<Config extends RelationConfigBase = RelationConfigBase, Params = never, Required = never, One = never> = RelationQueryFnAndConfig<Config, Params, Required, One> & Config['query'];
-interface RelationQueryFnAndConfig<Config extends RelationConfigBase = RelationConfigBase, Params = never, Required = never, One = never> {
-    (params: Params): One extends true ? Required extends true ? SetQueryReturnsOne<Config['query']> : SetQueryReturnsOneOptional<Config['query']> : Config['query'];
-    relationConfig: Config;
-}
-
-declare abstract class QueryBase<Scopes extends RecordKeyTrue = EmptyObject> implements QueryBaseCommon<Scopes> {
-    /**
-     * Clones the current query chain, useful for re-using partial query snippets in other queries without mutating the original.
-     *
-     * Used under the hood, and not really needed on the app side.
-     */
-    clone<T>(this: T): T;
-    __isQuery: true;
-    result: QueryColumns;
-    q: QueryData;
-    table?: string;
-    shape: QueryColumns;
-    relations: RelationsBase;
-    withData: WithDataItems;
-    baseQuery: Query;
-    internal: QueryInternal;
-    meta: QueryMetaBase<Scopes>;
-    returnType: QueryReturnType;
-}
-interface QueryBaseThen<T> extends QueryBase {
-    then: QueryThen<T>;
-}
 
 declare const checkIfASimpleQuery: (q: Query) => boolean;
 interface WithItem {
@@ -168,25 +145,25 @@ type SimpleJoinItemNonSubQueryArgs = [{
     rightColumn: string | Expression
 ];
 type JoinItemArgs = {
-    j: Query;
+    j: IsQuery;
     s: boolean;
-    r?: Query;
+    r?: IsQuery;
 } | {
     w: string;
-    r: Query;
+    r: IsQuery;
     s: boolean;
 } | {
     w: string;
     a: SimpleJoinItemNonSubQueryArgs;
 } | {
-    q: QueryWithTable;
+    q: IsQuery;
     s: boolean;
 } | {
-    q: QueryWithTable;
-    r: Query;
+    q: IsQuery;
+    r: IsQuery;
     s: boolean;
 } | {
-    q: QueryWithTable;
+    q: IsQuery;
     a: SimpleJoinItemNonSubQueryArgs;
     s: boolean;
 };
@@ -206,7 +183,7 @@ type WhereItem = {
     EXISTS?: MaybeArray<JoinItemArgs>;
     ON?: WhereOnItem | WhereJsonPathEqualsItem;
     SEARCH?: MaybeArray<WhereSearchItem>;
-} | ((q: unknown) => QueryBase | RelationQuery | Expression) | Query | Expression;
+} | ((q: unknown) => RelationQueryBase | Expression) | Query | Expression;
 interface WhereInItem {
     columns: string[];
     values: unknown[][] | Query | Expression;
@@ -326,7 +303,7 @@ interface QueryComputedArg<ColumnTypes, Shape extends QueryColumns> extends Expr
         };
     };
 }
-declare const applyComputedColumns: (q: Query, fn: ComputedOptionsFactory<never, never>) => void;
+declare const applyComputedColumns: (q: IsQuery, fn: ComputedOptionsFactory<never, never>) => void;
 declare const processComputedResult: (query: QueryData, result: unknown) => Promise<void[]> | undefined;
 declare const processComputedBatches: (query: QueryData, batches: QueryBatchResult[], originalReturnType: QueryReturnType, returnType: QueryReturnType, tempColumns: Set<string> | undefined, renames: RecordString | undefined, key: string) => Promise<void> | undefined;
 
@@ -364,6 +341,8 @@ interface CommonQueryData {
     patchResult?(q: Query, queryResult: QueryResult): Promise<void>;
     handleResult: HandleResult;
     returnType: QueryReturnType;
+    returning?: boolean;
+    returningMany?: boolean;
     wrapInTransaction?: boolean;
     throwOnNotFound?: boolean;
     with?: WithItem[];
@@ -428,7 +407,7 @@ interface CommonQueryData {
     transform?: QueryDataTransform[];
     language?: string;
     subQuery?: number;
-    relChain?: (Query | RelationQuery)[];
+    relChain?: (Query | RelationQueryBase)[];
     /**
      * Stores current operator functions available for the query.
      * Is needed to remove these operators from query object when changing the query type, see {@link setQueryOperators}.
@@ -699,9 +678,9 @@ type JoinResult<T extends PickQueryMetaResultReturnType, JoinedSelectable, Requi
 type JoinResultFromArgs<T extends PickQueryMetaResultRelationsWithDataReturnType, Arg, Args, RequireJoined, RequireMain> = JoinResult<T, Args extends GenericJoinCallbackTuple ? JoinResultSelectable<ReturnType<Args[0]>['result'], AliasOrTable<ReturnType<Args[0]>>, RequireJoined> : Arg extends PickQueryTableMetaResultShape ? Arg['meta']['hasSelect'] extends true ? JoinResultSelectable<Arg['result'], AliasOrTable<Arg>, RequireJoined> : JoinResultSelectable<Arg['shape'], AliasOrTable<{
     table: Arg['table'];
     meta: Arg['meta'];
-}>, RequireJoined> : Arg extends keyof T['relations'] ? JoinResultSelectable<T['relations'][Arg]['relationConfig']['query']['shape'], AliasOrTable<{
-    table: T['relations'][Arg]['relationConfig']['query']['table'];
-    meta: T['relations'][Arg]['relationConfig']['query']['meta'];
+}>, RequireJoined> : Arg extends keyof T['relations'] ? JoinResultSelectable<T['relations'][Arg]['shape'], AliasOrTable<{
+    table: T['relations'][Arg]['table'];
+    meta: T['relations'][Arg]['meta'];
 }>, RequireJoined> : Arg extends GenericJoinCallback ? JoinResultSelectable<ReturnType<Arg>['shape'], AliasOrTable<{
     table: ReturnType<Arg>['table'];
     meta: ReturnType<Arg>['meta'];
@@ -752,22 +731,6 @@ type JoinAddSelectable<T extends PickQueryMeta, Selectable> = {
         [K in keyof T['meta']]: K extends 'selectable' ? T['meta']['selectable'] & Selectable : T['meta'][K];
     } : T[K];
 };
-/**
- * Map the `with` table first argument of `join` or `joinLateral` to a query type.
- * Constructs `selectable` based on `with` table shape, and adds generic types to conform the `QueryBase` type.
- */
-interface JoinWithArgToQuery<With extends WithDataItem> extends Query {
-    table: With['table'];
-    meta: QueryMetaBase & {
-        selectable: {
-            [K in keyof With['shape'] & string as `${With['table']}.${K}`]: {
-                as: K;
-                column: With['shape'][K];
-            };
-        };
-    };
-    result: With['shape'];
-}
 /**
  * Map the first argument of `join` or `joinLateral` to a query type.
  *
@@ -775,7 +738,16 @@ interface JoinWithArgToQuery<With extends WithDataItem> extends Query {
  * query arg is returned as is,
  * relation name is replaced with a relation table.
  */
-type JoinArgToQuery<T extends PickQueryRelationsWithData, Arg extends JoinFirstArg<T>> = Arg extends keyof T['withData'] ? T['withData'][Arg] extends WithDataItem ? JoinWithArgToQuery<T['withData'][Arg]> : never : Arg extends PickQueryTableMetaResult ? Arg : Arg extends keyof T['relations'] ? T['relations'][Arg]['relationConfig']['query'] : Arg extends JoinArgToQueryCallback ? ReturnType<Arg> : never;
+type JoinArgToQuery<T extends PickQueryRelationsWithData, Arg extends JoinFirstArg<T>> = Arg extends keyof T['withData'] ? T['withData'][Arg] extends WithDataItem ? {
+    [K in 'table' | 'meta' | 'result' | keyof T]: K extends 'table' ? T['withData'][Arg]['table'] : K extends 'meta' ? QueryMetaBase & {
+        selectable: {
+            [K in keyof T['withData'][Arg]['shape'] & string as `${T['withData'][Arg]['table']}.${K}`]: {
+                as: K;
+                column: T['withData'][Arg]['shape'][K];
+            };
+        };
+    } : K extends 'result' ? T['withData'][Arg]['shape'] : K extends keyof T ? T[K] : never;
+} : never : Arg extends PickQueryTableMetaResult ? Arg : Arg extends keyof T['relations'] ? T['relations'][Arg] : Arg extends JoinArgToQueryCallback ? ReturnType<Arg> : never;
 type JoinArgToQueryCallback = (...args: any[]) => PickQueryTableMetaResult;
 /**
  * Type of the `join` callback (not `joinLateral`).
@@ -1482,12 +1454,12 @@ interface Operator<Value, Column extends PickOutputTypeAndOperators = PickOutput
     <T extends PickQueryResult>(this: T, arg: Value): Omit<SetQueryReturnsColumnOrThrow<T, Column>, keyof T['result']['value']['operators']> & Column['operators'];
     _opType: Value;
 }
-declare function setQueryOperators(query: PickQueryBaseQuery, operators: RecordUnknown): PickQueryBaseQuery;
+declare function setQueryOperators(query: IsQuery, operators: RecordUnknown): IsQuery;
 interface Base<Value> {
-    equals: Operator<Value | Query | Expression, BooleanQueryColumn>;
-    not: Operator<Value | Query | Expression, BooleanQueryColumn>;
-    in: Operator<Value[] | Query | Expression, BooleanQueryColumn>;
-    notIn: Operator<Value[] | Query | Expression, BooleanQueryColumn>;
+    equals: Operator<Value | IsQuery | Expression, BooleanQueryColumn>;
+    not: Operator<Value | IsQuery | Expression, BooleanQueryColumn>;
+    in: Operator<Value[] | IsQuery | Expression, BooleanQueryColumn>;
+    notIn: Operator<Value[] | IsQuery | Expression, BooleanQueryColumn>;
 }
 interface OperatorsBooleanSelf extends OperatorsBoolean {
     result: {
@@ -1499,23 +1471,23 @@ interface OperatorsBoolean extends Base<boolean> {
     or: Operator<OperatorsBooleanSelf, BooleanQueryColumn>;
 }
 interface Ord<Value> extends Base<Value> {
-    lt: Operator<Value | Query | Expression, BooleanQueryColumn>;
-    lte: Operator<Value | Query | Expression, BooleanQueryColumn>;
-    gt: Operator<Value | Query | Expression, BooleanQueryColumn>;
-    gte: Operator<Value | Query | Expression, BooleanQueryColumn>;
+    lt: Operator<Value | IsQuery | Expression, BooleanQueryColumn>;
+    lte: Operator<Value | IsQuery | Expression, BooleanQueryColumn>;
+    gt: Operator<Value | IsQuery | Expression, BooleanQueryColumn>;
+    gte: Operator<Value | IsQuery | Expression, BooleanQueryColumn>;
     between: Operator<[
-        Value | Query | Expression,
-        Value | Query | Expression
+        Value | IsQuery | Expression,
+        Value | IsQuery | Expression
     ], BooleanQueryColumn>;
 }
 type OperatorsNumber = Ord<number>;
 interface OperatorsText extends Base<string> {
-    contains: Operator<string | Query | Expression, BooleanQueryColumn>;
-    containsSensitive: Operator<string | Query | Expression, BooleanQueryColumn>;
-    startsWith: Operator<string | Query | Expression, BooleanQueryColumn>;
-    startsWithSensitive: Operator<string | Query | Expression, BooleanQueryColumn>;
-    endsWith: Operator<string | Query | Expression, BooleanQueryColumn>;
-    endsWithSensitive: Operator<string | Query | Expression, BooleanQueryColumn>;
+    contains: Operator<string | IsQuery | Expression, BooleanQueryColumn>;
+    containsSensitive: Operator<string | IsQuery | Expression, BooleanQueryColumn>;
+    startsWith: Operator<string | IsQuery | Expression, BooleanQueryColumn>;
+    startsWithSensitive: Operator<string | IsQuery | Expression, BooleanQueryColumn>;
+    endsWith: Operator<string | IsQuery | Expression, BooleanQueryColumn>;
+    endsWithSensitive: Operator<string | IsQuery | Expression, BooleanQueryColumn>;
 }
 interface JsonPathQueryOptions {
     vars?: RecordUnknown;
@@ -1585,8 +1557,8 @@ interface JsonPathQuery {
 }
 interface OperatorsJson extends Base<unknown> {
     jsonPathQueryFirst: JsonPathQuery;
-    jsonSupersetOf: Operator<unknown | Query | Expression, BooleanQueryColumn>;
-    jsonSubsetOf: Operator<unknown | Query | Expression, BooleanQueryColumn>;
+    jsonSupersetOf: Operator<unknown | IsQuery | Expression, BooleanQueryColumn>;
+    jsonSubsetOf: Operator<unknown | IsQuery | Expression, BooleanQueryColumn>;
     jsonSet: {
         /**
          * Returns a JSON value/object/array where a given value is set at the given path.
@@ -1835,7 +1807,7 @@ declare class ExpressionMethods {
 type WhereArg<T extends PickQueryMetaRelations> = {
     [K in keyof T['meta']['selectable'] | 'NOT' | 'OR' | 'IN']?: K extends 'NOT' ? WhereArg<T> | WhereArgs<T> : K extends 'OR' ? (WhereArg<T> | WhereArgs<T>)[] : K extends 'IN' ? MaybeArray<{
         columns: (keyof T['meta']['selectable'])[];
-        values: unknown[][] | QueryBase | Expression;
+        values: unknown[][] | IsQuery | Expression;
     }> : T['meta']['selectable'][K]['column']['queryType'] | null | {
         [O in keyof T['meta']['selectable'][K]['column']['operators']]?: T['meta']['selectable'][K]['column']['operators'][O]['_opType'];
     } | {
@@ -1861,22 +1833,22 @@ type WhereArg<T extends PickQueryMetaRelations> = {
  * ```
  */
 type WhereQueryBuilder<T extends PickQueryRelations> = EmptyObject extends T['relations'] ? {
-    [K in keyof T]: K extends keyof QueryBase | keyof Where | keyof ExpressionMethods | 'sql' | 'get' | 'ref' | 'columnTypes' ? T[K] : never;
+    [K in keyof T]: K extends keyof Where | keyof ExpressionMethods | 'get' | 'columnTypes' | 'meta' | 'relations' ? T[K] : never;
 } : {
-    [K in keyof T]: K extends keyof T['relations'] ? T['relations'][K] : K extends keyof QueryBase | keyof Where | keyof ExpressionMethods | 'sql' | 'get' | 'ref' | 'columnTypes' ? T[K] : never;
+    [K in keyof T['relations'] | keyof T]: K extends keyof T['relations'] ? T['relations'][K] : K extends keyof T & (keyof Where | keyof ExpressionMethods | 'get' | 'columnTypes' | 'meta' | 'relations') ? T[K] : never;
 };
 type WhereArgs<T extends PickQueryMetaRelations> = WhereArg<T>[];
 type WhereNotArgs<T extends PickQueryMetaRelations> = [WhereArg<T>];
 type WhereInColumn<T extends PickQueryMetaRelations> = keyof T['meta']['selectable'] | [keyof T['meta']['selectable'], ...(keyof T['meta']['selectable'])[]];
-type WhereInValues<T extends PickQueryMetaRelations, Column> = Column extends keyof T['meta']['selectable'] ? T['meta']['selectable'][Column]['column']['queryType'][] | Query | Expression : ({
+type WhereInValues<T extends PickQueryMetaRelations, Column> = Column extends keyof T['meta']['selectable'] ? T['meta']['selectable'][Column]['column']['queryType'][] | IsQuery | Expression : ({
     [I in keyof Column]: Column[I] extends keyof T['meta']['selectable'] ? T['meta']['selectable'][Column[I]]['column']['queryType'] : never;
 } & {
     length: Column extends {
         length: number;
     } ? Column['length'] : never;
-})[] | Query | Expression;
+})[] | IsQuery | Expression;
 type WhereInArg<T extends PickQueryMeta> = {
-    [K in keyof T['meta']['selectable']]?: T['meta']['selectable'][K]['column']['queryType'][] | Query | Expression;
+    [K in keyof T['meta']['selectable']]?: T['meta']['selectable'][K]['column']['queryType'][] | IsQuery | Expression;
 };
 type WhereResult<T> = T & QueryMetaHasWhere;
 interface QueryMetaHasWhere {
@@ -1920,7 +1892,7 @@ declare const _queryOrNot: <T extends PickQueryMetaRelations>(q: T, args: WhereA
 /**
  * Mutative {@link Where.prototype.whereIn}
  */
-declare const _queryWhereIn: <T>(q: T, and: boolean, arg: unknown, values: unknown[] | unknown[][] | Query | Expression | undefined, not?: boolean) => WhereResult<T>;
+declare const _queryWhereIn: <T>(q: T, and: boolean, arg: unknown, values: unknown[] | unknown[][] | IsQuery | Expression | undefined, not?: boolean) => WhereResult<T>;
 /**
  * Mutative {@link Where.prototype.whereExists}
  */
@@ -2545,7 +2517,8 @@ declare class Where {
 interface ScopeArgumentQueryMeta<Table extends string | undefined, Shape extends QueryColumns> extends QueryMetaBase {
     selectable: SelectableFromShape<Shape, Table>;
 }
-interface ScopeArgumentQuery<Table extends string | undefined, Shape extends QueryColumns> extends Where, QueryBase {
+interface ScopeArgumentQuery<Table extends string | undefined, Shape extends QueryColumns> extends Where, PickQueryMetaShapeRelationsWithData {
+    __isQuery: true;
     table: Table;
     shape: Shape;
     meta: ScopeArgumentQueryMeta<Table, Shape>;
@@ -3221,7 +3194,7 @@ interface DefaultSchemaConfig extends ColumnSchemaConfig<ColumnType> {
 declare const defaultSchemaConfig: DefaultSchemaConfig;
 
 type SoftDeleteOption<Shape extends QueryColumns> = true | keyof Shape;
-interface QueryWithSoftDelete extends PickQueryResult {
+interface QueryWithSoftDelete extends PickQueryMetaResultReturnType {
     meta: QueryMetaBase<{
         nonDeleted: true;
     }>;
@@ -3345,7 +3318,7 @@ interface DbTableOptions<ColumnTypes, Table extends string | undefined, Shape ex
  * See {@link ScopeMethods}
  */
 type DbTableOptionScopes<Table extends string | undefined, Shape extends QueryColumns, Keys extends string = string> = {
-    [K in Keys]: (q: ScopeArgumentQuery<Table, Shape>) => QueryBase;
+    [K in Keys]: (q: ScopeArgumentQuery<Table, Shape>) => IsQuery;
 };
 type QueryDefaultReturnData<Shape extends QueryColumnsInit> = {
     [K in DefaultSelectColumns<Shape>]: Shape[K]['outputType'];
@@ -3361,12 +3334,22 @@ interface TableMeta<Table extends string | undefined, Shape extends QueryColumns
     defaultSelect: DefaultSelectColumns<Shape>;
 }
 declare const anyShape: QueryColumnsInit;
-interface Db<Table extends string | undefined = undefined, Shape extends QueryColumnsInit = QueryColumnsInit, PrimaryKeys = never, UniqueColumns = never, UniqueColumnTuples = never, UniqueConstraints = never, ColumnTypes = DefaultColumnTypes<ColumnSchemaConfig>, ShapeWithComputed extends QueryColumnsInit = Shape, Scopes extends RecordUnknown | undefined = EmptyObject> extends DbBase<Adapter, Table, Shape, ColumnTypes, ShapeWithComputed>, QueryMethods<ColumnTypes>, QueryBase {
-    result: Pick<Shape, DefaultSelectColumns<Shape>>;
+declare class Db<Table extends string | undefined = undefined, Shape extends QueryColumnsInit = QueryColumnsInit, PrimaryKeys = never, UniqueColumns = never, UniqueColumnTuples = never, UniqueConstraints = never, ColumnTypes = DefaultColumnTypes<ColumnSchemaConfig>, ShapeWithComputed extends QueryColumnsInit = Shape, Scopes extends RecordUnknown | undefined = EmptyObject> extends QueryMethods<ColumnTypes> implements Query {
+    adapter: Adapter;
     queryBuilder: Db;
+    table: Table;
+    shape: ShapeWithComputed;
+    columnTypes: ColumnTypes;
+    q: QueryData;
+    __isQuery: true;
+    baseQuery: Query;
+    columns: (keyof Shape)[];
+    outputType: DefaultSelectOutput<Shape>;
+    inputType: ColumnShapeInput<Shape>;
+    result: Pick<Shape, DefaultSelectColumns<Shape>>;
     returnType: undefined;
     then: QueryThen<QueryDefaultReturnData<Shape>>;
-    windows: Query['windows'];
+    windows: EmptyObject;
     relations: EmptyObject;
     withData: EmptyObject;
     error: new (message: string, length: number, name: QueryErrorName) => QueryError<this>;
@@ -3377,13 +3360,6 @@ interface Db<Table extends string | undefined = undefined, Shape extends QueryCo
         [K in keyof Shape]: Shape[K]['data']['unique'] extends string ? K : never;
     }[keyof Shape] | keyof PrimaryKeys, UniqueColumnTuples, UniqueConstraints>;
     catch: QueryCatch;
-}
-declare class Db<Table extends string | undefined = undefined, Shape extends QueryColumnsInit = QueryColumnsInit, PrimaryKeys = never, UniqueColumns = never, UniqueColumnTuples = never, UniqueConstraints = never, ColumnTypes = DefaultColumnTypes<ColumnSchemaConfig>, ShapeWithComputed extends QueryColumnsInit = Shape> implements Query {
-    adapter: Adapter;
-    queryBuilder: Db;
-    table: Table;
-    shape: ShapeWithComputed;
-    columnTypes: ColumnTypes;
     constructor(adapter: Adapter, queryBuilder: Db, table: Table, shape: ShapeWithComputed, columnTypes: ColumnTypes, transactionStorage: AsyncLocalStorage<TransactionState>, options: DbTableOptions<ColumnTypes, Table, ShapeWithComputed>, tableData?: TableData);
     [inspect.custom](): string;
     /**
@@ -3568,7 +3544,7 @@ interface ToSQLQuery {
     q: Query['q'];
     queryBuilder: Query['queryBuilder'];
     table?: Query['table'];
-    internal: Query['internal'];
+    internal: QueryInternal;
     relations: Query['relations'];
     withData: Query['withData'];
     clone: Query['clone'];
@@ -3628,7 +3604,7 @@ type GetArg<T extends QueryGetSelf> = GetStringArg<T> | Expression;
 type GetStringArg<T extends PickQueryMeta> = keyof T['meta']['selectable'] & string;
 type GetResult<T extends QueryGetSelf, Arg extends GetArg<T>> = Arg extends string ? SetQueryReturnsValueOrThrow<T, Arg> : Arg extends Expression ? SetQueryReturnsColumnOrThrow<T, Arg['result']['value']> : never;
 type GetResultOptional<T extends QueryGetSelf, Arg extends GetArg<T>> = Arg extends string ? SetQueryReturnsValueOptional<T, Arg> : Arg extends Expression ? SetQueryReturnsColumnOptional<T, Arg['result']['value']> : never;
-declare const _getSelectableColumn: (q: Query, arg: string) => QueryColumn | undefined;
+declare const _getSelectableColumn: (q: IsQuery, arg: string) => QueryColumn | undefined;
 declare function _queryGet<T extends QueryGetSelf, Arg extends GetArg<T>>(self: T, arg: Arg): GetResult<T, Arg>;
 declare function _queryGetOptional<T extends QueryGetSelf, Arg extends GetArg<T>>(self: T, arg: Arg): GetResultOptional<T, Arg>;
 
@@ -4110,7 +4086,7 @@ declare abstract class AsMethods {
 
 type ClearStatement = 'with' | 'select' | 'where' | 'union' | 'using' | 'join' | 'group' | 'order' | 'having' | 'limit' | 'offset' | 'counters';
 declare class Clear {
-    clear<T extends Query>(this: T, ...clears: ClearStatement[]): T;
+    clear<T>(this: T, ...clears: ClearStatement[]): T;
 }
 
 interface CreateSelf extends PickQueryMetaResultRelationsWithDataReturnTypeShape, PickQueryUniqueProperties {
@@ -4153,8 +4129,8 @@ type CreateManyResult<T extends CreateSelf, BT> = T extends {
 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, 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'>;
+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>> : SetQueryReturnsRowCountMany<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'> : SetQueryReturnsRowCountMany<T, 'create'>;
 /**
  * When creating a record with a *belongs to* nested record,
  * un-nullify foreign key columns of the result.
@@ -4210,14 +4186,14 @@ declare const _queryCreateRaw: <T extends CreateSelf>(q: T, args: CreateRawArgs<
 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, CreateBelongsToData<T>>, keyof Q['result']>) => CreateRawOrFromResult<T>;
-declare const _queryInsertFrom: <T extends CreateSelf, Q extends Query & {
+interface QueryReturningOne extends IsQuery {
+    result: QueryColumns;
     returnType: 'one' | 'oneOrThrow';
-}>(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 _queryCreateFrom: <T extends CreateSelf, Q extends QueryReturningOne>(q: T, query: Q, data?: Omit<CreateData<T, CreateBelongsToData<T>>, keyof Q['result']>) => CreateRawOrFromResult<T>;
+declare const _queryInsertFrom: <T extends CreateSelf, Q extends QueryReturningOne>(q: T, query: Q, data?: Omit<CreateData<T, CreateBelongsToData<T>>, keyof Q['result']>) => InsertRawOrFromResult<T>;
+declare const _queryCreateManyFrom: <T extends CreateSelf>(q: T, query: IsQuery) => CreateManyRawOrFromResult<T>;
+declare const _queryInsertManyFrom: <T extends CreateSelf>(q: T, query: IsQuery) => InsertManyRawOrFromResult<T>;
 declare const _queryDefaults: <T extends CreateSelf, Data extends Partial<CreateData<T, CreateBelongsToData<T>>>>(q: T, data: Data) => AddQueryDefaults<T, { [K in keyof Data]: true; }>;
 /**
  * Names of all create methods,
@@ -4406,18 +4382,14 @@ declare class Create {
      * @param query - query to create new records from
      * @param data - additionally you can set some columns
      */
-    createFrom<T extends CreateSelf, Q extends Query & {
-        returnType: 'one' | 'oneOrThrow';
-    }>(this: T, query: Q, data?: Omit<CreateData<T, CreateBelongsToData<T>>, keyof Q['result']>): CreateRawOrFromResult<T>;
+    createFrom<T extends CreateSelf, Q extends QueryReturningOne>(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.
      *
      * @param query - query to create new records from
      * @param data - additionally you can set some columns
      */
-    insertFrom<T extends CreateSelf, Q extends Query & {
-        returnType: 'one' | 'oneOrThrow';
-    }>(this: T, query: Q, data?: Omit<CreateData<T, CreateBelongsToData<T>>, keyof Q['result']>): InsertRawOrFromResult<T>;
+    insertFrom<T extends CreateSelf, Q extends QueryReturningOne>(this: T, query: Q, data?: Omit<CreateData<T, CreateBelongsToData<T>>, keyof Q['result']>): InsertRawOrFromResult<T>;
     /**
      * Similar to `createFrom`, but intended to create many records.
      *
@@ -4431,13 +4403,13 @@ declare class Create {
      *
      * @param query - query to create new records from
      */
-    createManyFrom<T extends CreateSelf>(this: T, query: Query): CreateManyRawOrFromResult<T>;
+    createManyFrom<T extends CreateSelf>(this: T, query: IsQuery): 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): InsertManyRawOrFromResult<T>;
+    insertManyFrom<T extends CreateSelf>(this: T, query: IsQuery): InsertManyRawOrFromResult<T>;
     /**
      * `defaults` allows setting values that will be used later in `create`.
      *
@@ -4688,8 +4660,8 @@ declare class OnConflictQueryBuilder<T extends CreateSelf, Arg extends OnConflic
 
 type DeleteMethodsNames = 'delete';
 type DeleteArgs<T extends PickQueryMetaResult> = T['meta']['hasWhere'] extends true ? EmptyTuple : [never];
-type DeleteResult<T extends PickQueryMetaResult> = T['meta']['hasSelect'] extends true ? SetQueryKind<T, 'delete'> : SetQueryReturnsRowCount<T, 'delete'>;
-declare const _queryDelete: <T extends PickQueryMetaResult>(query: T) => DeleteResult<T>;
+type DeleteResult<T extends PickQueryMetaResultReturnType> = T['meta']['hasSelect'] extends true ? SetQueryKind<T, 'delete'> : T['returnType'] extends undefined | 'all' ? SetQueryReturnsRowCountMany<T, 'delete'> : SetQueryReturnsRowCount<T, 'delete'>;
+declare const _queryDelete: <T extends PickQueryMetaResultReturnType>(query: T) => DeleteResult<T>;
 declare class Delete {
     /**
      * This method deletes one or more rows, based on other conditions specified in the query.
@@ -4750,7 +4722,7 @@ declare class Delete {
      *   .from('b');
      * ```
      */
-    delete<T extends PickQueryMetaResult>(this: T, ..._args: DeleteArgs<T>): DeleteResult<T>;
+    delete<T extends PickQueryMetaResultReturnType>(this: T, ..._args: DeleteArgs<T>): DeleteResult<T>;
 }
 
 type ForQueryBuilder<Q> = Q & {
@@ -4947,7 +4919,7 @@ declare class Having {
      *
      * @param args - raw SQL template string or one or multiple callbacks returning a boolean expression
      */
-    having<T extends Query>(this: T, ...args: HavingArgFn<T>[]): T;
+    having<T>(this: T, ...args: HavingArgFn<T>[]): T;
     /**
      * Provide SQL expression for the `HAVING` SQL statement:
      *
@@ -4957,7 +4929,7 @@ declare class Having {
      *
      * @param args - SQL expression
      */
-    havingSql<T extends Query>(this: T, ...args: SQLQueryArgs): T;
+    havingSql<T>(this: T, ...args: SQLQueryArgs): T;
 }
 
 declare const commitSql: SingleSqlItem;
@@ -5346,7 +5318,7 @@ type MergeQueryResult<T extends PickQueryMetaResult, Q extends PickQueryMetaResu
     [K in keyof T['result'] | keyof Q['result']]: K extends keyof Q['result'] ? Q['result'][K] : T['result'][K];
 } : T['result'] : Q['result'];
 declare class MergeQueryMethods {
-    merge<T extends Query, Q extends Query>(this: T, q: Q): MergeQuery<T, Q>;
+    merge<T extends PickQueryMetaResultReturnTypeWithDataWindows, Q extends PickQueryMetaResultReturnTypeWithDataWindows>(this: T, q: Q): MergeQuery<T, Q>;
 }
 
 interface SelectSelf {
@@ -5361,7 +5333,7 @@ type SelectArg<T extends SelectSelf> = '*' | keyof T['meta']['selectable'];
 type SelectArgs<T extends SelectSelf> = ('*' | keyof T['meta']['selectable'])[];
 interface SelectAsArg<T extends SelectSelf> {
     [K: string]: keyof T['meta']['selectable'] | Expression | ((q: EmptyObject extends T['relations'] ? T : {
-        [K in keyof T]: K extends keyof T['relations'] ? T[K] extends (...args: any[]) => any ? ReturnType<T[K]> : never : T[K];
+        [K in keyof T['relations'] | keyof T]: K extends keyof T['relations'] ? T['relations'][K]['relationConfig']['maybeSingle'] : K extends keyof T ? T[K] : never;
     }) => unknown);
 }
 type SelectAsFnReturnType = {
@@ -5371,25 +5343,26 @@ type SelectAsFnReturnType = {
 interface SelectAsCheckReturnTypes {
     [K: string]: PropertyKey | Expression | ((q: never) => SelectAsFnReturnType);
 }
+type SelectReturnType<T extends PickQueryReturnType> = T['returnType'] extends 'valueOrThrow' ? 'oneOrThrow' : T extends 'value' ? 'one' : T['returnType'] extends 'pluck' ? 'all' : T['returnType'];
 type SelectResult<T extends SelectSelf, Columns extends PropertyKey[]> = {
     [K in keyof T]: K extends 'result' ? ('*' extends Columns[number] ? {
         [K in Columns[number] | T['meta']['defaultSelect'] as K extends '*' ? never : T['meta']['selectable'][K]['as']]: T['meta']['selectable'][K]['column'];
     } : {
         [K in Columns[number] as T['meta']['selectable'][K]['as']]: T['meta']['selectable'][K]['column'];
-    }) & (T['meta']['hasSelect'] extends true ? Omit<T['result'], Columns[number]> : unknown) : K extends 'then' ? QueryThen<GetQueryResult<T, ('*' extends Columns[number] ? {
+    }) & (T['meta']['hasSelect'] extends (T['returnType'] extends 'value' | 'valueOrThrow' ? never : true) ? Omit<T['result'], Columns[number]> : unknown) : K extends 'returnType' ? SelectReturnType<T> : K extends 'then' ? QueryThen<QueryResultByReturnType<SelectReturnType<T>, ('*' extends Columns[number] ? {
         [K in Exclude<Columns[number], '*'> | T['meta']['defaultSelect'] as T['meta']['selectable'][K]['as']]: T['meta']['selectable'][K]['column'];
     } : {
         [K in Columns[number] as T['meta']['selectable'][K]['as']]: T['meta']['selectable'][K]['column'];
-    }) & (T['meta']['hasSelect'] extends true ? Omit<T['result'], Columns[number]> : unknown)>> : T[K];
+    }) & (T['meta']['hasSelect'] extends (T['returnType'] extends 'value' | 'valueOrThrow' ? never : true) ? Omit<T['result'], Columns[number]> : unknown)>> : T[K];
 } & QueryMetaHasSelect;
 type SelectResultObj<T extends SelectSelf, Obj> = Obj extends SelectAsCheckReturnTypes ? {
     [K in keyof T]: K extends 'meta' ? T['meta'] & {
         hasSelect: true;
         selectable: SelectAsSelectable<Obj>;
     } : K extends 'result' ? {
-        [K in T['meta']['hasSelect'] extends true ? keyof Obj | keyof T['result'] : keyof Obj]: K extends keyof Obj ? SelectAsValueResult<T, Obj[K]> : K extends keyof T['result'] ? T['result'][K] : never;
-    } : K extends 'then' ? QueryThen<GetQueryResult<T, {
-        [K in T['meta']['hasSelect'] extends true ? keyof Obj | keyof T['result'] : keyof Obj]: K extends keyof Obj ? SelectAsValueResult<T, Obj[K]> : K extends keyof T['result'] ? T['result'][K] : never;
+        [K in T['meta']['hasSelect'] extends (T['returnType'] extends 'value' | 'valueOrThrow' ? never : true) ? keyof Obj | keyof T['result'] : keyof Obj]: K extends keyof Obj ? SelectAsValueResult<T, Obj[K]> : K extends keyof T['result'] ? T['result'][K] : never;
+    } : K extends 'returnType' ? SelectReturnType<T> : K extends 'then' ? QueryThen<QueryResultByReturnType<SelectReturnType<T>, {
+        [K in T['meta']['hasSelect'] extends (T['returnType'] extends 'value' | 'valueOrThrow' ? never : true) ? keyof Obj | keyof T['result'] : keyof Obj]: K extends keyof Obj ? SelectAsValueResult<T, Obj[K]> : K extends keyof T['result'] ? T['result'][K] : never;
     }>> : T[K];
 } : `Invalid return type of ${{
     [K in keyof Obj]: Obj[K] extends (...args: any[]) => any ? ReturnType<Obj[K]> extends SelectAsFnReturnType ? never : K : never;
@@ -5401,9 +5374,9 @@ type SelectResultColumnsAndObj<T extends SelectSelf, Columns extends PropertyKey
     } : K extends 'result' ? // Combine previously selected items, all columns if * was provided,
     {
         [K in ('*' extends Columns[number] ? Exclude<Columns[number], '*'> | T['meta']['defaultSelect'] : Columns[number]) | keyof Obj as K extends Columns[number] ? T['meta']['selectable'][K]['as'] : K]: K extends keyof Obj ? SelectAsValueResult<T, Obj[K]> : T['meta']['selectable'][K]['column'];
-    } & (T['meta']['hasSelect'] extends true ? Omit<T['result'], Columns[number]> : unknown) : K extends 'then' ? QueryThen<GetQueryResult<T, {
+    } & (T['meta']['hasSelect'] extends (T['returnType'] extends 'value' | 'valueOrThrow' ? never : true) ? Omit<T['result'], Columns[number]> : unknown) : K extends 'returnType' ? SelectReturnType<T> : K extends 'then' ? QueryThen<QueryResultByReturnType<SelectReturnType<T>, {
         [K in ('*' extends Columns[number] ? Exclude<Columns[number], '*'> | T['meta']['defaultSelect'] : Columns[number]) | keyof Obj as K extends Columns[number] ? T['meta']['selectable'][K]['as'] : K]: K extends keyof Obj ? SelectAsValueResult<T, Obj[K]> : T['meta']['selectable'][K]['column'];
-    } & (T['meta']['hasSelect'] extends true ? Omit<T['result'], Columns[number]> : unknown)>> : T[K];
+    } & (T['meta']['hasSelect'] extends (T['returnType'] extends 'value' | 'valueOrThrow' ? never : true) ? Omit<T['result'], Columns[number]> : unknown)>> : T[K];
 };
 type SelectAsSelectable<Arg> = {
     [K in keyof Arg]: Arg[K] extends (q: never) => {
@@ -5423,7 +5396,7 @@ type SelectAsSelectable<Arg> = {
         };
     } : never;
 }[keyof Arg];
-type SelectAsValueResult<T extends SelectSelf, Arg> = Arg extends keyof T['meta']['selectable'] ? T['meta']['selectable'][Arg]['column'] : Arg extends Expression ? Arg['result']['value'] : Arg extends (q: never) => QueryBase ? SelectSubQueryResult<ReturnType<Arg>> : Arg extends (q: never) => Expression ? ReturnType<Arg>['result']['value'] : Arg extends (q: never) => QueryBase | Expression ? SelectSubQueryResult<Exclude<ReturnType<Arg>, Expression>> | Exclude<ReturnType<Arg>, QueryBase>['result']['value'] : never;
+type SelectAsValueResult<T extends SelectSelf, Arg> = Arg extends keyof T['meta']['selectable'] ? T['meta']['selectable'][Arg]['column'] : Arg extends Expression ? Arg['result']['value'] : Arg extends (q: never) => IsQuery ? SelectSubQueryResult<ReturnType<Arg>> : Arg extends (q: never) => Expression ? ReturnType<Arg>['result']['value'] : Arg extends (q: never) => IsQuery | Expression ? SelectSubQueryResult<Exclude<ReturnType<Arg>, Expression>> | Exclude<ReturnType<Arg>, IsQuery>['result']['value'] : never;
 type SelectSubQueryResult<Arg extends SelectSelf> = Arg['returnType'] extends undefined | 'all' ? ColumnsShapeToObjectArray<Arg['result']> : Arg['returnType'] extends 'value' | 'valueOrThrow' ? Arg['result']['value'] : Arg['returnType'] extends 'pluck' ? ColumnsShapeToPluck<Arg['result']> : Arg['returnType'] extends 'one' ? ColumnsShapeToNullableObject<Arg['result']> : ColumnsShapeToObject<Arg['result']>;
 declare const addParserForRawExpression: (q: PickQueryQ, key: string | getValueKey, raw: Expression) => void;
 interface QueryBatchResult {
@@ -5434,7 +5407,7 @@ interface QueryBatchResult {
 declare const addParserForSelectItem: <T extends PickQueryMeta>(q: T, as: string | getValueKey | undefined, key: string, arg: SelectableOrExpression<T> | Query, joinQuery?: boolean) => string | Expression | Query | undefined;
 declare const processSelectArg: <T extends SelectSelf>(q: T, as: string | undefined, arg: SelectArg<T>, columnAs?: string | getValueKey) => SelectItem | undefined | false;
 declare const setParserForSelectedString: (q: PickQueryQAndInternal, arg: string, as: string | getValueKey | undefined, columnAs?: string | getValueKey) => string | undefined;
-declare const getShapeFromSelect: (q: QueryBase, isSubQuery?: boolean) => QueryColumns;
+declare const getShapeFromSelect: (q: IsQuery, isSubQuery?: boolean) => QueryColumns;
 declare function _querySelect<T extends SelectSelf, Columns extends SelectArgs<T>>(q: T, columns: Columns): SelectResult<T, Columns>;
 declare function _querySelect<T extends SelectSelf, Obj extends SelectAsArg<T>>(q: T, obj: Obj): SelectResultObj<T, Obj>;
 declare function _querySelect<T extends SelectSelf, Columns extends SelectArgs<T>, Obj extends SelectAsArg<T>>(q: T, args: [...columns: Columns, obj: Obj]): SelectResultColumnsAndObj<T, Columns, Obj>;
@@ -5781,8 +5754,8 @@ declare class WithMethods {
      *   .select('firstTable.column', 'secondTable.column');
      * ```
      */
-    with<T extends PickQueryMetaWithDataColumnTypes, Name extends string, Q>(this: T, name: Name, query: Q | ((q: WithQueryBuilder<T>) => Q)): WithResult<T, Name, Q extends Query ? Q : never>;
-    with<T extends PickQueryMetaWithDataColumnTypes, Name extends string, Q extends Query>(this: T, name: Name, options: WithArgsOptions, query: Q | ((q: WithQueryBuilder<T>) => Q)): WithResult<T, Name, Q>;
+    with<T extends PickQueryMetaWithDataColumnTypes, Name extends string, Q>(this: T, name: Name, query: Q | ((q: WithQueryBuilder<T>) => Q)): WithResult<T, Name, Q extends PickQueryResult ? Q : never>;
+    with<T extends PickQueryMetaWithDataColumnTypes, Name extends string, Q extends PickQueryResult>(this: T, name: Name, options: WithArgsOptions, query: Q | ((q: WithQueryBuilder<T>) => Q)): WithResult<T, Name, Q>;
     /**
      * It is priceless for fetching tree-like structures, or any other recursive cases.
      *
@@ -5866,12 +5839,12 @@ declare class WithMethods {
      *   .where({ n: { gt: 10 } });
      * ```
      */
-    withRecursive<T extends PickQueryMetaWithDataColumnTypes, Name extends string, Q extends Query, Result = WithResult<T, Name, Q>>(this: T, name: Name, base: Q | ((qb: WithQueryBuilder<T>) => Q), recursive: (qb: {
+    withRecursive<T extends PickQueryMetaWithDataColumnTypes, Name extends string, Q extends PickQueryResult, Result = WithResult<T, Name, Q>>(this: T, name: Name, base: Q | ((qb: WithQueryBuilder<T>) => Q), recursive: (qb: {
         [K in keyof Result]: K extends 'result' ? Q['result'] : Result[K];
-    }) => Query): Result;
-    withRecursive<T extends PickQueryMetaWithDataColumnTypes, Name extends string, Q extends Query, Result = WithResult<T, Name, Q>>(this: T, name: Name, options: WithRecursiveOptions, base: Q | ((qb: WithQueryBuilder<T>) => Q), recursive: (qb: {
+    }) => PickQueryResult): Result;
+    withRecursive<T extends PickQueryMetaWithDataColumnTypes, Name extends string, Q extends PickQueryResult, Result = WithResult<T, Name, Q>>(this: T, name: Name, options: WithRecursiveOptions, base: Q | ((qb: WithQueryBuilder<T>) => Q), recursive: (qb: {
         [K in keyof Result]: K extends 'result' ? Q['result'] : Result[K];
-    }) => Query): Result;
+    }) => PickQueryResult): Result;
     /**
      * Use `withSql` to add a Common Table Expression (CTE) based on a custom SQL.
      *
@@ -5936,7 +5909,7 @@ type UnionArgs<T extends PickQueryResult> = ({
         };
     };
 } | ((q: T) => Expression))[];
-declare const _queryUnion: <T extends Query>(base: T, args: UnionArgs<T>, k: UnionKind) => T;
+declare const _queryUnion: <T extends PickQueryResult>(base: T, args: UnionArgs<T>, k: UnionKind) => T;
 declare class Union {
     /**
      * Creates a union query, takes one or more queries or SQL expressions.
@@ -6035,11 +6008,13 @@ type UpdateData<T extends UpdateSelf> = EmptyObject extends T['relations'] ? {
 } : {
     [K in keyof T['inputType'] | keyof T['relations']]?: K extends keyof T['inputType'] ? UpdateColumn<T, K> : UpdateRelationData<T, T['relations'][K]['relationConfig']>;
 };
-type UpdateColumn<T extends UpdateSelf, Key extends keyof T['inputType']> = T['inputType'][Key] | QueryOrExpression<T['inputType'][Key]> | ((q: T) => QueryOrExpression<T['inputType'][Key]>);
+type UpdateColumn<T extends UpdateSelf, Key extends keyof T['inputType']> = T['inputType'][Key] | QueryOrExpression<T['inputType'][Key]> | ((q: {
+    [K in keyof T['relations'] | keyof T]: K extends keyof T['relations'] ? T['relations'][K] : K extends keyof T ? T[K] : never;
+}) => QueryOrExpression<T['inputType'][Key]>);
 type UpdateRelationData<T extends UpdateSelf, Rel extends RelationConfigBase> = T['returnType'] extends undefined | 'all' ? Rel['dataForUpdate'] : Rel['dataForUpdateOne'];
 type UpdateArg<T extends UpdateSelf> = T['meta']['hasWhere'] extends true ? UpdateData<T> : never;
 type UpdateRawArgs<T extends UpdateSelf> = T['meta']['hasWhere'] extends true ? SQLQueryArgs : never;
-type UpdateResult<T extends UpdateSelf> = T['meta']['hasSelect'] extends true ? SetQueryKind<T, 'update'> : SetQueryReturnsRowCount<T, 'update'>;
+type UpdateResult<T extends UpdateSelf> = T['meta']['hasSelect'] extends true ? SetQueryKind<T, 'update'> : T['returnType'] extends undefined | 'all' ? SetQueryReturnsRowCountMany<T, 'update'> : SetQueryReturnsRowCount<T, 'update'>;
 type NumericColumns<T extends PickQueryShape> = {
     [K in keyof T['shape']]: Exclude<T['shape'][K]['queryType'], string> extends number | bigint | null ? K : never;
 }[keyof T['shape']];
@@ -6870,7 +6845,9 @@ declare class TransformMethods {
      *
      * @param fn - function to transform query result with
      */
-    transform<T extends Query, Result>(this: T, fn: (input: T['then'] extends QueryThen<infer Data> ? Data : never) => Result): {
+    transform<T extends IsQuery, Result>(this: T, fn: (input: T extends {
+        then: QueryThen<infer Data>;
+    } ? Data : never) => Result): {
         [K in keyof T]: K extends 'returnType' ? 'valueOrThrow' : K extends 'result' ? {
             value: QueryColumn<Result>;
         } : K extends 'then' ? QueryThen<Result> : T[K];
@@ -6918,7 +6895,11 @@ declare class QueryMap {
      *
      * @param fn - function to transform an individual record
      */
-    map<T extends Query, Result>(this: T, fn: (input: T['returnType'] extends undefined | 'all' | 'pluck' ? T['then'] extends QueryThen<(infer Data)[]> ? Data : never : T['then'] extends QueryThen<infer Data | undefined> ? Data : never) => Result): Result extends RecordUnknown ? {
+    map<T extends PickQueryReturnType, Result>(this: T, fn: (input: T['returnType'] extends undefined | 'all' | 'pluck' ? T extends {
+        then: QueryThen<(infer Data)[]>;
+    } ? Data : never : T extends {
+        then: QueryThen<infer Data | undefined>;
+    } ? Data : never) => Result): Result extends RecordUnknown ? {
         [K in keyof T]: K extends 'result' ? {
             [K in keyof Result]: QueryColumn<Result[K]>;
         } : K extends 'then' ? QueryThen<T['returnType'] extends undefined | 'all' ? Result[] : Result> : T[K];
@@ -6968,26 +6949,25 @@ interface QueryHelper<T extends PickQueryMetaShape, Args extends any[], Result>
         result: QueryColumns;
         windows: EmptyObject;
         withData: WithDataItems;
-    }>(q: Q, ...args: Args): Result extends Query ? MergeQuery<Q, Result> : Result;
+    }>(q: Q, ...args: Args): Result extends PickQueryMetaResultReturnTypeWithDataWindows ? MergeQuery<Q, Result> : Result;
     result: Result;
 }
-type QueryHelperResult<T extends QueryHelper<Query, any[], unknown>> = T['result'];
+type QueryHelperResult<T extends QueryHelper<PickQueryMetaShape, any[], unknown>> = T['result'];
 type NarrowTypeResult<T extends PickQueryMetaResultReturnType, Narrow> = {
     [K in keyof T['result']]: K extends keyof Narrow ? {
         [P in keyof T['result'][K]]: P extends 'outputType' ? Narrow[K] extends T['result'][K]['outputType'] ? Narrow[K] : `narrowType() error: passed type does not exist in '${K & string}'s type union` : T['result'][K][P];
     } : T['result'][K];
 };
 type WrapQueryArg = FromQuerySelf;
-declare const _queryAll: <T extends Query>(q: T) => SetQueryReturnsAll<T>;
-declare const _queryTake: <T extends PickQueryResult>(q: T) => SetQueryReturnsOne<T>;
-declare const _queryTakeOptional: <T extends PickQueryResult>(q: T) => SetQueryReturnsOneOptional<T>;
-declare const _queryExec: <T extends Query>(q: T) => never;
-declare const _queryFindBy: <T extends QueryBase<EmptyObject>>(q: T, args: WhereArgs<T>) => SetQueryReturnsOne<WhereResult<T>>;
-declare const _queryFindByOptional: <T extends QueryBase<EmptyObject>>(q: T, args: WhereArgs<T>) => SetQueryReturnsOneOptional<WhereResult<T>>;
-declare const _queryRows: <T extends Query>(q: T) => SetQueryReturnsRows<T>;
 interface QueryMethods<ColumnTypes> extends AsMethods, AggregateMethods, Select, FromMethods, Join, WithMethods, Union, JsonMethods, Create, Update, Delete, Transaction, For, Where, SearchMethods, Clear, Having, QueryLog, QueryHooks, QueryUpsertOrCreate, QueryGet, MergeQueryMethods, SqlMethod<ColumnTypes>, TransformMethods, QueryMap, ScopeMethods, SoftDeleteMethods, ExpressionMethods {
 }
 declare class QueryMethods<ColumnTypes> {
+    /**
+     * Clones the current query chain, useful for re-using partial query snippets in other queries without mutating the original.
+     *
+     * Used under the hood, and not really needed on the app side.
+     */
+    clone<T>(this: T): T;
     /**
      * `.all` is a default behavior, that returns an array of objects:
      *
@@ -7322,7 +7302,7 @@ declare class QueryMethods<ColumnTypes> {
      *
      * @param arg - offset number
      */
-    offset<T extends Query>(this: T, arg: number | undefined): T;
+    offset<T extends IsQuery>(this: T, arg: number | undefined): T;
     /**
      * Truncates the specified table.
      *
@@ -7452,7 +7432,7 @@ declare class QueryMethods<ColumnTypes> {
      *
      * @param fn - function to modify the query with. The result type will be merged with the main query as if the `merge` method was used.
      */
-    modify<T extends PickQueryMetaResultReturnTypeWithDataWindowsTable<string | undefined>, Arg extends PickQueryMetaResultReturnTypeWithDataWindowsTable<T['table']>, Result>(this: T, fn: (q: Arg) => Result): Result extends Query ? MergeQuery<T, Result> : Result;
+    modify<T extends PickQueryMetaResultReturnTypeWithDataWindowsTable<string | undefined>, Arg extends PickQueryMetaResultReturnTypeWithDataWindowsTable<T['table']>, Result>(this: T, fn: (q: Arg) => Result): Result extends PickQueryMetaResultReturnTypeWithDataWindows ? MergeQuery<T, Result> : Result;
     /**
      * Use `makeHelper` to make a query helper - a function where you can modify the query, and reuse this function across different places.
      *
@@ -7533,6 +7513,8 @@ declare class QueryMethods<ColumnTypes> {
     narrowType<T extends PickQueryMetaResultReturnType>(this: T): <Narrow>() => {
         [K in keyof T]: K extends 'result' ? NarrowTypeResult<T, Narrow> : K extends 'then' ? QueryThen<GetQueryResult<T, NarrowTypeResult<T, Narrow>>> : T[K];
     };
+    queryRelated<T extends PickQueryRelations, RelName extends keyof T['relations']>(this: T, relName: RelName, params: T['relations'][RelName]['relationConfig']['params']): T['relations'][RelName]['relationConfig']['maybeSingle'];
+    chain<T extends PickQueryMetaRelations, RelName extends keyof T['relations']>(this: T, relName: RelName): T['meta']['subQuery'] extends true ? T['relations'][RelName]['relationConfig']['maybeSingle'] : T['relations'][RelName]['relationConfig']['query'];
 }
 
 declare const queryMethodByReturnType: {
@@ -7582,6 +7564,7 @@ interface QueryInternal<SinglePrimaryKey = any, UniqueColumns = any, UniqueColum
     nowSQL?: string;
     primaryKeys?: string[];
     columnNameToKeyMap?: Map<string, string>;
+    callbackArg?: Query;
 }
 type SelectableFromShape<Shape extends QueryColumns, Table extends string | undefined> = {
     [K in keyof Shape]: {
@@ -7601,7 +7584,15 @@ interface WithDataItem {
 interface WithDataItems {
     [K: string]: WithDataItem;
 }
-interface Query extends QueryBase, QueryMethods<unknown> {
+interface Query extends QueryMethods<unknown> {
+    __isQuery: true;
+    result: QueryColumns;
+    table?: string;
+    withData: WithDataItems;
+    baseQuery: Query;
+    internal: QueryInternal;
+    meta: QueryMetaBase<EmptyObject>;
+    returnType: QueryReturnType;
     queryBuilder: Db;
     columnTypes: unknown;
     shape: QueryColumns;
@@ -7634,6 +7625,8 @@ interface PickQueryBaseQuery {
 }
 interface PickQueryMetaRelations extends PickQueryMeta, PickQueryRelations {
 }
+interface PickQueryMetaRelationsResult extends PickQueryMetaRelations, PickQueryResult {
+}
 interface PickQueryMetaResultRelations extends PickQueryResult, PickQueryMeta, PickQueryRelations {
 }
 interface PickQueryMetaResultRelationsWindows extends PickQueryMetaResultRelations, PickQueryWindows {
@@ -7687,12 +7680,10 @@ type SelectableOfType<T extends PickQueryMeta, Type> = {
     [K in keyof T['meta']['selectable']]: T['meta']['selectable'][K]['column']['type'] extends Type | null ? K : never;
 }[keyof T['meta']['selectable']];
 type SelectableOrExpressionOfType<T extends PickQueryMeta, C extends PickType> = SelectableOfType<T, C['type']> | Expression<QueryColumn<C['type'] | null>>;
-interface QueryWithTable extends Query {
-    table: string;
-}
 declare const queryTypeWithLimitOne: RecordKeyTrue;
 declare const isQueryReturnsAll: (q: Query) => boolean;
-type GetQueryResult<T extends PickQueryReturnType, Result extends QueryColumns> = T['returnType'] extends undefined | 'all' ? ColumnShapeOutput<Result>[] : T['returnType'] extends 'one' ? ColumnShapeOutput<Result> | undefined : T['returnType'] extends 'oneOrThrow' ? ColumnShapeOutput<Result> : T['returnType'] extends 'value' ? Result['value']['outputType'] | undefined : T['returnType'] extends 'valueOrThrow' ? Result['value']['outputType'] : T['returnType'] extends 'rows' ? ColumnShapeOutput<Result>[keyof Result][][] : T['returnType'] extends 'pluck' ? Result['pluck']['outputType'][] : T['returnType'] extends 'rowCount' ? number : void;
+type GetQueryResult<T extends PickQueryReturnType, Result extends QueryColumns> = T['returnType'] extends undefined | 'all' ? ColumnShapeOutput<Result>[] : T['returnType'] extends 'one' ? ColumnShapeOutput<Result> | undefined : T['returnType'] extends 'oneOrThrow' ? ColumnShapeOutput<Result> : T['returnType'] extends 'value' ? Result['value']['outputType'] | undefined : T['returnType'] extends 'valueOrThrow' ? Result['value']['outputType'] : T['returnType'] extends 'rows' ? ColumnShapeOutput<Result>[keyof Result][][] : T['returnType'] extends 'pluck' ? Result['pluck']['outputType'][] : void;
+type QueryResultByReturnType<ReturnType extends QueryReturnType, Result extends QueryColumns> = ReturnType extends undefined | 'all' ? ColumnShapeOutput<Result>[] : ReturnType extends 'one' ? ColumnShapeOutput<Result> | undefined : ReturnType extends 'oneOrThrow' ? ColumnShapeOutput<Result> : ReturnType extends 'value' ? Result['value']['outputType'] | undefined : ReturnType extends 'valueOrThrow' ? Result['value']['outputType'] : ReturnType extends 'rows' ? ColumnShapeOutput<Result>[keyof Result][][] : ReturnType extends 'pluck' ? Result['pluck']['outputType'][] : void;
 interface QueryMetaHasSelect {
     meta: {
         hasSelect: true;
@@ -7781,7 +7772,16 @@ type SetQueryReturnsColumnKindResult<T extends PickQueryMetaResult, Kind extends
 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];
-    } : K extends 'returnType' ? 'rowCount' : K extends 'then' ? QueryThen<number> : T[K];
+    } : K extends 'returnType' ? 'valueOrThrow' : K extends 'result' ? {
+        value: QueryColumn<number>;
+    } : K extends 'then' ? QueryThen<number> : T[K];
+};
+type SetQueryReturnsRowCountMany<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];
+    } : K extends 'returnType' ? 'pluck' : K extends 'result' ? {
+        pluck: QueryColumn<number>;
+    } : K extends 'then' ? QueryThen<number> : T[K];
 };
 type SetQueryReturnsVoid<T> = {
     [K in keyof T]: K extends 'returnType' ? 'void' : K extends 'then' ? QueryThen<void> : T[K];
@@ -8324,6 +8324,10 @@ declare const escapeForLog: (value: Value) => string;
 declare const escapeForMigration: (value: Value) => string;
 declare const escapeString: (value: string) => string;
 
+/**
+ * Call `.clone()` on a supposed query object
+ */
+declare const _clone: (q: unknown) => Query;
 /**
  * Push all elements of given array into the array in the query data,
  * set given array if there is no array yet in the query data.
@@ -8362,7 +8366,7 @@ declare const setQueryObjectValue: <T extends {
  */
 declare const throwIfNoWhere: (q: PickQueryQ, method: string) => void;
 declare const throwIfJoinLateral: (q: PickQueryQ, method: string) => void;
-declare const saveSearchAlias: (q: QueryBase, as: string, key: 'joinedShapes' | 'withShapes') => string;
+declare const saveSearchAlias: (q: IsQuery, as: string, key: 'joinedShapes' | 'withShapes') => string;
 /**
  * Extend query prototype with new methods.
  * The query and its data are cloned (with Object.create).
@@ -8372,6 +8376,13 @@ declare const saveSearchAlias: (q: QueryBase, as: string, key: 'joinedShapes' |
  */
 declare const extendQuery: <T extends PickQueryQAndBaseQuery, Methods extends RecordUnknown>(q: T, methods: Methods) => T & Methods;
 declare const getPrimaryKeys: (q: Query) => string[];
+declare const _queryAll: <T extends PickQueryResult>(q: T) => SetQueryReturnsAll<T>;
+declare const _queryTake: <T extends PickQueryResult>(q: T) => SetQueryReturnsOne<T>;
+declare const _queryTakeOptional: <T extends PickQueryResult>(q: T) => SetQueryReturnsOneOptional<T>;
+declare const _queryExec: <T extends IsQuery>(q: T) => never;
+declare const _queryFindBy: <T extends PickQueryMetaRelationsResult>(q: T, args: WhereArgs<T>) => SetQueryReturnsOne<WhereResult<T>>;
+declare const _queryFindByOptional: <T extends PickQueryMetaRelationsResult>(q: T, args: WhereArgs<T>) => SetQueryReturnsOneOptional<WhereResult<T>>;
+declare const _queryRows: <T extends PickQueryResult>(q: T) => SetQueryReturnsRows<T>;
 
 type Arg = {
     $queryBuilder: Query;
@@ -8495,4 +8506,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, AfterCommitError, AfterCommitErrorFulfilledResult, AfterCommitErrorRejectedResult, AfterCommitErrorResult, AfterHook, AggregateArgTypes, AggregateMethods, AggregateOptions, AliasOrTable, ArrayColumn, ArrayColumnValue, ArrayData, AsMethods, AsQueryArg, BigIntColumn, BigSerialColumn, BitColumn, BitVaryingColumn, BooleanColumn, BooleanQueryColumn, BoxColumn, ByteaColumn, ChangeCountArg, CidrColumn, CircleColumn, CitextColumn, Clear, ClearStatement, ColumnData, ColumnFromDbParams, ColumnInfoQueryData, ColumnRefExpression, ColumnType, ColumnsByType, ColumnsShape, ColumnsShapeToNullableObject, ColumnsShapeToObject, ColumnsShapeToObjectArray, ColumnsShapeToPluck, CommonQueryData, ComputedColumn, ComputedColumns, ComputedColumnsFromOptions, ComputedMethods, ComputedOptionsFactory, CopyOptions, CopyQueryData, Create, CreateBelongsToData, CreateColumn, CreateCtx, CreateData, CreateKind, CreateMethodsNames, CreateRelationsData, CreateRelationsDataOmittingFKeys, CreateResult, 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, ExpressionMethods, ExpressionOutput, FnExpression, FnExpressionArgs, FnExpressionArgsPairs, FnExpressionArgsValue, For, FromArg, FromMethods, FromQuerySelf, FromResult, GeneratorIgnore, GetArg, GetColumnInfo, GetQueryResult, GetResult, GetResultOptional, GetStringArg, GroupArgs, HandleResult, Having, HavingItem, HookAction, HookSelectArg, IdentityColumn, InetColumn, InsertQueryData, IntegerBaseColumn, IntegerColumn, IntervalColumn, IsolationLevel, JSONColumn, JSONTextColumn, Join, JoinArgToQuery, JoinArgs, JoinCallback, JoinFirstArg, JoinItem, JoinItemArgs, JoinLateralItem, JoinLateralResult, JoinQueryBuilder, JoinQueryMethod, JoinResult, JoinedParsers, JoinedShapes, JsonMethods, LimitedTextBaseColumn, LineColumn, LsegColumn, MacAddr8Column, MacAddrColumn, MapTableScopesOption, MergeQuery, MergeQueryMethods, MoneyColumn, MoreThanOneRowError, NoPrimaryKeyOption, NonUniqDataItem, NotFoundError, NumberAsStringBaseColumn, NumberBaseColumn, NumberColumnData, NumericColumns, OnConflictMerge, OnConflictQueryBuilder, OnConflictSet, OnConflictTarget, OnMethods, Operator, Operators, OperatorsAny, OperatorsArray, OperatorsBoolean, OperatorsDate, OperatorsJson, OperatorsNumber, OperatorsText, OperatorsTime, OrCreateArg, OrExpression, OrchidOrmError, OrchidOrmInternalError, OrderArg, OrderArgSelf, OrderArgs, OrderItem, OrderTsQueryConfig, Over, PathColumn, PickColumnData, PickQueryBaseQuery, PickQueryColumnTypes, PickQueryDataShapeAndJoinedShapes, PickQueryInternal, PickQueryMetaRelations, PickQueryMetaResultRelations, PickQueryMetaResultRelationsWindows, PickQueryMetaResultRelationsWindowsColumnTypes, PickQueryMetaResultRelationsWithDataReturnType, PickQueryMetaResultRelationsWithDataReturnTypeShape, PickQueryMetaResultReturnTypeWithDataWindows, PickQueryMetaResultReturnTypeWithDataWindowsTable, PickQueryMetaShapeRelationsWithData, PickQueryMetaTable, PickQueryMetaTableShape, PickQueryMetaTableShapeReturnTypeWithData, PickQueryMetaWithData, PickQueryMetaWithDataColumnTypes, PickQueryQ, PickQueryQAndBaseQuery, PickQueryQAndInternal, PickQueryRelations, PickQueryRelationsWithData, PickQueryResultColumnTypes, PickQueryShapeResultSinglePrimaryKey, PickQueryShapeSinglePrimaryKey, PickQuerySinglePrimaryKey, PickQueryWindows, PickQueryWithData, PickQueryWithDataColumnTypes, PointColumn, PolygonColumn, PostgisGeographyPointColumn, PostgisPoint, Query, QueryAfterHook, QueryArraysResult, QueryBase, QueryBaseThen, QueryBatchResult, QueryBeforeHook, QueryComputedArg, QueryData, QueryDataFromItem, QueryDataJoinTo, QueryDefaultReturnData, QueryError, QueryErrorName, QueryGet, QueryGetSelf, QueryHelperResult, QueryHooks, QueryInternal, QueryLog, QueryMetaHasSelect, QueryMetaHasWhere, QueryMethods, QueryOrExpression, QueryOrExpressionBooleanOrNullResult, QueryResult, QueryScopeData, QueryScopes, QuerySourceItem, QueryUpsertOrCreate, QueryWithTable, RawSQL, RealColumn, RecordOfColumnsShapeBase, RefExpression, RelationConfigBase, RelationConfigDataForCreate, RelationJoinQuery, RelationQuery, RelationQueryBase, RelationsBase, RuntimeComputedQueryColumn, SearchArg, SearchMethods, SearchWeight, SearchWeightRecord, Select, SelectArg, SelectArgs, SelectAs, SelectAsValue, SelectItem, SelectQueryData, SelectSubQueryResult, SelectableFromShape, SelectableOfType, SelectableOrExpression, SelectableOrExpressionOfType, SelectableOrExpressions, 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, ShapeColumnPrimaryKeys, ShapeUniqueColumns, SimpleJoinItem, SimpleJoinItemNonSubQueryArgs, SmallIntColumn, SmallSerialColumn, SortDir, SqlFn, SqlMethod, 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, UnionArgs, UnionItem, UnionKind, UnionSet, UniqueConstraints, UniqueQueryTypeOrExpression, UniqueTableDataItem, UnknownColumn, Update, UpdateArg, UpdateCtx, UpdateCtxCollect, UpdateData, UpdateQueryData, UpdateQueryDataItem, UpdateQueryDataObject, UpdateSelf, UpdatedAtDataInjector, UpsertResult, UpsertThis, VarCharColumn, VirtualColumn, Where, WhereArg, WhereArgs, WhereInArg, WhereInColumn, WhereInItem, WhereInValues, WhereItem, WhereJsonPathEqualsItem, WhereNotArgs, WhereOnItem, WhereOnJoinItem, WhereQueryBuilder, WhereResult, WhereSearchItem, WhereSearchResult, WindowArg, WindowArgDeclaration, WindowDeclaration, WindowItem, WithArgsOptions, WithConfigs, WithDataItem, WithDataItems, WithItem, WithMethods, WithOptions, WithQueryBuilder, WithRecursiveOptions, WithResult, WithSqlResult, WrapQueryArg, XMLColumn, _afterCommitError, _getSelectableColumn, _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, _queryResolveAlias, _queryRows, _querySelect, _queryTake, _queryTakeOptional, _queryUnion, _queryUpdate, _queryUpdateOrThrow, _queryUpdateRaw, _queryWhere, _queryWhereExists, _queryWhereIn, _queryWhereNot, _queryWhereNotOneOf, _queryWhereNotSql, _queryWhereOneOf, _queryWhereSql, addColumnParserToQuery, addParserForRawExpression, addParserForSelectItem, addQueryOn, anyShape, applyComputedColumns, checkIfASimpleQuery, cloneQuery, cloneQueryBaseUnscoped, columnCheckToCode, columnCode, columnForeignKeysToCode, columnIndexesToCode, columnsShapeToCode, commitSql, constraintInnerToCode, constraintToCode, copyTableData, countSelect, createDb, defaultSchemaConfig, escapeForLog, escapeForMigration, escapeString, extendQuery, filterResult, foreignKeyArgumentToCode, getClonedQueryData, getColumnInfo, getColumnTypes, getPrimaryKeys, getQueryAs, getShapeFromSelect, getSqlText, handleResult, identityToCode, indexInnerToCode, indexToCode, instantiateColumn, isDefaultTimeStamp, isQueryReturnsAll, isSelectingCount, joinSubQuery, logParamToLogObject, makeColumnTypes, makeColumnsByType, makeFnExpression, makeRegexToFindInSql, makeSQL, parseRecord, parseTableData, parseTableDataInput, postgisTypmodToSql, primaryKeyInnerToCode, processComputedBatches, processComputedResult, processSelectArg, pushLimitSQL, pushQueryArray, pushQueryOn, pushQueryOnForOuter, pushQueryOrOn, pushQueryValue, pushTableDataCode, queryFrom, queryFromSql, queryJson, queryMethodByReturnType, queryTypeWithLimitOne, queryWrap, raw, referencesArgsToCode, resolveSubQueryCallback, rollbackSql, saveSearchAlias, setColumnDefaultParse, setColumnEncode, setColumnParse, setColumnParseNull, setParserForSelectedString, setQueryObjectValue, setQueryOperators, simplifyColumnDefault, sqlFn, sqlQueryArgsToExpression, tableDataMethods, templateLiteralToSQL, testTransaction, throwIfJoinLateral, throwIfNoWhere, toSQL, toSQLCacheKey };
+export { Adapter, AdapterConfig, AdapterOptions, AddQueryDefaults, AfterCommitError, AfterCommitErrorFulfilledResult, AfterCommitErrorRejectedResult, AfterCommitErrorResult, AfterHook, AggregateArgTypes, AggregateMethods, AggregateOptions, AliasOrTable, ArrayColumn, ArrayColumnValue, ArrayData, AsMethods, AsQueryArg, BigIntColumn, BigSerialColumn, BitColumn, BitVaryingColumn, BooleanColumn, BooleanQueryColumn, BoxColumn, ByteaColumn, ChangeCountArg, CidrColumn, CircleColumn, CitextColumn, Clear, ClearStatement, ColumnData, ColumnFromDbParams, ColumnInfoQueryData, ColumnRefExpression, ColumnType, ColumnsByType, ColumnsShape, ColumnsShapeToNullableObject, ColumnsShapeToObject, ColumnsShapeToObjectArray, ColumnsShapeToPluck, CommonQueryData, ComputedColumn, ComputedColumns, ComputedColumnsFromOptions, ComputedMethods, ComputedOptionsFactory, CopyOptions, CopyQueryData, Create, CreateBelongsToData, CreateColumn, CreateCtx, CreateData, CreateKind, CreateMethodsNames, CreateRelationsData, CreateRelationsDataOmittingFKeys, CreateResult, 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, ExpressionMethods, ExpressionOutput, FnExpression, FnExpressionArgs, FnExpressionArgsPairs, FnExpressionArgsValue, For, FromArg, FromMethods, FromQuerySelf, FromResult, GeneratorIgnore, GetArg, GetColumnInfo, GetQueryResult, GetResult, GetResultOptional, GetStringArg, GroupArgs, HandleResult, Having, HavingItem, HookAction, HookSelectArg, IdentityColumn, InetColumn, InsertQueryData, IntegerBaseColumn, IntegerColumn, IntervalColumn, IsolationLevel, JSONColumn, JSONTextColumn, Join, JoinArgToQuery, JoinArgs, JoinCallback, JoinFirstArg, JoinItem, JoinItemArgs, JoinLateralItem, JoinLateralResult, JoinQueryBuilder, JoinQueryMethod, JoinResult, JoinedParsers, JoinedShapes, JsonMethods, LimitedTextBaseColumn, LineColumn, LsegColumn, MacAddr8Column, MacAddrColumn, MapTableScopesOption, MergeQuery, MergeQueryMethods, MoneyColumn, MoreThanOneRowError, NoPrimaryKeyOption, NonUniqDataItem, NotFoundError, NumberAsStringBaseColumn, NumberBaseColumn, NumberColumnData, NumericColumns, OnConflictMerge, OnConflictQueryBuilder, OnConflictSet, OnConflictTarget, OnMethods, Operator, Operators, OperatorsAny, OperatorsArray, OperatorsBoolean, OperatorsDate, OperatorsJson, OperatorsNumber, OperatorsText, OperatorsTime, OrCreateArg, OrExpression, OrchidOrmError, OrchidOrmInternalError, OrderArg, OrderArgSelf, OrderArgs, OrderItem, OrderTsQueryConfig, Over, PathColumn, PickColumnData, PickQueryBaseQuery, PickQueryColumnTypes, PickQueryDataShapeAndJoinedShapes, PickQueryInternal, PickQueryMetaRelations, PickQueryMetaRelationsResult, PickQueryMetaResultRelations, PickQueryMetaResultRelationsWindows, PickQueryMetaResultRelationsWindowsColumnTypes, PickQueryMetaResultRelationsWithDataReturnType, PickQueryMetaResultRelationsWithDataReturnTypeShape, PickQueryMetaResultReturnTypeWithDataWindows, PickQueryMetaResultReturnTypeWithDataWindowsTable, PickQueryMetaShapeRelationsWithData, PickQueryMetaTable, PickQueryMetaTableShape, PickQueryMetaTableShapeReturnTypeWithData, PickQueryMetaWithData, PickQueryMetaWithDataColumnTypes, PickQueryQ, PickQueryQAndBaseQuery, PickQueryQAndInternal, PickQueryRelations, PickQueryRelationsWithData, PickQueryResultColumnTypes, PickQueryShapeResultSinglePrimaryKey, PickQueryShapeSinglePrimaryKey, PickQuerySinglePrimaryKey, PickQueryWindows, PickQueryWithData, PickQueryWithDataColumnTypes, PointColumn, PolygonColumn, PostgisGeographyPointColumn, PostgisPoint, Query, QueryAfterHook, QueryArraysResult, QueryBatchResult, QueryBeforeHook, QueryComputedArg, QueryData, QueryDataFromItem, QueryDataJoinTo, QueryDefaultReturnData, QueryError, QueryErrorName, QueryGet, QueryGetSelf, QueryHelperResult, QueryHooks, QueryInternal, QueryLog, QueryMetaHasSelect, QueryMetaHasWhere, QueryMethods, QueryOrExpression, QueryOrExpressionBooleanOrNullResult, QueryResult, QueryResultByReturnType, QueryScopeData, QueryScopes, QuerySourceItem, QueryUpsertOrCreate, RawSQL, RealColumn, RecordOfColumnsShapeBase, RefExpression, RelationConfigBase, RelationConfigDataForCreate, RelationJoinQuery, RelationQueryBase, RelationsBase, RuntimeComputedQueryColumn, SearchArg, SearchMethods, SearchWeight, SearchWeightRecord, Select, SelectArg, SelectArgs, SelectAs, SelectAsValue, SelectItem, SelectQueryData, SelectSubQueryResult, SelectableFromShape, SelectableOfType, SelectableOrExpression, SelectableOrExpressionOfType, SelectableOrExpressions, SerialColumn, SerialColumnData, SetQueryKind, SetQueryKindResult, SetQueryReturnsAll, SetQueryReturnsAllKind, SetQueryReturnsAllKindResult, SetQueryReturnsColumnInfo, SetQueryReturnsColumnKind, SetQueryReturnsColumnKindResult, SetQueryReturnsColumnOptional, SetQueryReturnsColumnOrThrow, SetQueryReturnsOne, SetQueryReturnsOneKind, SetQueryReturnsOneKindResult, SetQueryReturnsOneOptional, SetQueryReturnsPluck, SetQueryReturnsPluckColumn, SetQueryReturnsPluckColumnKind, SetQueryReturnsPluckColumnKindResult, SetQueryReturnsRowCount, SetQueryReturnsRowCountMany, SetQueryReturnsRows, SetQueryReturnsValueOptional, SetQueryReturnsValueOrThrow, SetQueryReturnsVoid, SetQueryReturnsVoidKind, SetQueryTableAlias, ShapeColumnPrimaryKeys, ShapeUniqueColumns, SimpleJoinItem, SimpleJoinItemNonSubQueryArgs, SmallIntColumn, SmallSerialColumn, SortDir, SqlFn, SqlMethod, 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, UnionArgs, UnionItem, UnionKind, UnionSet, UniqueConstraints, UniqueQueryTypeOrExpression, UniqueTableDataItem, UnknownColumn, Update, UpdateArg, UpdateCtx, UpdateCtxCollect, UpdateData, UpdateQueryData, UpdateQueryDataItem, UpdateQueryDataObject, UpdateSelf, UpdatedAtDataInjector, UpsertResult, UpsertThis, VarCharColumn, VirtualColumn, Where, WhereArg, WhereArgs, WhereInArg, WhereInColumn, WhereInItem, WhereInValues, WhereItem, WhereJsonPathEqualsItem, WhereNotArgs, WhereOnItem, WhereOnJoinItem, WhereQueryBuilder, WhereResult, WhereSearchItem, WhereSearchResult, WindowArg, WindowArgDeclaration, WindowDeclaration, WindowItem, WithArgsOptions, WithConfigs, WithDataItem, WithDataItems, WithItem, WithMethods, WithOptions, WithQueryBuilder, WithRecursiveOptions, WithResult, WithSqlResult, WrapQueryArg, XMLColumn, _afterCommitError, _clone, _getSelectableColumn, _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, _queryResolveAlias, _queryRows, _querySelect, _queryTake, _queryTakeOptional, _queryUnion, _queryUpdate, _queryUpdateOrThrow, _queryUpdateRaw, _queryWhere, _queryWhereExists, _queryWhereIn, _queryWhereNot, _queryWhereNotOneOf, _queryWhereNotSql, _queryWhereOneOf, _queryWhereSql, addColumnParserToQuery, addParserForRawExpression, addParserForSelectItem, addQueryOn, anyShape, applyComputedColumns, checkIfASimpleQuery, cloneQuery, cloneQueryBaseUnscoped, columnCheckToCode, columnCode, columnForeignKeysToCode, columnIndexesToCode, columnsShapeToCode, commitSql, constraintInnerToCode, constraintToCode, copyTableData, countSelect, createDb, defaultSchemaConfig, escapeForLog, escapeForMigration, escapeString, extendQuery, filterResult, foreignKeyArgumentToCode, getClonedQueryData, getColumnInfo, getColumnTypes, getPrimaryKeys, getQueryAs, getShapeFromSelect, getSqlText, handleResult, identityToCode, indexInnerToCode, indexToCode, instantiateColumn, isDefaultTimeStamp, isQueryReturnsAll, isSelectingCount, joinSubQuery, logParamToLogObject, makeColumnTypes, makeColumnsByType, makeFnExpression, makeRegexToFindInSql, makeSQL, parseRecord, parseTableData, parseTableDataInput, postgisTypmodToSql, primaryKeyInnerToCode, processComputedBatches, processComputedResult, processSelectArg, pushLimitSQL, pushQueryArray, pushQueryOn, pushQueryOnForOuter, pushQueryOrOn, pushQueryValue, pushTableDataCode, queryFrom, queryFromSql, queryJson, queryMethodByReturnType, queryTypeWithLimitOne, queryWrap, raw, referencesArgsToCode, resolveSubQueryCallback, rollbackSql, saveSearchAlias, setColumnDefaultParse, setColumnEncode, setColumnParse, setColumnParseNull, setParserForSelectedString, setQueryObjectValue, setQueryOperators, simplifyColumnDefault, sqlFn, sqlQueryArgsToExpression, tableDataMethods, templateLiteralToSQL, testTransaction, throwIfJoinLateral, throwIfNoWhere, toSQL, toSQLCacheKey };