pqb 0.11.26 → 0.11.28

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import * as orchid_core from 'orchid-core';
-import { Sql, QueryBaseCommon, ColumnsShapeBase, QueryInternal, QueryMetaBase, EmptyObject, RawExpression, ColumnTypeBase, MaybeArray, QueryResultRow, AdapterBase, QueryInput, StringKey, ColumnOutput, NullableColumn, EmptyTuple, ColumnTypesBase, DbBase, ThenResult, ColumnShapeOutput, DefaultSelectColumns, SetOptional, Spread, CoalesceString, QueryCommon, BaseNumberData, Code, ColumnWithDefault, numberTypeMethods, BaseStringData, PrimaryKeyColumn, DateColumnData, EncodeColumn, ParseColumn, dateTypeMethods, JSONTypeAny, record, ArrayMethodsData, arrayMethods, name, ColumnDataBase, BaseOperators, HiddenColumn, ValidationContext, MessageParam } from 'orchid-core';
+import { Sql, QueryBaseCommon, ColumnsShapeBase, QueryInternal, QueryMetaBase, EmptyObject, RawExpression, ColumnTypeBase, MaybeArray, QueryResultRow, AdapterBase, QueryInput, StringKey, ColumnOutput, QueryThen, QueryCatch, NullableColumn, EmptyTuple, ColumnTypesBase, ColumnShapeOutput, DefaultSelectColumns, DbBase, SetOptional, Spread, CoalesceString, QueryCommon, BaseNumberData, Code, ColumnWithDefault, numberTypeMethods, BaseStringData, PrimaryKeyColumn, DateColumnData, EncodeColumn, ParseColumn, dateTypeMethods, JSONTypeAny, record, ArrayMethodsData, arrayMethods, name, ColumnDataBase, BaseOperators, HiddenColumn, ValidationContext, MessageParam } from 'orchid-core';
 import { PoolConfig, Pool, PoolClient } from 'pg';
 import { inspect } from 'util';
 import { AsyncLocalStorage } from 'node:async_hooks';
@@ -25,7 +25,7 @@ declare const makeSql: (table: Query, options?: ToSqlOptionsInternal) => Sql;
 
 declare abstract class QueryBase implements QueryBaseCommon {
     clone<T extends QueryBase>(this: T): T;
-    abstract result: ColumnsShape;
+    abstract result: ColumnsShapeBase;
     query: QueryData;
     table?: string;
     selectable: SelectableBase;
@@ -457,17 +457,17 @@ type Expression<T extends Query = Query, C extends ColumnTypeBase = ColumnTypeBa
 type ExpressionOfType<T extends Query, C extends ColumnTypeBase, Type> = {
     [K in keyof T['selectable']]: ColumnOutput<T['selectable'][K]['column']> extends Type | null ? K : never;
 }[Selectable<T>] | RawExpression<C>;
-type NumberExpression<T extends Query, C extends ColumnType = ColumnType> = ExpressionOfType<T, C, number>;
-type StringExpression<T extends Query, C extends ColumnType = ColumnType> = ExpressionOfType<T, C, string>;
-type BooleanExpression<T extends Query, C extends ColumnType = ColumnType> = ExpressionOfType<T, C, boolean>;
-type ExpressionOutput<T extends Query, Expr extends Expression<T>> = Expr extends keyof T['selectable'] ? T['selectable'][Expr]['column'] : Expr extends RawExpression<infer ColumnType> ? ColumnType : never;
+type NumberExpression<T extends Query, C extends ColumnTypeBase = ColumnTypeBase> = ExpressionOfType<T, C, number>;
+type StringExpression<T extends Query, C extends ColumnTypeBase = ColumnTypeBase> = ExpressionOfType<T, C, string>;
+type BooleanExpression<T extends Query, C extends ColumnTypeBase = ColumnTypeBase> = ExpressionOfType<T, C, boolean>;
+type ExpressionOutput<T extends Query, Expr extends Expression<T>> = Expr extends keyof T['selectable'] ? T['selectable'][Expr]['column'] : Expr extends RawExpression<infer ColumnTypeBase> ? ColumnTypeBase : never;
 
 declare const queryMethodByReturnType: Record<QueryReturnType, 'query' | 'arrays'>;
 type Resolve = (result: any) => any;
 type Reject = (error: any) => any;
 declare class Then {
     get then(): typeof maybeWrappedThen;
-    catch<T extends Query, Result>(this: T, fn: (reason: any) => Result | PromiseLike<Result>): Promise<ReturnType<T['then']> | Result>;
+    catch(this: Query, fn: (reason: any) => unknown): Promise<any>;
 }
 declare const handleResult: CommonQueryData['handleResult'];
 declare function maybeWrappedThen(this: Query, resolve?: Resolve, reject?: Reject): Promise<any>;
@@ -496,12 +496,12 @@ type SelectResult<T extends Query, Args extends SelectArg<T>[], SelectStringsRes
     T['selectable']
 ]>, AsKeys extends keyof SelectAsResult[0] = keyof SelectAsResult[0], ResultKeys extends keyof T['result'] = T['meta']['hasSelect'] extends true ? keyof T['result'] : never, ShapeKeys extends keyof T['shape'] = '*' extends Args[number] ? keyof T['shape'] : never, Result extends ColumnsShapeBase = {
     [K in StringsKeys | AsKeys | ResultKeys | ShapeKeys]: K extends StringsKeys ? SelectStringsResult[K] : K extends AsKeys ? SelectAsResult[0][K] : K extends ResultKeys ? T['result'][K] : K extends ShapeKeys ? T['shape'][K] : never;
-}> = (T['meta']['hasSelect'] extends true ? unknown : {
+}, Data = GetQueryResult<T['returnType'], Result>> = (T['meta']['hasSelect'] extends true ? unknown : {
     meta: {
         hasSelect: true;
     };
 }) & {
-    [K in keyof T]: K extends 'result' ? Result : K extends 'then' ? QueryThen<T['returnType'], Result> : K extends 'selectable' ? SelectAsResult[1] : T[K];
+    [K in keyof T]: K extends 'result' ? Result : K extends 'then' ? QueryThen<Data> : K extends 'catch' ? QueryCatch<Data> : K extends 'selectable' ? SelectAsResult[1] : T[K];
 };
 type SelectStringArgsResult<T extends Query, Args extends SelectArg<T>[]> = {
     [Arg in Args[number] as Arg extends keyof T['selectable'] ? T['selectable'][Arg]['as'] : never]: Arg extends keyof T['selectable'] ? T['selectable'][Arg]['column'] : never;
@@ -543,22 +543,22 @@ type FromArgs<T extends Query> = [
     second?: {
         only?: boolean;
     }
-];
-type FromResult<T extends Query, Args extends FromArgs<T>, Arg = Args[0]> = Arg extends string ? T['withData'] extends Record<string, WithDataItem> ? Arg extends keyof T['withData'] ? Omit<T, 'meta' | 'selectable'> & {
+] | [TemplateStringsArray, ...unknown[]];
+type FromResult<T extends Query, Args extends FromArgs<T>> = Args extends TemplateStringsArray ? T : Args[0] extends string ? T['withData'] extends Record<string, WithDataItem> ? Args[0] extends keyof T['withData'] ? Omit<T, 'meta' | 'selectable'> & {
     meta: Omit<T['meta'], 'as'> & {
         as?: string;
     };
-    selectable: SelectableFromShape<T['withData'][Arg]['shape'], Arg>;
-} : SetQueryTableAlias<T, Arg> : SetQueryTableAlias<T, Arg> : Arg extends Query ? FromQueryResult<T, Arg> : T;
+    selectable: SelectableFromShape<T['withData'][Args[0]]['shape'], Args[0]>;
+} : SetQueryTableAlias<T, Args[0]> : SetQueryTableAlias<T, Args[0]> : Args[0] extends Query ? FromQueryResult<T, Args[0]> : T;
 type FromQueryResult<T extends Query, Q extends Query, Selectable extends SelectableBase = {
     [K in keyof Q['result']]: K extends string ? {
         as: K;
         column: Q['result'][K];
     } : never;
-}> = {
+}, Data = GetQueryResult<T['returnType'], Q['result']>> = {
     [K in keyof T]: K extends 'meta' ? Omit<T['meta'], 'hasSelect' | 'as'> & {
         as: AliasOrTable<Q>;
-    } : K extends 'selectable' ? Selectable : K extends 'result' | 'shape' ? Q['result'] : K extends 'then' ? QueryThen<T['returnType'], Q['result']> : T[K];
+    } : K extends 'selectable' ? Selectable : K extends 'result' | 'shape' ? Q['result'] : K extends 'then' ? QueryThen<Data> : K extends 'catch' ? QueryCatch<Data> : T[K];
 };
 declare class From {
     from<T extends Query, Args extends FromArgs<T>>(this: T, ...args: Args): FromResult<T, Args>;
@@ -575,6 +575,7 @@ type WhereArg<T extends QueryBase> = (Omit<{
         values: unknown[][] | Query | RawExpression;
     }>;
 }) | QueryBase | RawExpression | ((q: WhereQueryBuilder<T>) => WhereQueryBuilder);
+type WhereArgs<T extends QueryBase> = WhereArg<T>[] | [TemplateStringsArray, ...unknown[]];
 type WhereInColumn<T extends QueryBase> = keyof T['selectable'] | [keyof T['selectable'], ...(keyof T['selectable'])[]];
 type WhereInValues<T extends QueryBase, Column extends WhereInColumn<T>> = Column extends keyof T['selectable'] ? T['selectable'][Column]['column']['type'][] | Query | RawExpression : ({
     [I in keyof Column]: Column[I] extends keyof T['selectable'] ? T['selectable'][Column[I]]['column']['type'] : never;
@@ -591,20 +592,20 @@ type WhereResult<T extends QueryBase> = T & {
 type WhereInArg<T extends Pick<Query, 'selectable'>> = {
     [K in keyof T['selectable']]?: T['selectable'][K]['column']['type'][] | Query | RawExpression;
 };
-declare const addWhere: <T extends Where>(q: T, args: WhereArg<T>[]) => WhereResult<T>;
-declare const addWhereNot: <T extends QueryBase>(q: T, args: WhereArg<T>[]) => WhereResult<T>;
+declare const addWhere: <T extends Where>(q: T, args: WhereArgs<T>) => WhereResult<T>;
+declare const addWhereNot: <T extends QueryBase>(q: T, args: WhereArgs<T>) => WhereResult<T>;
 declare const addOr: <T extends QueryBase>(q: T, args: WhereArg<T>[]) => WhereResult<T>;
 declare const addOrNot: <T extends QueryBase>(q: T, args: WhereArg<T>[]) => WhereResult<T>;
 declare const addWhereIn: <T extends QueryBase>(q: T, and: boolean, arg: unknown, values: unknown[] | unknown[][] | Query | RawExpression | undefined, not?: boolean) => WhereResult<T>;
 declare abstract class Where extends QueryBase {
-    where<T extends Where>(this: T, ...args: WhereArg<T>[]): WhereResult<T>;
-    _where<T extends Where>(this: T, ...args: WhereArg<T>[]): WhereResult<T>;
-    whereNot<T extends Where>(this: T, ...args: WhereArg<T>[]): WhereResult<T>;
-    _whereNot<T extends Where>(this: T, ...args: WhereArg<T>[]): WhereResult<T>;
-    and<T extends Where>(this: T, ...args: WhereArg<T>[]): WhereResult<T>;
-    _and<T extends Where>(this: T, ...args: WhereArg<T>[]): WhereResult<T>;
-    andNot<T extends Where>(this: T, ...args: WhereArg<T>[]): WhereResult<T>;
-    _andNot<T extends Where>(this: T, ...args: WhereArg<T>[]): WhereResult<T>;
+    where<T extends Where>(this: T, ...args: WhereArgs<T>): WhereResult<T>;
+    _where<T extends Where>(this: T, ...args: WhereArgs<T>): WhereResult<T>;
+    whereNot<T extends Where>(this: T, ...args: WhereArgs<T>): WhereResult<T>;
+    _whereNot<T extends Where>(this: T, ...args: WhereArgs<T>): WhereResult<T>;
+    and<T extends Where>(this: T, ...args: WhereArgs<T>): WhereResult<T>;
+    _and<T extends Where>(this: T, ...args: WhereArgs<T>): WhereResult<T>;
+    andNot<T extends Where>(this: T, ...args: WhereArgs<T>): WhereResult<T>;
+    _andNot<T extends Where>(this: T, ...args: WhereArgs<T>): WhereResult<T>;
     or<T extends Where>(this: T, ...args: WhereArg<T>[]): WhereResult<T>;
     _or<T extends Where>(this: T, ...args: WhereArg<T>[]): WhereResult<T>;
     orNot<T extends Where>(this: T, ...args: WhereArg<T>[]): WhereResult<T>;
@@ -691,7 +692,7 @@ type JoinLateralResult<T extends Query, R extends QueryBase, RequireJoined exten
 }>> = RequireMain extends true ? JoinAddSelectable<T, Selectable> : JoinOptionalMain<T, Selectable>;
 type JoinResultSelectable<J extends Pick<Query, 'result' | 'table' | 'meta'>, RequireJoined extends boolean, CbResult extends {
     meta: QueryMetaBase;
-}, Result extends ColumnsShape = RequireJoined extends true ? J['result'] : {
+}, Result extends ColumnsShapeBase = RequireJoined extends true ? J['result'] : {
     [K in keyof J['result']]: NullableColumn<J['result'][K]>;
 }, As extends string = CbResult extends {
     meta: QueryMetaBase & {
@@ -711,15 +712,15 @@ type JoinResultSelectable<J extends Pick<Query, 'result' | 'table' | 'meta'>, Re
 type JoinAddSelectable<T extends Query, Selectable extends SelectableBase> = {
     [K in keyof T]: K extends 'selectable' ? T['selectable'] & Selectable : T[K];
 };
-type JoinOptionalMain<T extends Query, Selectable extends SelectableBase, Result extends ColumnsShape = {
+type JoinOptionalMain<T extends Query, Selectable extends SelectableBase, Result extends ColumnsShapeBase = {
     [K in keyof T['result']]: NullableColumn<T['result'][K]>;
-}> = {
+}, Data = GetQueryResult<T['returnType'], Result>> = {
     [K in keyof T]: K extends 'selectable' ? {
         [K in keyof T['selectable']]: {
             as: T['selectable'][K]['as'];
             column: NullableColumn<T['selectable'][K]['column']>;
         };
-    } & Selectable : K extends 'result' ? Result : K extends 'then' ? QueryThen<T['returnType'], Result> : T[K];
+    } & Selectable : K extends 'result' ? Result : K extends 'then' ? QueryThen<Data> : K extends 'catch' ? QueryCatch<Data> : T[K];
 };
 type JoinWithArgToQuery<With extends WithDataItem, Selectable extends SelectableBase = {
     [K in keyof With['shape']]: {
@@ -862,7 +863,7 @@ type DbTableOptions = {
     snakeCase?: boolean;
 } & QueryLogOptions;
 declare const anyShape: Record<string, ColumnType<unknown, orchid_core.BaseOperators, unknown>>;
-interface Db<Table extends string | undefined = undefined, Shape extends ColumnsShape = Record<string, never>, Relations extends Query['relations'] = Query['relations'], CT extends ColumnTypesBase = DefaultColumnTypes> extends DbBase<Adapter, Table, Shape, CT>, QueryMethods {
+interface Db<Table extends string | undefined = undefined, Shape extends ColumnsShape = Record<string, never>, Relations extends Query['relations'] = Query['relations'], CT extends ColumnTypesBase = DefaultColumnTypes, Data = Pick<ColumnShapeOutput<Shape>, DefaultSelectColumns<Shape>[number]>[]> extends DbBase<Adapter, Table, Shape, CT>, QueryMethods {
     new (adapter: Adapter, queryBuilder: Db<Table, Shape, Relations, CT>, table?: Table, shape?: Shape, options?: DbTableOptions): this;
     queryBuilder: Db;
     whereQueryBuilder: Query['whereQueryBuilder'];
@@ -871,7 +872,8 @@ interface Db<Table extends string | undefined = undefined, Shape extends Columns
     query: QueryData;
     selectable: SelectableFromShape<Shape, Table>;
     returnType: Query['returnType'];
-    then: ThenResult<Pick<ColumnShapeOutput<Shape>, DefaultSelectColumns<Shape>[number]>[]>;
+    then: QueryThen<Data>;
+    catch: QueryCatch<Data>;
     windows: Query['windows'];
     defaultSelectColumns: DefaultSelectColumns<Shape>;
     relations: Relations;
@@ -906,16 +908,16 @@ declare const createDb: <CT extends Record<string, orchid_core.AnyColumnTypeCrea
 type WithArgsOptions = Omit<WithOptions, 'columns'> & {
     columns?: boolean | string[];
 };
-type WithArgs = [string, ColumnsShape, RawExpression] | [string, WithArgsOptions, ColumnsShape, RawExpression] | [string, Query | ((qb: Db) => Query)] | [string, WithArgsOptions, Query | ((qb: Db) => Query)];
-type WithShape<Args extends WithArgs> = Args[1] extends Query ? Args[1]['result'] : Args[1] extends (qb: Db) => Query ? ReturnType<Args[1]>['result'] : Args[2] extends Query ? Args[2]['result'] : Args[2] extends (qb: Db) => Query ? ReturnType<Args[2]>['result'] : Args[1] extends ColumnsShape ? Args[1] : Args[2] extends ColumnsShape ? Args[2] : Args[2] extends (t: ColumnTypes) => ColumnsShape ? ReturnType<Args[2]> extends ColumnsShape ? ReturnType<Args[2]> : never : never;
-type WithResult<T extends Query, Args extends WithArgs, Shape extends ColumnsShape> = AddQueryWith<T, {
+type WithArgs = [string, ColumnsShapeBase, RawExpression] | [string, WithArgsOptions, ColumnsShapeBase, RawExpression] | [string, Query | ((qb: Db) => Query)] | [string, WithArgsOptions, Query | ((qb: Db) => Query)];
+type WithShape<Args extends WithArgs> = Args[1] extends Query ? Args[1]['result'] : Args[1] extends (qb: Db) => Query ? ReturnType<Args[1]>['result'] : Args[2] extends Query ? Args[2]['result'] : Args[2] extends (qb: Db) => Query ? ReturnType<Args[2]>['result'] : Args[1] extends ColumnsShapeBase ? Args[1] : Args[2] extends ColumnsShapeBase ? Args[2] : Args[2] extends (t: ColumnTypes) => ColumnsShapeBase ? ReturnType<Args[2]> extends ColumnsShapeBase ? ReturnType<Args[2]> : never : never;
+type WithResult<T extends Query, Args extends WithArgs, Shape extends ColumnsShapeBase> = AddQueryWith<T, {
     table: Args[0];
     shape: Shape;
     type: ColumnShapeOutput<Shape>;
 }>;
 declare class With {
-    with<T extends Query, Args extends WithArgs, Shape extends ColumnsShape = WithShape<Args>>(this: T, ...args: Args): WithResult<T, Args, Shape>;
-    _with<T extends Query, Args extends WithArgs, Shape extends ColumnsShape = WithShape<Args>>(this: T, ...args: Args): WithResult<T, Args, Shape>;
+    with<T extends Query, Args extends WithArgs, Shape extends ColumnsShapeBase = WithShape<Args>>(this: T, ...args: Args): WithResult<T, Args, Shape>;
+    _with<T extends Query, Args extends WithArgs, Shape extends ColumnsShapeBase = WithShape<Args>>(this: T, ...args: Args): WithResult<T, Args, Shape>;
 }
 
 type UnionArg<T extends Query> = (Omit<Query, 'result'> & {
@@ -1272,11 +1274,12 @@ type HavingArg<T extends Query = Query> = ({
 } & {
     count?: number | HavingArgObject<T, 'count'>;
 }) | Query | RawExpression;
+type HavingArgs<T extends Query> = [...args: HavingArg<T>[]] | [TemplateStringsArray, ...unknown[]];
 declare class Having {
-    having<T extends Query>(this: T, ...args: HavingArg<T>[]): T;
-    _having<T extends Query>(this: T, ...args: HavingArg<T>[]): T;
-    havingOr<T extends Query>(this: T, ...args: HavingArg<T>[]): T;
-    _havingOr<T extends Query>(this: T, ...args: HavingArg<T>[]): T;
+    having<T extends Query>(this: T, ...args: HavingArgs<T>): T;
+    _having<T extends Query>(this: T, ...args: HavingArgs<T>): T;
+    havingOr<T extends Query>(this: T, ...args: HavingArgs<T>): T;
+    _havingOr<T extends Query>(this: T, ...args: HavingArgs<T>): T;
 }
 
 declare class Window {
@@ -1364,11 +1367,12 @@ declare class QueryUpsertOrCreate {
     _orCreate<T extends UpsertThis>(this: T, data: UpsertCreateArg<T>): UpsertResult<T>;
 }
 
-type MergeQuery<T extends Query, Q extends Query, ReturnType extends QueryReturnType = QueryReturnType extends Q['returnType'] ? T['returnType'] : Q['returnType']> = Omit<T, 'result' | 'returnType' | 'then' | 'selectable' | 'windows' | 'withData'> & {
+type MergeQuery<T extends Query, Q extends Query, ReturnType extends QueryReturnType = QueryReturnType extends Q['returnType'] ? T['returnType'] : Q['returnType'], Data = T['meta']['hasSelect'] extends true ? GetQueryResult<ReturnType, Spread<[T['result'], Q['result']]>> : GetQueryResult<ReturnType, Q['result']>> = Omit<T, 'result' | 'returnType' | 'then' | 'catch' | 'selectable' | 'windows' | 'withData'> & {
     meta: Q['meta'];
     result: T['meta']['hasSelect'] extends true ? Spread<[T['result'], Q['result']]> : Q['result'];
     returnType: ReturnType;
-    then: T['meta']['hasSelect'] extends true ? QueryThen<ReturnType, Spread<[T['result'], Q['result']]>> : QueryThen<ReturnType, Q['result']>;
+    then: QueryThen<Data>;
+    catch: QueryCatch<Data>;
     selectable: T['selectable'] & Q['selectable'];
     windows: T['windows'] & Q['windows'];
     withData: T['withData'] & Q['withData'];
@@ -1378,8 +1382,36 @@ declare class MergeQueryMethods {
     _merge<T extends Query, Q extends Query>(this: T, q: Q): MergeQuery<T, Q>;
 }
 
+type SqlArgs<T extends Query> = SqlColumnArgs<T> | SqlNoColumnArgs;
+type SqlColumnArgs<T extends Query> = [column: ColumnFn<T>, params?: {
+    raw?: string;
+    values?: Values;
+}];
+type SqlColumnArgsWithSQL<T extends Query> = [column: ColumnFn<T>, params: {
+    raw: string;
+}];
+type SqlNoColumnArgs = [params: {
+    raw: string;
+    values?: Values;
+}] | [params: {
+    values: Values;
+}] | TemplateLiteralArgs;
+type Values = Record<string, unknown>;
+type ColumnFn<T extends Query> = (types: T['columnTypes']) => ColumnType;
+type TemplateLiteralArgs = [
+    strings: TemplateStringsArray,
+    ...values: unknown[]
+];
+type SqlFn<C extends ColumnType> = (...args: TemplateLiteralArgs) => RawExpression<C>;
+type SqlResult<T extends Query, Args extends SqlArgs<T>> = Args extends SqlColumnArgs<T> ? Args extends SqlColumnArgsWithSQL<T> ? RawExpression<ReturnType<Args[0]>> : SqlFn<ReturnType<Args[0]>> : Args extends [{
+    raw: string;
+}] | TemplateLiteralArgs ? RawExpression : SqlFn<ColumnType>;
 type RawArgs<CT extends ColumnTypesBase, C extends ColumnType> = [column: (types: CT) => C, sql: string, values?: Record<string, unknown>] | [sql: string, values?: Record<string, unknown>];
-declare class RawMethods {
+declare class RawSqlMethods {
+    sql<T extends Query, Args extends SqlArgs<T>>(this: T, ...args: Args): SqlResult<T, Args>;
+    /**
+     * @deprecated use `sql` method instead, `raw` will be removed
+     */
     raw<T extends Query, C extends ColumnType>(this: T, ...args: RawArgs<T['columnTypes'], C>): RawExpression<C>;
 }
 
@@ -1407,7 +1439,9 @@ type OrderArg<T extends Query, Key extends PropertyKey = keyof T['selectable'] |
 }[keyof T['result']]> = Key | {
     [K in Key]?: SortDir;
 } | RawExpression;
-interface QueryMethods extends Omit<AsMethods, 'result'>, Aggregate, Select, From, Join, With, Union, Json, Create, Update, Delete, Transaction, For, ColumnInfoMethods, Omit<Where, 'result'>, Clear, Having, Window, Then, QueryLog, QueryHooks, QueryUpsertOrCreate, QueryGet, MergeQueryMethods, RawMethods, CopyMethods {
+type OrderArgs<T extends Query> = OrderArg<T>[] | [TemplateStringsArray, ...unknown[]];
+type FindArgs<T extends Query> = [T['shape'][T['singlePrimaryKey']]['type'] | RawExpression] | [TemplateStringsArray, ...unknown[]];
+interface QueryMethods extends Omit<AsMethods, 'result'>, Aggregate, Select, From, Join, With, Union, Json, Create, Update, Delete, Transaction, For, ColumnInfoMethods, Omit<Where, 'result'>, Clear, Having, Window, Then, QueryLog, QueryHooks, QueryUpsertOrCreate, QueryGet, MergeQueryMethods, RawSqlMethods, CopyMethods {
 }
 declare class QueryMethods {
     windows: EmptyObject;
@@ -1427,10 +1461,10 @@ declare class QueryMethods {
     toSql(this: Query, options?: ToSqlOptions): Sql;
     distinct<T extends Query>(this: T, ...columns: Expression<T>[]): T;
     _distinct<T extends Query>(this: T, ...columns: Expression<T>[]): T;
-    find<T extends Query>(this: T, value: T['shape'][T['singlePrimaryKey']]['type'] | RawExpression): SetQueryReturnsOne<WhereResult<T>>;
-    _find<T extends Query>(this: T, value: T['shape'][T['singlePrimaryKey']]['type'] | RawExpression): SetQueryReturnsOne<WhereResult<T>>;
-    findOptional<T extends Query>(this: T, value: T['shape'][T['singlePrimaryKey']]['type'] | RawExpression): SetQueryReturnsOneOptional<WhereResult<T>>;
-    _findOptional<T extends Query>(this: T, value: T['shape'][T['singlePrimaryKey']]['type'] | RawExpression): SetQueryReturnsOneOptional<WhereResult<T>>;
+    find<T extends Query>(this: T, ...args: FindArgs<T>): SetQueryReturnsOne<WhereResult<T>>;
+    _find<T extends Query>(this: T, ...args: FindArgs<T>): SetQueryReturnsOne<WhereResult<T>>;
+    findOptional<T extends Query>(this: T, ...args: FindArgs<T>): SetQueryReturnsOneOptional<WhereResult<T>>;
+    _findOptional<T extends Query>(this: T, ...args: FindArgs<T>): SetQueryReturnsOneOptional<WhereResult<T>>;
     findBy<T extends Query>(this: T, ...args: WhereArg<T>[]): SetQueryReturnsOne<WhereResult<T>>;
     _findBy<T extends Query>(this: T, ...args: WhereArg<T>[]): SetQueryReturnsOne<WhereResult<T>>;
     findByOptional<T extends Query>(this: T, ...args: WhereArg<T>[]): SetQueryReturnsOneOptional<WhereResult<T>>;
@@ -1443,8 +1477,8 @@ declare class QueryMethods {
     _window<T extends Query, W extends WindowArg<T>>(this: T, arg: W): WindowResult<T, W>;
     wrap<T extends Query, Q extends Query, As extends string = 't'>(this: T, query: Q, as?: As): SetQueryTableAlias<Q, As>;
     _wrap<T extends Query, Q extends Query, As extends string = 't'>(this: T, query: Q, as?: As): SetQueryTableAlias<Q, As>;
-    order<T extends Query>(this: T, ...args: OrderArg<T>[]): T;
-    _order<T extends Query>(this: T, ...args: OrderArg<T>[]): T;
+    order<T extends Query>(this: T, ...args: OrderArgs<T>): T;
+    _order<T extends Query>(this: T, ...args: OrderArgs<T>): T;
     limit<T extends Query>(this: T, arg: number | undefined): T;
     _limit<T extends Query>(this: T, arg: number | undefined): T;
     offset<T extends Query>(this: T, arg: number | undefined): T;
@@ -1471,7 +1505,7 @@ type AggregateOptions<T extends Query = Query, As extends string | undefined = a
     withinGroup?: boolean;
     over?: keyof T['windows'] | WindowArgDeclaration<T>;
 };
-type Aggregate1ArgumentTypes<T extends Query = Query, C extends ColumnType = ColumnType> = {
+type Aggregate1ArgumentTypes<T extends Query = Query, C extends ColumnTypeBase = ColumnTypeBase> = {
     count: Expression<T, C>;
     avg: NumberExpression<T, C>;
     min: Expression<T, C>;
@@ -1599,7 +1633,7 @@ type ColumnParser = (input: unknown) => unknown;
 type ColumnsParsers = Record<string | getValueKey, ColumnParser>;
 type SelectableBase = Record<PropertyKey, {
     as: string;
-    column: ColumnType;
+    column: ColumnTypeBase;
 }>;
 type SelectableFromShape<Shape extends ColumnsShapeBase, Table extends string | undefined> = {
     [K in keyof Shape]: {
@@ -1614,7 +1648,7 @@ type SelectableFromShape<Shape extends ColumnsShapeBase, Table extends string |
 };
 type WithDataItem = {
     table: string;
-    shape: ColumnsShape;
+    shape: ColumnsShapeBase;
 };
 type WithDataBase = Record<never, WithDataItem>;
 type Query = QueryCommon & QueryMethods & {
@@ -1629,10 +1663,11 @@ type Query = QueryCommon & QueryMethods & {
     type: Record<string, unknown>;
     inputType: Record<string, unknown>;
     query: QueryData;
-    result: ColumnsShape;
+    result: ColumnsShapeBase;
     selectable: SelectableBase;
     returnType: QueryReturnType;
-    then: ThenResult<unknown>;
+    then: QueryThen<unknown>;
+    catch: QueryCatch<unknown>;
     windows: EmptyObject;
     defaultSelectColumns: string[];
     relations: RelationsBase;
@@ -1649,32 +1684,32 @@ type QueryReturnType = 'all' | 'one' | 'oneOrThrow' | 'rows' | 'pluck' | 'value'
 declare const queryTypeWithLimitOne: Record<QueryReturnType, true | undefined>;
 declare const isQueryReturnsAll: (q: Query) => boolean;
 type QueryReturnsAll<T extends QueryReturnType> = (QueryReturnType extends T ? 'all' : T) extends 'all' ? true : false;
-type QueryThen<ReturnType extends QueryReturnType, Result extends ColumnsShapeBase> = QueryReturnsAll<ReturnType> extends true ? ThenResult<ColumnShapeOutput<Result>[]> : ReturnType extends 'one' ? ThenResult<ColumnShapeOutput<Result> | undefined> : ReturnType extends 'oneOrThrow' ? ThenResult<ColumnShapeOutput<Result>> : ReturnType extends 'value' ? Result extends {
+type GetQueryResult<ReturnType extends QueryReturnType, Result extends ColumnsShapeBase> = QueryReturnsAll<ReturnType> extends true ? ColumnShapeOutput<Result>[] : ReturnType extends 'one' ? ColumnShapeOutput<Result> | undefined : ReturnType extends 'oneOrThrow' ? ColumnShapeOutput<Result> : ReturnType extends 'value' ? Result extends {
     value: ColumnType;
-} ? ThenResult<Result['value']['type'] | undefined> : never : ReturnType extends 'valueOrThrow' ? Result extends {
+} ? Result['value']['type'] | undefined : never : ReturnType extends 'valueOrThrow' ? Result extends {
     value: ColumnType;
-} ? ThenResult<Result['value']['type']> : never : ReturnType extends 'rows' ? ThenResult<ColumnShapeOutput<Result>[keyof Result][][]> : ReturnType extends 'pluck' ? Result extends {
+} ? Result['value']['type'] : never : ReturnType extends 'rows' ? ColumnShapeOutput<Result>[keyof Result][][] : ReturnType extends 'pluck' ? Result extends {
     pluck: ColumnType;
-} ? ThenResult<Result['pluck']['type'][]> : never : ReturnType extends 'rowCount' ? ThenResult<number> : ReturnType extends 'void' ? ThenResult<void> : never;
-type AddQuerySelect<T extends Pick<Query, 'result' | 'then' | 'returnType' | 'meta'>, Result extends ColumnsShapeBase> = T['meta']['hasSelect'] extends true ? MergeSelect<T, Result> : {
-    [K in keyof T]: K extends 'meta' ? T['meta'] & {
-        hasSelect: true;
-    } : K extends 'result' ? Result : K extends 'then' ? QueryThen<T['returnType'], Result> : T[K];
-};
-type MergeSelect<T extends Pick<Query, 'result' | 'then' | 'returnType' | 'meta'>, Result extends ColumnsShapeBase, Merged extends ColumnsShapeBase = {
+} ? Result['pluck']['type'][] : never : ReturnType extends 'rowCount' ? number : ReturnType extends 'void' ? void : never;
+type AddQuerySelect<T extends Pick<Query, 'result' | 'then' | 'returnType' | 'meta'>, Result extends ColumnsShapeBase, Data = GetQueryResult<T['returnType'], Result>> = T['meta']['hasSelect'] extends true ? MergeSelect<T, Result, Data> : SetSelect<T, Result, Data>;
+type MergeSelect<T extends Pick<Query, 'result' | 'then' | 'returnType' | 'meta'>, Result extends ColumnsShapeBase, Data, Merged extends ColumnsShapeBase = {
     [K in keyof T['result']]: K extends keyof Result ? unknown : T['result'][K];
 } & Result> = {
-    [K in keyof T]: K extends 'result' ? Merged : K extends 'then' ? QueryThen<T['returnType'], Merged> : T[K];
+    [K in keyof T]: K extends 'result' ? Merged : K extends 'then' ? QueryThen<Data> : K extends 'catch' ? QueryCatch<Data> : T[K];
+};
+type SetSelect<T extends Pick<Query, 'result' | 'then' | 'returnType' | 'meta'>, Result extends ColumnsShapeBase, Data> = {
+    [K in keyof T]: K extends 'meta' ? T['meta'] & {
+        hasSelect: true;
+    } : K extends 'result' ? Result : K extends 'then' ? QueryThen<Data> : K extends 'catch' ? QueryCatch<Data> : T[K];
 };
-type SetQueryReturns<T extends Query, R extends QueryReturnType> = Omit<T, 'returnType' | 'then'> & {
-    returnType: R;
-    then: QueryThen<R, T['result']>;
+type SetQueryReturns<T extends Query, R extends QueryReturnType, Data = GetQueryResult<R, T['result']>> = {
+    [K in keyof T]: K extends 'returnType' ? R : K extends 'then' ? QueryThen<Data> : K extends 'catch' ? QueryCatch<Data> : T[K];
 };
 type SetQueryReturnsAll<T extends Query> = SetQueryReturns<T, 'all'>;
 type SetQueryReturnsOneOptional<T extends Query> = SetQueryReturns<T, 'one'>;
 type SetQueryReturnsOne<T extends Query> = SetQueryReturns<T, 'oneOrThrow'>;
 type SetQueryReturnsRows<T extends Query> = SetQueryReturns<T, 'rows'>;
-type SetQueryReturnsPluck<T extends Query, S extends keyof T['selectable'] | RawExpression, C extends ColumnTypeBase = S extends keyof T['selectable'] ? T['selectable'][S]['column'] : S extends RawExpression ? S['__column'] : never> = Omit<T, 'result' | 'returnType' | 'then'> & {
+type SetQueryReturnsPluck<T extends Query, S extends keyof T['selectable'] | RawExpression, C extends ColumnTypeBase = S extends keyof T['selectable'] ? T['selectable'][S]['column'] : S extends RawExpression ? S['__column'] : never> = Omit<T, 'result' | 'returnType' | 'then' | 'catch'> & {
     meta: {
         hasSelect: true;
     };
@@ -1682,9 +1717,10 @@ type SetQueryReturnsPluck<T extends Query, S extends keyof T['selectable'] | Raw
         pluck: C;
     };
     returnType: 'pluck';
-    then: ThenResult<C['type'][]>;
+    then: QueryThen<C['type'][]>;
+    catch: QueryCatch<C['type'][]>;
 };
-type SetQueryReturnsValueOptional<T extends Query, Arg extends Exclude<GetArg<T>, RawExpression> | ColumnTypeBase, Column extends ColumnTypeBase = Arg extends ColumnTypeBase ? Arg : Arg extends keyof T['selectable'] ? T['selectable'][Arg]['column'] : Arg extends RelationQueryBase ? Arg['result']['value'] : never> = Omit<T, 'result' | 'returnType' | 'then'> & {
+type SetQueryReturnsValueOptional<T extends Query, Arg extends Exclude<GetArg<T>, RawExpression> | ColumnTypeBase, Column extends ColumnTypeBase = Arg extends ColumnTypeBase ? Arg : Arg extends keyof T['selectable'] ? T['selectable'][Arg]['column'] : Arg extends RelationQueryBase ? Arg['result']['value'] : never> = Omit<T, 'result' | 'returnType' | 'then' | 'catch'> & {
     meta: {
         hasSelect: true;
     };
@@ -1692,9 +1728,10 @@ type SetQueryReturnsValueOptional<T extends Query, Arg extends Exclude<GetArg<T>
         value: Column;
     };
     returnType: 'value';
-    then: ThenResult<Column['type'] | undefined>;
+    then: QueryThen<Column['type'] | undefined>;
+    catch: QueryThen<Column['type'] | undefined>;
 };
-type SetQueryReturnsValue<T extends Query, Arg extends Exclude<GetArg<T>, RawExpression> | ColumnTypeBase, Column extends ColumnTypeBase = Arg extends ColumnTypeBase ? Arg : Arg extends keyof T['selectable'] ? T['selectable'][Arg]['column'] : Arg extends RelationQueryBase ? Arg['result']['value'] : never> = Omit<T, 'result' | 'returnType' | 'then'> & {
+type SetQueryReturnsValue<T extends Query, Arg extends Exclude<GetArg<T>, RawExpression> | ColumnTypeBase, Column extends ColumnTypeBase = Arg extends ColumnTypeBase ? Arg : Arg extends keyof T['selectable'] ? T['selectable'][Arg]['column'] : Arg extends RelationQueryBase ? Arg['result']['value'] : never> = Omit<T, 'result' | 'returnType' | 'then' | 'catch'> & {
     meta: {
         hasSelect: true;
     };
@@ -1702,16 +1739,18 @@ type SetQueryReturnsValue<T extends Query, Arg extends Exclude<GetArg<T>, RawExp
         value: Column;
     };
     returnType: 'valueOrThrow';
-    then: ThenResult<Column['type']>;
+    then: QueryThen<Column['type']>;
+    catch: QueryCatch<Column['type']>;
 };
 type SetQueryReturnsRowCount<T extends Query> = SetQueryReturns<T, 'rowCount'>;
 type SetQueryReturnsVoid<T extends Query> = SetQueryReturns<T, 'void'>;
-type SetQueryReturnsColumnInfo<T extends Query, Column extends keyof T['shape'] | undefined, Result = Column extends keyof T['shape'] ? ColumnInfo : Record<keyof T['shape'], ColumnInfo>> = Omit<T, 'result' | 'returnType' | 'then'> & {
+type SetQueryReturnsColumnInfo<T extends Query, Column extends keyof T['shape'] | undefined, Result = Column extends keyof T['shape'] ? ColumnInfo : Record<keyof T['shape'], ColumnInfo>> = Omit<T, 'result' | 'returnType' | 'then' | 'catch'> & {
     result: {
         value: ColumnType<Result>;
     };
     returnType: 'value';
-    then: ThenResult<Result>;
+    then: QueryThen<Result>;
+    catch: QueryCatch<Result>;
 };
 type SetQueryTableAlias<T extends Pick<Query, 'selectable' | 'table' | 'meta'> & {
     shape: ColumnsShapeBase;
@@ -1783,11 +1822,11 @@ declare const Operators: {
         not: ((key: string, value: number | RawExpression | Query, values: unknown[]) => string) & {
             type: number | RawExpression | Query;
         };
-        in: ((key: string, value: RawExpression | Query | number[], values: unknown[]) => string) & {
-            type: RawExpression | Query | number[];
+        in: ((key: string, value: RawExpression | number[] | Query, values: unknown[]) => string) & {
+            type: RawExpression | number[] | Query;
         };
-        notIn: ((key: string, value: RawExpression | Query | number[], values: unknown[]) => string) & {
-            type: RawExpression | Query | number[];
+        notIn: ((key: string, value: RawExpression | number[] | Query, values: unknown[]) => string) & {
+            type: RawExpression | number[] | Query;
         };
     };
     date: {
@@ -1920,7 +1959,7 @@ declare const Operators: {
 };
 
 type ColumnsShape = Record<string, ColumnType>;
-declare abstract class ColumnsObject<Shape extends ColumnsShape> extends ColumnType<{
+declare abstract class ColumnsObject<Shape extends ColumnsShapeBase> extends ColumnType<{
     [K in keyof Shape]: Shape[K]['type'];
 }, typeof Operators.any> {
     shape: Shape;
@@ -1941,7 +1980,7 @@ declare abstract class ColumnsObject<Shape extends ColumnsShape> extends ColumnT
     };
     constructor(shape: Shape);
 }
-declare abstract class ArrayOfColumnsObjects<Shape extends ColumnsShape> extends ColumnType<{
+declare abstract class ArrayOfColumnsObjects<Shape extends ColumnsShapeBase> extends ColumnType<{
     [K in keyof Shape]: Shape[K]['type'];
 }[], typeof Operators.any> {
     shape: Shape;
@@ -1962,7 +2001,7 @@ declare abstract class ArrayOfColumnsObjects<Shape extends ColumnsShape> extends
     };
     constructor(shape: Shape);
 }
-declare abstract class PluckResultColumnType<C extends ColumnType> extends ColumnType<C['type'][], typeof Operators.any> {
+declare abstract class PluckResultColumnType<C extends ColumnTypeBase> extends ColumnTypeBase<C['type'][], typeof Operators.any> {
 }
 
 type NumberColumn = ColumnType<number, typeof Operators.number>;
@@ -1999,11 +2038,11 @@ declare abstract class NumberBaseColumn extends ColumnType<number, typeof Operat
         not: ((key: string, value: number | RawExpression | Query, values: unknown[]) => string) & {
             type: number | RawExpression | Query;
         };
-        in: ((key: string, value: RawExpression | Query | number[], values: unknown[]) => string) & {
-            type: RawExpression | Query | number[];
+        in: ((key: string, value: RawExpression | number[] | Query, values: unknown[]) => string) & {
+            type: RawExpression | number[] | Query;
         };
-        notIn: ((key: string, value: RawExpression | Query | number[], values: unknown[]) => string) & {
-            type: RawExpression | Query | number[];
+        notIn: ((key: string, value: RawExpression | number[] | Query, values: unknown[]) => string) & {
+            type: RawExpression | number[] | Query;
         };
     };
 }
@@ -2034,11 +2073,11 @@ declare abstract class NumberAsStringBaseColumn extends ColumnType<string, typeo
         not: ((key: string, value: number | RawExpression | Query, values: unknown[]) => string) & {
             type: number | RawExpression | Query;
         };
-        in: ((key: string, value: RawExpression | Query | number[], values: unknown[]) => string) & {
-            type: RawExpression | Query | number[];
+        in: ((key: string, value: RawExpression | number[] | Query, values: unknown[]) => string) & {
+            type: RawExpression | number[] | Query;
         };
-        notIn: ((key: string, value: RawExpression | Query | number[], values: unknown[]) => string) & {
-            type: RawExpression | Query | number[];
+        notIn: ((key: string, value: RawExpression | number[] | Query, values: unknown[]) => string) & {
+            type: RawExpression | number[] | Query;
         };
     };
     data: ColumnData;
@@ -2070,11 +2109,11 @@ declare class DecimalBaseColumn<Precision extends number | undefined = undefined
         not: ((key: string, value: number | RawExpression | Query, values: unknown[]) => string) & {
             type: number | RawExpression | Query;
         };
-        in: ((key: string, value: RawExpression | Query | number[], values: unknown[]) => string) & {
-            type: RawExpression | Query | number[];
+        in: ((key: string, value: RawExpression | number[] | Query, values: unknown[]) => string) & {
+            type: RawExpression | number[] | Query;
         };
-        notIn: ((key: string, value: RawExpression | Query | number[], values: unknown[]) => string) & {
-            type: RawExpression | Query | number[];
+        notIn: ((key: string, value: RawExpression | number[] | Query, values: unknown[]) => string) & {
+            type: RawExpression | number[] | Query;
         };
     };
     dataType: "decimal";
@@ -3334,9 +3373,9 @@ type ArrayData<Item extends ColumnTypeBase> = ColumnData & ArrayMethodsData & {
     item: Item;
 };
 type ArrayMethods = typeof arrayMethods;
-interface ArrayColumn<Item extends ColumnType> extends ColumnType<Item['type'][], typeof Operators.array>, ArrayMethods {
+interface ArrayColumn<Item extends ColumnTypeBase> extends ColumnType<Item['type'][], typeof Operators.array>, ArrayMethods {
 }
-declare class ArrayColumn<Item extends ColumnType> extends ColumnType<Item['type'][], typeof Operators.array> {
+declare class ArrayColumn<Item extends ColumnTypeBase> extends ColumnType<Item['type'][], typeof Operators.array> {
     dataType: "array";
     operators: {
         equals: ((key: string, value: any, values: unknown[]) => string) & {
@@ -3435,6 +3474,10 @@ declare const getTableData: () => TableData;
 declare const resetTableData: (data?: TableData) => void;
 declare const getColumnTypes: <CT extends Record<string, orchid_core.AnyColumnTypeCreator>, Shape extends ColumnsShape>(types: CT, fn: (t: CT) => Shape, nowSQL: string | undefined, data?: TableData) => Shape;
 declare function text(min: number, max: number): TextColumn;
+declare function sql(sql: TemplateStringsArray, ...values: unknown[]): RawExpression;
+declare function sql(sql: string): RawExpression;
+declare function sql(values: Record<string, unknown>, sql: string): RawExpression;
+declare function sql(values: Record<string, unknown>): (...sql: [TemplateStringsArray, ...unknown[]]) => RawExpression;
 type DefaultColumnTypes = typeof columnTypes;
 declare const columnTypes: {
     timestamps<T extends orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>>(this: {
@@ -3482,7 +3525,7 @@ declare const columnTypes: {
         updatedAt: orchid_core.ColumnWithDefault<T_3, RawExpression>;
     };
     name: typeof name;
-    raw: (sql: string, values?: false | Record<string, unknown> | undefined) => RawExpression<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>>;
+    sql: typeof sql;
     smallint(): SmallIntColumn;
     integer(): IntegerColumn;
     bigint(): BigIntColumn;
@@ -3734,4 +3777,4 @@ declare const testTransaction: {
     close(arg: Arg): Promise<void>;
 };
 
-export { Adapter, AdapterConfig, AdapterOptions, AddQuerySelect, AddQueryWith, AfterHook, AfterHookKey, Aggregate, Aggregate1ArgumentTypes, AggregateArg, AggregateItem, AggregateItemArg, AggregateItemOptions, AggregateOptions, AliasOrTable, ArrayColumn, ArrayData, ArrayOfColumnsObjects, BaseRelation, BeforeHook, BeforeHookKey, BelongsToRelation, BigIntColumn, BigSerialColumn, BitColumn, BitVaryingColumn, BooleanColumn, BooleanExpression, BoxColumn, ByteaColumn, CharColumn, CidrColumn, CircleColumn, CitextColumn, Clear, ClearStatement, ColumnData, ColumnFromDbParams, ColumnInfo, ColumnInfoMethods, ColumnInfoQueryData, ColumnNameOfTable, ColumnOperators, ColumnParser, ColumnType, ColumnTypes, ColumnsObject, ColumnsParsers, ColumnsShape, CommonQueryData, CopyOptions, CopyQueryData, Create, CreateCtx, CreateData, CreateMethodsNames, CustomTypeColumn, DateBaseColumn, DateColumn, DateTimeBaseClass, DateTimeTzBaseClass, Db, DbOptions, DbResult, DbTableOptions, DecimalBaseColumn, DecimalColumn, DefaultColumnTypes, Delete, DeleteMethodsNames, DeleteQueryData, DomainColumn, DoublePrecisionColumn, DropMode, EnumColumn, Expression, ExpressionOfType, ExpressionOutput, For, ForeignKey, ForeignKeyAction, ForeignKeyMatch, ForeignKeyOptions, ForeignKeyTable, From, FromArgs, FromResult, GetArg, HasAndBelongsToManyRelation, HasManyRelation, HasOneRelation, Having, HavingArg, HavingItem, IdentityColumn, IndexColumnOptions, IndexOptions, InetColumn, InsertQueryData, IntegerBaseColumn, IntegerColumn, IntervalColumn, IsolationLevel, JSONColumn, JSONTextColumn, JSONTypes, Join, JoinArgs, JoinCallback, JoinFirstArg, JoinItem, JoinLateralCallback, JoinLateralItem, JoinLateralResult, JoinResult, JoinedParsers, JoinedShapes, Json, JsonItem, LimitedTextBaseColumn, LineColumn, LsegColumn, MacAddr8Column, MacAddrColumn, MergeQuery, MergeQueryMethods, MoneyColumn, MoreThanOneRowError, NoPrimaryKeyOption, NotFoundError, NumberAsStringBaseColumn, NumberBaseColumn, NumberColumn, NumberColumnData, NumberExpression, OnConflictItem, OnConflictMergeUpdate, OnConflictQueryBuilder, OnQueryBuilder, Operators, OrchidOrmError, OrchidOrmInternalError, OrderArg, OrderItem, PathColumn, PluckResultColumnType, PointColumn, PolygonColumn, Query, QueryArraysResult, QueryBase, QueryData, QueryError, QueryErrorName, QueryGet, QueryHooks, QueryLog, QueryLogObject, QueryLogOptions, QueryLogger, QueryMethods, QueryResult, QueryReturnType, QueryReturnsAll, QueryThen, QueryUpsertOrCreate, QueryWithTable, RawMethods, RealColumn, Relation, RelationQuery, RelationQueryBase, RelationQueryData, RelationsBase, Select, SelectAgg, SelectArg, SelectFunctionItem, SelectItem, SelectQueryData, Selectable, SelectableBase, SelectableFromShape, SerialColumn, SerialColumnData, SetQueryReturns, SetQueryReturnsAll, SetQueryReturnsColumnInfo, SetQueryReturnsOne, SetQueryReturnsOneOptional, SetQueryReturnsPluck, SetQueryReturnsRowCount, SetQueryReturnsRows, SetQueryReturnsValue, SetQueryReturnsValueOptional, SetQueryReturnsVoid, SetQueryTableAlias, SetQueryWith, SimpleJoinItem, SingleColumnIndexOptions, SmallIntColumn, SmallSerialColumn, SortDir, StringColumn, StringExpression, TableData, TextBaseColumn, TextColumn, TextColumnData, Then, TimeColumn, TimeInterval, TimestampColumn, TimestampTZColumn, ToSqlCtx, ToSqlOptions, Transaction, TransactionAdapter, TransactionOptions, TruncateQueryData, TsQueryColumn, TsVectorColumn, TypeParsers, UUIDColumn, UnhandledTypeError, Union, UnionArg, UnionItem, UnionKind, UnknownColumn, Update, UpdateCtx, UpdateData, UpdateQueryData, UpdateQueryDataItem, UpdateQueryDataObject, UpdatedAtDataInjector, UpsertCreateArg, UpsertData, UpsertResult, UpsertThis, VarCharColumn, VirtualColumn, Where, WhereArg, WhereInArg, WhereInColumn, WhereInItem, WhereInValues, WhereItem, WhereJsonPathEqualsItem, WhereOnItem, WhereOnJoinItem, WhereQueryBuilder, WhereResult, WindowArg, WindowArgDeclaration, WindowDeclaration, WindowFunctionOptions, WindowItem, With, WithDataBase, WithDataItem, WithItem, WithOptions, XMLColumn, addOr, addOrNot, addParserForRawExpression, addParserForSelectItem, addParserToQuery, addQueryHook, addQueryOn, addQueryOrOn, addWhere, addWhereIn, addWhereNot, aggregate1FunctionNames, anyShape, checkIfASimpleQuery, cloneQueryArrays, columnCheckToCode, columnCode, columnForeignKeysToCode, columnIndexesToCode, columnTypes, utils as columnUtils, columnsByType, columnsShapeToCode, constraintPropsToCode, constraintToCode, createDb, foreignKeyArgumentToCode, getClonedQueryData, getColumnTypes, getConstraintKind, getQueryAs, getRaw, getShapeFromSelect, getTableData, getValueKey, handleResult, identityToCode, indexToCode, instantiateColumn, isQueryReturnsAll, isRequiredRelationKey, jsonTypes, logColors, logParamToLogObject, makeRegexToFindInSql, makeSql, newTableData, parseRecord, parseResult, primaryKeyToCode, processSelectArg, pushQueryArray, pushQueryOn, pushQueryOrOn, pushQueryValue, queryMethodByReturnType, queryTypeWithLimitOne, quote, quoteString, referencesArgsToCode, relationQueryKey, resetTableData, setQueryObjectValue, simplifyColumnDefault, testTransaction, toSql, toSqlCacheKey };
+export { Adapter, AdapterConfig, AdapterOptions, AddQuerySelect, AddQueryWith, AfterHook, AfterHookKey, Aggregate, Aggregate1ArgumentTypes, AggregateArg, AggregateItem, AggregateItemArg, AggregateItemOptions, AggregateOptions, AliasOrTable, ArrayColumn, ArrayData, ArrayOfColumnsObjects, BaseRelation, BeforeHook, BeforeHookKey, BelongsToRelation, BigIntColumn, BigSerialColumn, BitColumn, BitVaryingColumn, BooleanColumn, BooleanExpression, BoxColumn, ByteaColumn, CharColumn, CidrColumn, CircleColumn, CitextColumn, Clear, ClearStatement, ColumnData, ColumnFromDbParams, ColumnInfo, ColumnInfoMethods, ColumnInfoQueryData, ColumnNameOfTable, ColumnOperators, ColumnParser, ColumnType, ColumnTypes, ColumnsObject, ColumnsParsers, ColumnsShape, CommonQueryData, CopyOptions, CopyQueryData, Create, CreateCtx, CreateData, CreateMethodsNames, CustomTypeColumn, DateBaseColumn, DateColumn, DateTimeBaseClass, DateTimeTzBaseClass, Db, DbOptions, DbResult, DbTableOptions, DecimalBaseColumn, DecimalColumn, DefaultColumnTypes, Delete, DeleteMethodsNames, DeleteQueryData, DomainColumn, DoublePrecisionColumn, DropMode, EnumColumn, Expression, ExpressionOfType, ExpressionOutput, For, ForeignKey, ForeignKeyAction, ForeignKeyMatch, ForeignKeyOptions, ForeignKeyTable, From, FromArgs, FromResult, GetArg, GetQueryResult, HasAndBelongsToManyRelation, HasManyRelation, HasOneRelation, Having, HavingArg, HavingArgs, HavingItem, IdentityColumn, IndexColumnOptions, IndexOptions, InetColumn, InsertQueryData, IntegerBaseColumn, IntegerColumn, IntervalColumn, IsolationLevel, JSONColumn, JSONTextColumn, JSONTypes, Join, JoinArgs, JoinCallback, JoinFirstArg, JoinItem, JoinLateralCallback, JoinLateralItem, JoinLateralResult, JoinResult, JoinedParsers, JoinedShapes, Json, JsonItem, LimitedTextBaseColumn, LineColumn, LsegColumn, MacAddr8Column, MacAddrColumn, MergeQuery, MergeQueryMethods, MoneyColumn, MoreThanOneRowError, NoPrimaryKeyOption, NotFoundError, NumberAsStringBaseColumn, NumberBaseColumn, NumberColumn, NumberColumnData, NumberExpression, OnConflictItem, OnConflictMergeUpdate, OnConflictQueryBuilder, OnQueryBuilder, Operators, OrchidOrmError, OrchidOrmInternalError, OrderArg, OrderArgs, OrderItem, PathColumn, PluckResultColumnType, PointColumn, PolygonColumn, Query, QueryArraysResult, QueryBase, QueryData, QueryError, QueryErrorName, QueryGet, QueryHooks, QueryLog, QueryLogObject, QueryLogOptions, QueryLogger, QueryMethods, QueryResult, QueryReturnType, QueryReturnsAll, QueryUpsertOrCreate, QueryWithTable, RawSqlMethods, RealColumn, Relation, RelationQuery, RelationQueryBase, RelationQueryData, RelationsBase, Select, SelectAgg, SelectArg, SelectFunctionItem, SelectItem, SelectQueryData, Selectable, SelectableBase, SelectableFromShape, SerialColumn, SerialColumnData, SetQueryReturns, SetQueryReturnsAll, SetQueryReturnsColumnInfo, SetQueryReturnsOne, SetQueryReturnsOneOptional, SetQueryReturnsPluck, SetQueryReturnsRowCount, SetQueryReturnsRows, SetQueryReturnsValue, SetQueryReturnsValueOptional, SetQueryReturnsVoid, SetQueryTableAlias, SetQueryWith, SimpleJoinItem, SingleColumnIndexOptions, SmallIntColumn, SmallSerialColumn, SortDir, StringColumn, StringExpression, TableData, TextBaseColumn, TextColumn, TextColumnData, Then, TimeColumn, TimeInterval, TimestampColumn, TimestampTZColumn, ToSqlCtx, ToSqlOptions, Transaction, TransactionAdapter, TransactionOptions, TruncateQueryData, TsQueryColumn, TsVectorColumn, TypeParsers, UUIDColumn, UnhandledTypeError, Union, UnionArg, UnionItem, UnionKind, UnknownColumn, Update, UpdateCtx, UpdateData, UpdateQueryData, UpdateQueryDataItem, UpdateQueryDataObject, UpdatedAtDataInjector, UpsertCreateArg, UpsertData, UpsertResult, UpsertThis, VarCharColumn, VirtualColumn, Where, WhereArg, WhereArgs, WhereInArg, WhereInColumn, WhereInItem, WhereInValues, WhereItem, WhereJsonPathEqualsItem, WhereOnItem, WhereOnJoinItem, WhereQueryBuilder, WhereResult, WindowArg, WindowArgDeclaration, WindowDeclaration, WindowFunctionOptions, WindowItem, With, WithDataBase, WithDataItem, WithItem, WithOptions, XMLColumn, addOr, addOrNot, addParserForRawExpression, addParserForSelectItem, addParserToQuery, addQueryHook, addQueryOn, addQueryOrOn, addWhere, addWhereIn, addWhereNot, aggregate1FunctionNames, anyShape, checkIfASimpleQuery, cloneQueryArrays, columnCheckToCode, columnCode, columnForeignKeysToCode, columnIndexesToCode, columnTypes, utils as columnUtils, columnsByType, columnsShapeToCode, constraintPropsToCode, constraintToCode, createDb, foreignKeyArgumentToCode, getClonedQueryData, getColumnTypes, getConstraintKind, getQueryAs, getRaw, getShapeFromSelect, getTableData, getValueKey, handleResult, identityToCode, indexToCode, instantiateColumn, isQueryReturnsAll, isRequiredRelationKey, jsonTypes, logColors, logParamToLogObject, makeRegexToFindInSql, makeSql, newTableData, parseRecord, parseResult, primaryKeyToCode, processSelectArg, pushQueryArray, pushQueryOn, pushQueryOrOn, pushQueryValue, queryMethodByReturnType, queryTypeWithLimitOne, quote, quoteString, referencesArgsToCode, relationQueryKey, resetTableData, setQueryObjectValue, simplifyColumnDefault, testTransaction, toSql, toSqlCacheKey };