pqb 0.25.0 → 0.25.1

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import * as orchid_core from 'orchid-core';
-import { QueryResultRow, AdapterConfigBase, AdapterBase, QueryInput, Sql, RecordUnknown, RecordKeyTrue, EmptyObject, QueryBaseCommon, QueryColumns, QueryInternal, QueryMetaBase, QueryReturnType, QueryThen, Expression, QueryColumn, MaybeArray, SelectableBase, TemplateLiteralArgs, ColumnSchemaConfig, Code, PickOutputTypeAndOperators, PickQueryResult, OperatorToSQL, ColumnsShapeBase, ColumnsParsers, RecordString, PickQueryTable, getValueKey, PickQueryShape, EmptyTuple, PickQueryMeta, QueryColumnToNullable, PickQueryMetaResultReturnType as PickQueryMetaResultReturnType$1, QueryCatch, PickQueryMetaShape, DateColumnData, TimeInterval, ColumnTypeSchemaArg, ColumnTypeBase, ArrayMethodsData, StringTypeData, StaticSQLArgs, PickColumnBaseData, PrimaryKeyColumn, RawSQLBase, ForeignKeyTable, QueryColumnsInit, TimestampHelpers, ColumnNameOfTable, BaseNumberData, ColumnWithDefault, ParseColumn, EncodeColumn, PickQueryMetaResult, ColumnShapeOutput, DefaultSelectColumns, CoreQueryScopes, DbBase, TransactionState, SQLQueryArgs, PickQueryMetaResultWindows, BaseOperators as BaseOperators$1, IsQuery, PickQueryTableMetaResult, PickQueryMetaShapeResultReturnType, MergeObjects, RawSQLValues, ExpressionTypeMethod, DynamicSQLArg, PickQueryReturnType, PickType, PickOutputType, Spread, ColumnDataBase, PickQueryTableMetaShape } from 'orchid-core';
+import { QueryResultRow, AdapterConfigBase, AdapterBase, QueryInput, Sql, RecordUnknown, RecordKeyTrue, EmptyObject, QueryBaseCommon, QueryColumns, QueryInternal, QueryMetaBase, QueryReturnType, QueryThen, Expression, QueryColumn, MaybeArray, SelectableBase, TemplateLiteralArgs, ColumnSchemaConfig, Code, PickOutputTypeAndOperators, PickQueryResult, OperatorToSQL, ColumnsShapeBase, ColumnsParsers, RecordString, PickQueryTable, getValueKey, PickQueryShape, EmptyTuple, PickQueryMeta, QueryColumnToNullable, PickQueryMetaResultReturnType as PickQueryMetaResultReturnType$1, QueryCatch, PickQueryMetaShape, SQLQueryArgs, DateColumnData, TimeInterval, ColumnTypeSchemaArg, ColumnTypeBase, ArrayMethodsData, StringTypeData, StaticSQLArgs, PickColumnBaseData, PrimaryKeyColumn, RawSQLBase, ForeignKeyTable, QueryColumnsInit, TimestampHelpers, ColumnNameOfTable, BaseNumberData, ColumnWithDefault, ParseColumn, EncodeColumn, PickQueryMetaResult, ColumnShapeOutput, DefaultSelectColumns, CoreQueryScopes, DbBase, TransactionState, PickQueryMetaResultWindows, BaseOperators as BaseOperators$1, IsQuery, PickQueryTableMetaResult, PickQueryMetaShapeResultReturnType, MergeObjects, RawSQLValues, ExpressionTypeMethod, DynamicSQLArg, PickQueryReturnType, PickType, PickOutputType, Spread, ColumnDataBase, PickQueryTableMetaShape } from 'orchid-core';
 import { PoolConfig, Pool, PoolClient } from 'pg';
 import { inspect } from 'node:util';
 import { AsyncLocalStorage } from 'node:async_hooks';
@@ -695,9 +695,9 @@ type JoinOptionalMain<T extends PickQueryMetaResultReturnType$1, Selectable exte
         } & Selectable : T['meta'][K];
     } : K extends 'result' ? {
         [K in keyof T['result']]: QueryColumnToNullable<T['result'][K]>;
-    } : K extends 'then' ? QueryThen<GetQueryResult<T['returnType'], {
+    } : K extends 'then' ? QueryThen<GetQueryResult<T, {
         [K in keyof T['result']]: QueryColumnToNullable<T['result'][K]>;
-    }>> : K extends 'catch' ? QueryCatch<GetQueryResult<T['returnType'], {
+    }>> : K extends 'catch' ? QueryCatch<GetQueryResult<T, {
         [K in keyof T['result']]: QueryColumnToNullable<T['result'][K]>;
     }>> : T[K];
 };
@@ -1377,10 +1377,10 @@ type WhereQueryBuilder<T extends PickQueryRelations> = RelationsBase extends T['
 } : {
     [K in keyof T]: K extends keyof T['relations'] ? T['relations'][K] : T[K];
 };
-type WhereArgs<T extends PickQueryMetaRelations> = WhereArg<T>[] | TemplateLiteralArgs;
-type WhereNotArgs<T extends PickQueryMetaRelations> = [WhereArg<T>] | TemplateLiteralArgs;
+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 extends WhereInColumn<T>> = 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'][] | Query | Expression : ({
     [I in keyof Column]: Column[I] extends keyof T['meta']['selectable'] ? T['meta']['selectable'][Column[I]]['column']['queryType'] : never;
 } & {
     length: Column extends {
@@ -1396,25 +1396,22 @@ interface QueryMetaHasWhere {
         hasWhere: true;
     };
 }
-/**
- * Adds `where` arguments to query data: SQL template string is added as `RawSQL` object, other arguments are added as is.
- *
- * @param q - query object to add the data to
- * @param args - `where` arguments, may be a template literal
- */
 declare const _queryWhere: <T extends PickQueryMetaRelations>(q: T, args: WhereArgs<T>) => WhereResult<T>;
+declare const _queryWhereSql: <T>(q: T, args: SQLQueryArgs) => T;
 /**
- * Adds `where` arguments to query data with a `NOT` keyword: SQL template string is added as `RawSQL` object, other arguments are added as is.
+ * Adds `where` arguments to query data with a `NOT` keyword:
+ * SQL template string is added as `RawSQL` object, other arguments are added as is.
  *
  * @param q - query object to add the data to
- * @param args - `where` arguments, may be a template literal
+ * @param args - `where` arguments
  */
 declare const _queryWhereNot: <T extends PickQueryMetaRelations>(q: T, args: WhereNotArgs<T>) => WhereResult<T>;
+declare const _queryWhereNotSql: <T>(q: T, args: SQLQueryArgs) => T;
 /**
  * Adds `where` arguments to query data. Arguments will be separated from each other with `OR`.
  *
  * @param q - query object to add the data to
- * @param args - `where` arguments, may be a template literal
+ * @param args - `where` arguments
  */
 declare const _queryOr: <T extends PickQueryMetaRelations>(q: T, args: WhereArg<T>[]) => WhereResult<T>;
 /**
@@ -1453,7 +1450,7 @@ declare class Where {
      *   },
      *
      *   // where column equals to raw SQL
-     *   column: db.table.sql`raw expression`,
+     *   column: db.table.sql`sql expression`,
      * });
      * ```
      *
@@ -1502,9 +1499,6 @@ declare class Where {
      * `where` supports raw SQL:
      *
      * ```ts
-     * db.table.where`a = b`;
-     *
-     * // or
      * db.table.where(db.table.sql`a = b`);
      *
      * // or
@@ -1824,6 +1818,24 @@ declare class Where {
      * @param args - {@link WhereArgs}
      */
     where<T extends PickQueryMetaRelations>(this: T, ...args: WhereArgs<T>): WhereResult<T>;
+    /**
+     * Use a custom SQL expression in `WHERE` statement:
+     *
+     * ```ts
+     * db.table.where`a = b`;
+     *
+     * // or
+     * db.table.where(db.table.sql`a = b`);
+     *
+     * // or
+     * import { raw } from 'orchid-orm';
+     *
+     * db.table.where(raw`a = b`);
+     * ```
+     *
+     * @param args - SQL expression
+     */
+    whereSql<T>(this: T, ...args: SQLQueryArgs): T;
     /**
      * `whereNot` takes the same argument as `where`,
      * multiple conditions are combined with `AND`,
@@ -1840,6 +1852,16 @@ declare class Where {
      * @param args - {@link WhereArgs}
      */
     whereNot<T extends PickQueryMetaRelations>(this: T, ...args: WhereNotArgs<T>): WhereResult<T>;
+    /**
+     * `whereNot` version accepting SQL expression:
+     *
+     * ```ts
+     * db.table.whereNot`sql expression`
+     * ```
+     *
+     * @param args - SQL expression
+     */
+    whereNotSql<T>(this: T, ...args: SQLQueryArgs): T;
     /**
      * `orWhere` is accepting the same arguments as {@link where}, joining arguments with `OR`.
      *
@@ -2946,8 +2968,8 @@ interface AggregateOptions<T extends PickQueryMetaResultRelationsWindows> {
     over?: Over<T>;
 }
 type Over<T extends PickQueryMetaResultWindows> = keyof T['windows'] | WindowArgDeclaration<T>;
-type FnExpressionArgs<Q extends Query> = (SelectableOrExpression<Q> | FnExpressionArgsPairs<Q> | FnExpressionArgsValue)[];
-interface FnExpressionArgsPairs<Q extends Query> {
+type FnExpressionArgs<Q extends PickQueryMeta> = (SelectableOrExpression<Q> | FnExpressionArgsPairs<Q> | FnExpressionArgsValue)[];
+interface FnExpressionArgsPairs<Q extends PickQueryMeta> {
     pairs: Record<string, SelectableOrExpression<Q>>;
 }
 interface FnExpressionArgsValue {
@@ -3491,22 +3513,22 @@ declare class Clear {
 interface CreateSelf extends QueryBase {
     inputType: RecordUnknown;
 }
-type CreateData<T extends CreateSelf> = RelationsBase extends T['relations'] ? CreateDataWithDefaults<T> : CreateRelationsData<T>;
-type CreateDataWithDefaults<T extends CreateSelf, Defaults extends PropertyKey = keyof T['meta']['defaults']> = {
+type CreateData<T extends CreateSelf> = RelationsBase extends T['relations'] ? CreateDataWithDefaults<T, keyof T['meta']['defaults']> : CreateRelationsData<T>;
+type CreateDataWithDefaults<T extends CreateSelf, Defaults extends PropertyKey> = {
     [K in keyof T['inputType'] as K extends Defaults ? never : K]: CreateColumn<T['inputType'], K>;
 } & {
     [K in Defaults]?: K extends keyof T['inputType'] ? CreateColumn<T['inputType'], K> : never;
 };
-type CreateDataWithDefaultsForRelations<T extends CreateSelf, Defaults extends PropertyKey = keyof T['meta']['defaults'], OmitFKeys extends PropertyKey = T['relations'][keyof T['relations']]['relationConfig']['omitForeignKeyInCreate']> = {
+type CreateDataWithDefaultsForRelations<T extends CreateSelf, Defaults extends PropertyKey, OmitFKeys extends PropertyKey> = {
     [K in keyof T['inputType'] as K extends Defaults | OmitFKeys ? never : K]: CreateColumn<T['inputType'], K>;
 } & {
     [K in Defaults & keyof T['inputType'] as K extends OmitFKeys ? never : K]?: CreateColumn<T['inputType'], K>;
 };
-type CreateColumn<InputType extends RecordUnknown, Key extends keyof InputType> = Expression | InputType[Key] | {
+type CreateColumn<InputType, Key extends keyof InputType> = Expression | InputType[Key] | {
     __isQuery: true;
     then: QueryThen<InputType[Key]>;
 };
-type CreateRelationsData<T extends CreateSelf> = CreateDataWithDefaultsForRelations<T> & CreateRelationsDataOmittingFKeys<T, T['relations'][keyof T['relations']]['relationConfig']['dataForCreate']> & T['relations'][keyof T['relations']]['relationConfig']['optionalDataForCreate'];
+type CreateRelationsData<T extends CreateSelf> = CreateDataWithDefaultsForRelations<T, keyof T['meta']['defaults'], T['relations'][keyof T['relations']]['relationConfig']['omitForeignKeyInCreate']> & CreateRelationsDataOmittingFKeys<T, T['relations'][keyof T['relations']]['relationConfig']['dataForCreate']> & T['relations'][keyof T['relations']]['relationConfig']['optionalDataForCreate'];
 type CreateRelationsDataOmittingFKeys<T extends CreateSelf, Union> = (Union extends RelationConfigDataForCreate ? (u: keyof Union['columns'] extends keyof T['meta']['defaults'] ? Omit<Union['columns'], keyof T['meta']['defaults']> & {
     [P in keyof T['meta']['defaults'] & keyof Union['columns']]?: Union['columns'][P];
 } & Partial<Union['nested']> : Union['columns'] | Union['nested']) => void : never) extends (u: infer Obj extends RecordUnknown) => void ? Obj : never;
@@ -3536,7 +3558,7 @@ type CreateRawArgs<T extends CreateSelf, Arg extends {
     `Missing required columns: ${Exclude<keyof RawRequiredColumns<T> & string, Arg['columns'][number]>}`
 ];
 type OnConflictArg<T extends CreateSelf> = keyof T['shape'] | (keyof T['shape'])[] | Expression;
-type AddQueryDefaults<T extends CreateSelf, Defaults extends RecordKeyTrue> = {
+type AddQueryDefaults<T extends CreateSelf, Defaults> = {
     [K in keyof T]: K extends 'meta' ? {
         [K in keyof T['meta']]: K extends 'defaults' ? T['meta']['defaults'] & Defaults : T['meta'][K];
     } : T[K];
@@ -4053,27 +4075,26 @@ declare class For {
 }
 
 type FromQuerySelf = PickQueryMetaTableShapeReturnTypeWithData;
-type FromArgs<T extends FromQuerySelf> = [
-    first: PickQueryTableMetaResult | Expression | Exclude<keyof T['withData'], symbol | number>,
-    second?: {
-        only?: boolean;
-    }
-] | TemplateLiteralArgs;
-type FromResult<T extends FromQuerySelf, Args extends FromArgs<T>> = Args extends TemplateStringsArray ? T : Args[0] extends string ? T['withData'] extends WithDataItems ? Args[0] extends keyof T['withData'] ? {
+type FromArg<T extends FromQuerySelf> = PickQueryTableMetaResult | Expression | Exclude<keyof T['withData'], symbol | number>;
+interface FromArgOptions {
+    only?: boolean;
+}
+type FromResult<T extends FromQuerySelf, Arg extends FromArg<T>> = Arg extends string ? T['withData'] extends WithDataItems ? Arg extends keyof T['withData'] ? {
     [K in keyof T]: K extends 'meta' ? {
-        [K in keyof T['meta']]: K extends 'as' ? string | undefined : K extends 'selectable' ? SelectableFromShape<T['withData'][Args[0]]['shape'], Args[0]> : T['meta'][K];
+        [K in keyof T['meta']]: K extends 'as' ? string | undefined : K extends 'selectable' ? SelectableFromShape<T['withData'][Arg]['shape'], Arg> : T['meta'][K];
     } : T[K];
-} : SetQueryTableAlias<T, Args[0]> : SetQueryTableAlias<T, Args[0]> : Args[0] extends PickQueryTableMetaResult ? {
+} : SetQueryTableAlias<T, Arg> : SetQueryTableAlias<T, Arg> : Arg extends PickQueryTableMetaResult ? {
     [K in keyof T]: K extends 'meta' ? {
-        [K in keyof T['meta']]: K extends 'hasSelect' ? undefined : K extends 'as' ? AliasOrTable<Args[0]> : K extends 'selectable' ? {
-            [K in keyof Args[0]['result']]: K extends string ? {
+        [K in keyof T['meta']]: K extends 'hasSelect' ? undefined : K extends 'as' ? AliasOrTable<Arg> : K extends 'selectable' ? {
+            [K in keyof Arg['result']]: K extends string ? {
                 as: K;
-                column: Args[0]['result'][K];
+                column: Arg['result'][K];
             } : never;
         } : T['meta'][K];
-    } : K extends 'result' ? Args[0]['result'] : K extends 'shape' ? Args[0]['result'] : K extends 'then' ? QueryThen<GetQueryResult<T['returnType'], Args[0]['result']>> : K extends 'catch' ? QueryCatch<GetQueryResult<T['returnType'], Args[0]['result']>> : T[K];
+    } : K extends 'result' ? Arg['result'] : K extends 'shape' ? Arg['result'] : K extends 'then' ? QueryThen<GetQueryResult<T, Arg['result']>> : K extends 'catch' ? QueryCatch<GetQueryResult<T, Arg['result']>> : T[K];
 } : T;
-declare function queryFrom<T extends FromQuerySelf, Args extends FromArgs<T>>(self: T, args: Args): FromResult<T, Args>;
+declare function queryFrom<T extends FromQuerySelf, Arg extends FromArg<T>>(self: T, arg: Arg, options?: FromArgOptions): FromResult<T, Arg>;
+declare function queryFromSql<T extends FromQuerySelf>(self: T, args: SQLQueryArgs): T;
 declare class From {
     /**
      * Set the `FROM` value, by default the table name is used.
@@ -4082,13 +4103,6 @@ declare class From {
      * // accepts sub-query:
      * db.table.from(Otherdb.table.select('foo', 'bar'));
      *
-     * // accepts raw sql by template literal:
-     * const value = 123;
-     * db.table.from`value = ${value}`;
-     *
-     * // accepts raw sql:
-     * db.table.from(db.table.sql`value = ${value}`);
-     *
      * // accepts alias of `WITH` expression:
      * q.with('foo', Otherdb.table.select('id', 'name')).from('foo');
      * ```
@@ -4101,9 +4115,22 @@ declare class From {
      * });
      * ```
      *
-     * @param args - query, raw SQL, name of CTE table, or a template string
+     * @param arg - query or name of CTE table
+     * @param options - { only: true } for SQL `ONLY` keyword
+     */
+    from<T extends FromQuerySelf, Arg extends FromArg<T>>(this: T, arg: Arg, options?: FromArgOptions): FromResult<T, Arg>;
+    /**
+     * Set the `FROM` value with custom SQL:
+     *
+     * ```ts
+     * const value = 123;
+     * db.table.from`value = ${value}`;
+     * db.table.from(db.table.sql`value = ${value}`);
+     * ```
+     *
+     * @param args - SQL expression
      */
-    from<T extends FromQuerySelf, Args extends FromArgs<T>>(this: T, ...args: Args): FromResult<T, Args>;
+    fromSql<T extends FromQuerySelf, Arg extends FromArg<T>>(this: T, ...args: SQLQueryArgs): FromResult<T, Arg>;
 }
 
 declare class QueryGet {
@@ -4136,7 +4163,6 @@ declare class QueryGet {
     getOptional<T extends QueryGetSelf, Arg extends GetArg<T>>(this: T, arg: Arg): GetResultOptional<T, Arg>;
 }
 
-type HavingArgs<T> = TemplateLiteralArgs | HavingArgFn<T>[];
 type HavingArgFn<T> = (q: T) => {
     result: {
         value: {
@@ -4155,12 +4181,6 @@ declare class Having {
      * // HAVING count(*) >= 10
      * ```
      *
-     * Alternatively, it accepts a raw SQL template:
-     *
-     * ```ts
-     * db.table.having`count(*) >= ${10}`;
-     * ```
-     *
      * Multiple having conditions will be combined with `AND`:
      *
      * ```ts
@@ -4201,7 +4221,17 @@ 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: HavingArgs<T>): T;
+    having<T extends Query>(this: T, ...args: HavingArgFn<T>[]): T;
+    /**
+     * Provide SQL expression for the `HAVING` SQL statement:
+     *
+     * ```ts
+     * db.table.having`count(*) >= ${10}`;
+     * ```
+     *
+     * @param args - SQL expression
+     */
+    havingSql<T extends Query>(this: T, ...args: SQLQueryArgs): T;
 }
 
 type AfterHook<Select extends PropertyKey[], Shape extends QueryColumns> = QueryAfterHook<{
@@ -4535,7 +4565,7 @@ declare class QueryLog {
 type MergeQuery<T extends PickQueryMetaResultReturnTypeWithDataWindows, Q extends PickQueryMetaResultReturnTypeWithDataWindows> = {
     [K in keyof T]: K extends 'meta' ? {
         [K in keyof T['meta'] | keyof Q['meta']]: K extends 'selectable' ? MergeObjects<T['meta']['selectable'], Q['meta']['selectable']> : K extends keyof Q['meta'] ? Q['meta'][K] : T['meta'][K];
-    } : K extends 'result' ? MergeQueryResult<T, Q> : K extends 'returnType' ? QueryReturnType extends Q['returnType'] ? T['returnType'] : Q['returnType'] : K extends 'then' ? QueryThen<GetQueryResult<QueryReturnType extends Q['returnType'] ? T['returnType'] : Q['returnType'], MergeQueryResult<T, Q>>> : K extends 'catch' ? QueryCatch<GetQueryResult<QueryReturnType extends Q['returnType'] ? T['returnType'] : Q['returnType'], MergeQueryResult<T, Q>>> : K extends 'windows' ? MergeObjects<T['windows'], Q['windows']> : K extends 'withData' ? MergeObjects<T['withData'], Q['withData']> : T[K];
+    } : K extends 'result' ? MergeQueryResult<T, Q> : K extends 'returnType' ? QueryReturnType extends Q['returnType'] ? T['returnType'] : Q['returnType'] : K extends 'then' ? QueryThen<GetQueryResult<QueryReturnType extends Q['returnType'] ? T : Q, MergeQueryResult<T, Q>>> : K extends 'catch' ? QueryCatch<GetQueryResult<QueryReturnType extends Q['returnType'] ? T : Q, MergeQueryResult<T, Q>>> : K extends 'windows' ? MergeObjects<T['windows'], Q['windows']> : K extends 'withData' ? MergeObjects<T['withData'], Q['withData']> : T[K];
 };
 type MergeQueryResult<T extends PickQueryMetaResult, Q extends PickQueryMetaResult> = T['meta']['hasSelect'] extends true ? Q['meta']['hasSelect'] extends true ? {
     [K in keyof T['result'] | keyof Q['result']]: K extends keyof Q['result'] ? Q['result'][K] : T['result'][K];
@@ -4571,28 +4601,45 @@ type SelectAsValue<T extends SelectSelf> = keyof T['meta']['selectable'] | Expre
 type SelectSubQueryArg<T extends SelectSelf> = {
     [K in keyof T]: K extends keyof T['relations'] ? T['relations'][K]['relationConfig']['methodQuery'] : T[K];
 };
-type SelectResult<T extends SelectSelf, Columns extends PropertyKey[], Result extends QueryColumns = ('*' extends Columns[number] ? {
-    [K in Columns[number] | keyof T['shape'] 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)> = {
-    [K in keyof T]: K extends 'result' ? Result : K extends 'then' ? QueryThen<GetQueryResult<T['returnType'], Result>> : K extends 'catch' ? QueryCatch<GetQueryResult<T['returnType'], Result>> : T[K];
+type SelectResult<T extends SelectSelf, Columns extends PropertyKey[]> = {
+    [K in keyof T]: K extends 'result' ? ('*' extends Columns[number] ? {
+        [K in Columns[number] | keyof T['shape'] 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) : K extends 'then' ? QueryThen<GetQueryResult<T, ('*' extends Columns[number] ? {
+        [K in Columns[number] | keyof T['shape'] 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)>> : K extends 'catch' ? QueryCatch<GetQueryResult<T, ('*' extends Columns[number] ? {
+        [K in Columns[number] | keyof T['shape'] 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];
 } & QueryMetaHasSelect;
-type SelectResultObj<T extends SelectSelf, Obj extends SelectAsArg<T>, Result extends QueryColumns = {
-    [K in keyof Obj | (T['meta']['hasSelect'] extends true ? keyof T['result'] : never)]: K extends keyof Obj ? SelectAsValueResult<T, Obj[K]> : K extends keyof T['result'] ? T['result'][K] : never;
-}> = {
+type SelectResultObj<T extends SelectSelf, Obj extends SelectAsArg<T>> = {
     [K in keyof T]: K extends 'meta' ? T['meta'] & {
         selectable: SelectAsSelectable<Obj>;
-    } : K extends 'result' ? Result : K extends 'then' ? QueryThen<GetQueryResult<T['returnType'], Result>> : K extends 'catch' ? QueryCatch<GetQueryResult<T['returnType'], Result>> : T[K];
+    } : K extends 'result' ? {
+        [K in keyof Obj | (T['meta']['hasSelect'] extends true ? keyof T['result'] : never)]: 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 keyof Obj | (T['meta']['hasSelect'] extends true ? keyof T['result'] : never)]: K extends keyof Obj ? SelectAsValueResult<T, Obj[K]> : K extends keyof T['result'] ? T['result'][K] : never;
+    }>> : K extends 'catch' ? QueryCatch<GetQueryResult<T, {
+        [K in keyof Obj | (T['meta']['hasSelect'] extends true ? keyof T['result'] : never)]: K extends keyof Obj ? SelectAsValueResult<T, Obj[K]> : K extends keyof T['result'] ? T['result'][K] : never;
+    }>> : T[K];
 } & QueryMetaHasSelect;
-type SelectResultColumnsAndObj<T extends SelectSelf, Columns extends PropertyKey[], Obj extends SelectAsArg<T>, Result extends QueryColumns = {
-    [K in ('*' extends Columns[number] ? Exclude<Columns[number], '*'> | keyof T['shape'] : Columns[number]) | keyof Obj as K extends keyof T['meta']['selectable'] ? T['meta']['selectable'][K]['as'] : K]: K extends keyof T['meta']['selectable'] ? T['meta']['selectable'][K]['column'] : K extends keyof Obj ? SelectAsValueResult<T, Obj[K]> : never;
-} & (T['meta']['hasSelect'] extends true ? Omit<T['result'], Columns[number]> : unknown)> = {
+type SelectResultColumnsAndObj<T extends SelectSelf, Columns extends PropertyKey[], Obj extends SelectAsArg<T>> = {
     [K in keyof T]: K extends 'meta' ? T['meta'] & {
         selectable: SelectAsSelectable<Obj>;
-    } : K extends 'result' ? Result : K extends 'then' ? QueryThen<GetQueryResult<T['returnType'], Result>> : K extends 'catch' ? QueryCatch<GetQueryResult<T['returnType'], Result>> : T[K];
+    } : K extends 'result' ? // Combine previously selected items, all columns if * was provided,
+    {
+        [K in ('*' extends Columns[number] ? Exclude<Columns[number], '*'> | keyof T['shape'] : Columns[number]) | keyof Obj as K extends keyof T['meta']['selectable'] ? T['meta']['selectable'][K]['as'] : K]: K extends keyof T['meta']['selectable'] ? T['meta']['selectable'][K]['column'] : K extends keyof Obj ? SelectAsValueResult<T, Obj[K]> : never;
+    } & (T['meta']['hasSelect'] extends true ? Omit<T['result'], Columns[number]> : unknown) : K extends 'then' ? QueryThen<GetQueryResult<T, {
+        [K in ('*' extends Columns[number] ? Exclude<Columns[number], '*'> | keyof T['shape'] : Columns[number]) | keyof Obj as K extends keyof T['meta']['selectable'] ? T['meta']['selectable'][K]['as'] : K]: K extends keyof T['meta']['selectable'] ? T['meta']['selectable'][K]['column'] : K extends keyof Obj ? SelectAsValueResult<T, Obj[K]> : never;
+    } & (T['meta']['hasSelect'] extends true ? Omit<T['result'], Columns[number]> : unknown)>> : K extends 'catch' ? QueryCatch<GetQueryResult<T, {
+        [K in ('*' extends Columns[number] ? Exclude<Columns[number], '*'> | keyof T['shape'] : Columns[number]) | keyof Obj as K extends keyof T['meta']['selectable'] ? T['meta']['selectable'][K]['as'] : K]: K extends keyof T['meta']['selectable'] ? T['meta']['selectable'][K]['column'] : K extends keyof Obj ? SelectAsValueResult<T, Obj[K]> : never;
+    } & (T['meta']['hasSelect'] extends true ? Omit<T['result'], Columns[number]> : unknown)>> : T[K];
 } & QueryMetaHasSelect;
-type SelectAsSelectable<Arg extends RecordUnknown> = {
+type SelectAsSelectable<Arg> = {
     [K in keyof Arg]: Arg[keyof Arg] extends (q: never) => {
         result: QueryColumns;
     } ? {
@@ -4602,8 +4649,8 @@ type SelectAsSelectable<Arg extends RecordUnknown> = {
         };
     } : never;
 }[keyof Arg];
-type SelectAsValueResult<T extends SelectSelf, Arg extends SelectAsValue<T>> = Arg extends keyof T['meta']['selectable'] ? T['meta']['selectable'][Arg]['column'] : Arg extends Expression ? Arg['_type'] : Arg extends (q: never) => QueryBase ? SelectSubQueryResult<ReturnType<Arg>> : Arg extends (q: never) => Expression ? ReturnType<Arg>['_type'] : Arg extends (q: never) => QueryBase | Expression ? SelectSubQueryResult<Exclude<ReturnType<Arg>, Expression>> | Exclude<ReturnType<Arg>, QueryBase>['_type'] : never;
-type SelectSubQueryResult<Arg extends QueryBase> = QueryReturnsAll<Arg['returnType']> extends true ? ColumnsShapeToObjectArray<Arg['result']> : Arg['returnType'] extends 'valueOrThrow' ? Arg['result']['value'] : Arg['returnType'] extends 'pluck' ? ColumnsShapeToPluck<Arg['result']> : Arg['returnType'] extends 'one' ? ColumnsShapeToNullableObject<Arg['result']> : ColumnsShapeToObject<Arg['result']>;
+type SelectAsValueResult<T extends SelectSelf, Arg> = Arg extends keyof T['meta']['selectable'] ? T['meta']['selectable'][Arg]['column'] : Arg extends Expression ? Arg['_type'] : Arg extends (q: never) => QueryBase ? SelectSubQueryResult<ReturnType<Arg>> : Arg extends (q: never) => Expression ? ReturnType<Arg>['_type'] : Arg extends (q: never) => QueryBase | Expression ? SelectSubQueryResult<Exclude<ReturnType<Arg>, Expression>> | Exclude<ReturnType<Arg>, QueryBase>['_type'] : never;
+type SelectSubQueryResult<Arg extends SelectSelf> = QueryReturnsAll<Arg['returnType']> extends true ? ColumnsShapeToObjectArray<Arg['result']> : Arg['returnType'] extends '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;
 declare const addParserForSelectItem: <T extends PickQueryMeta>(q: T, as: string | getValueKey | undefined, key: string, arg: Query | SelectableOrExpression<T>) => string | Expression | Query;
 declare const processSelectArg: <T extends SelectSelf>(q: T, as: string | undefined, arg: SelectArg<T>, columnAs?: string | getValueKey) => SelectItem;
@@ -4852,7 +4899,7 @@ type UpdateColumn<T extends UpdateSelf, Key extends keyof T['inputType']> = T['i
 }) => UpdateColumnCallbackResult);
 type UpdateRelationData<T extends UpdateSelf, Rel extends RelationConfigBase> = QueryReturnsAll<T['returnType']> extends true ? Rel['dataForUpdate'] : Rel['one'] extends true ? Rel['dataForUpdate'] | Rel['dataForUpdateOne'] : 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 ? [sql: Expression] | TemplateLiteralArgs : 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 ChangeCountArg<T extends PickQueryShape> = keyof T['shape'] | {
     [K in keyof T['shape']]?: number;
@@ -5633,6 +5680,7 @@ declare class DynamicRawSQL<T extends QueryColumn, ColumnTypes = DefaultColumnTy
 declare function raw<T = unknown>(...args: StaticSQLArgs): RawSQL<QueryColumn<T>>;
 declare function raw<T = unknown>(...args: [DynamicSQLArg]): DynamicRawSQL<QueryColumn<T>>;
 declare const countSelect: RawSQL<QueryColumn<unknown, orchid_core.BaseOperators>, DefaultColumnTypes<ColumnSchemaConfig>>[];
+declare function sqlQueryArgsToExpression(args: SQLQueryArgs): RawSQL<QueryColumn>;
 
 declare abstract class RawSqlMethods<ColumnTypes> {
     /**
@@ -5871,11 +5919,11 @@ type OrderArgTsQuery<T extends OrderArgSelf> = string | undefined extends T['met
 type OrderArgKey<T extends OrderArgSelf> = keyof T['meta']['selectable'] | {
     [K in keyof T['result']]: T['result'][K]['dataType'] extends 'array' | 'object' ? never : K;
 }[keyof T['result']];
-type OrderArgs<T extends OrderArgSelf> = OrderArg<T>[] | TemplateLiteralArgs;
+type OrderArgs<T extends OrderArgSelf> = OrderArg<T>[];
 type GroupArg<T extends PickQueryResult> = {
     [K in keyof T['result']]: T['result'][K]['dataType'] extends 'array' | 'object' ? never : K;
 }[keyof T['result']] | Expression;
-type FindArgs<T extends PickQueryShapeSinglePrimaryKey> = [T['shape'][T['singlePrimaryKey']]['queryType'] | Expression] | TemplateLiteralArgs;
+type FindArg<T extends PickQueryShapeSinglePrimaryKey> = T['shape'][T['singlePrimaryKey']]['queryType'] | Expression;
 type QueryHelper<T extends PickQueryMetaShape, Args extends unknown[], Result> = {
     <Q extends {
         returnType: QueryReturnType;
@@ -6018,7 +6066,7 @@ declare class QueryMethods<ColumnTypes> {
      * The `find` method is available only for tables which has exactly one primary key.
      * And also it can accept raw SQL template literal, then the primary key is not required.
      *
-     * Find record by id, throw [NotFoundError](/guide/error-handling.html) if not found:
+     * Finds a record by id, throws {@link NotFoundError} if not found:
      *
      * ```ts
      * await db.table.find(1);
@@ -6031,22 +6079,49 @@ declare class QueryMethods<ColumnTypes> {
      * `;
      * ```
      *
-     * @param args - primary key value to find by, or a raw SQL
+     * @param value - primary key value to find by
+     */
+    find<T extends PickQueryShapeResultSinglePrimaryKey>(this: T, value: FindArg<T>): SetQueryReturnsOne<WhereResult<T>>;
+    /**
+     * Finds a single record with a given SQL, throws {@link NotFoundError} if not found:
+     *
+     * ```ts
+     * await db.user.find`
+     *   age = ${age} AND
+     *   name = ${name}
+     * `;
+     * ```
+     *
+     * @param args - SQL expression
      */
-    find<T extends PickQueryShapeResultSinglePrimaryKey>(this: T, ...args: FindArgs<T>): SetQueryReturnsOne<WhereResult<T>>;
+    findBySql<T extends PickQueryShapeResultSinglePrimaryKey>(this: T, ...args: SQLQueryArgs): SetQueryReturnsOne<WhereResult<T>>;
     /**
-     * Find a single record by the primary key (id), adds `LIMIT 1`, can accept a raw SQL.
+     * Find a single record by the primary key (id), adds `LIMIT 1`.
      * Returns `undefined` when not found.
      *
      * ```ts
      * const result: TableType | undefined = await db.table.find(123);
      * ```
      *
-     * @param args - primary key value to find by, or a raw SQL
+     * @param value - primary key value to find by, or a raw SQL
      */
-    findOptional<T extends PickQueryShapeResultSinglePrimaryKey>(this: T, ...args: FindArgs<T>): SetQueryReturnsOneOptional<WhereResult<T>>;
+    findOptional<T extends PickQueryShapeResultSinglePrimaryKey>(this: T, value: FindArg<T>): SetQueryReturnsOneOptional<WhereResult<T>>;
     /**
-     * The same as `where(conditions).take()`, it will filter records and add a `LIMIT 1`.
+     * Finds a single record with a given SQL.
+     * Returns `undefined` when not found.
+     *
+     * ```ts
+     * await db.user.find`
+     *   age = ${age} AND
+     *   name = ${name}
+     * `;
+     * ```
+     *
+     * @param args - SQL expression
+     */
+    findBySqlOptional<T extends PickQueryShapeResultSinglePrimaryKey>(this: T, ...args: SQLQueryArgs): SetQueryReturnsOneOptional<WhereResult<T>>;
+    /**
+     * The same as `where(conditions).take()`, takes the same arguments as {@link Where.where}, it will filter records and add a `LIMIT 1`.
      * Throws `NotFoundError` if not found.
      *
      * ```ts
@@ -6152,7 +6227,7 @@ declare class QueryMethods<ColumnTypes> {
     /**
      * Adds an order by clause to the query.
      *
-     * Takes one or more arguments, each argument can be a column name, an object, or a raw expression.
+     * Takes one or more arguments, each argument can be a column name or an object.
      *
      * ```ts
      * db.table.order('id', 'name'); // ASC by default
@@ -6164,11 +6239,6 @@ declare class QueryMethods<ColumnTypes> {
      *   name: 'ASC NULLS FIRST',
      *   age: 'DESC NULLS LAST',
      * });
-     *
-     * // order by raw SQL expression:
-     * db.table.order`raw sql`;
-     * // or
-     * db.table.order(db.table.sql`raw sql`);
      * ```
      *
      * `order` can refer to the values returned from `select` sub-queries (unlike `where` which cannot).
@@ -6187,9 +6257,23 @@ declare class QueryMethods<ColumnTypes> {
      *   });
      * ```
      *
-     * @param args - column name(s), raw SQL, or an object with column names and sort directions.
+     * @param args - column name(s) or an object with column names and sort directions.
      */
     order<T extends OrderArgSelf>(this: T, ...args: OrderArgs<T>): T;
+    /**
+     * Order by SQL expression
+     *
+     * Order by raw SQL expression.
+     *
+     * ```ts
+     * db.table.order`raw sql`;
+     * // or
+     * db.table.order(db.table.sql`raw sql`);
+     * ```
+     *
+     * @param args - SQL expression
+     */
+    orderSql<T>(this: T, ...args: SQLQueryArgs): T;
     /**
      * Adds a limit clause to the query.
      *
@@ -6469,11 +6553,11 @@ interface QueryWithTable extends Query {
 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 GetQueryResult<ReturnType extends QueryReturnType, Result extends QueryColumns> = QueryReturnsAll<ReturnType> extends true ? 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'][] : ReturnType extends 'rowCount' ? number : ReturnType extends 'void' ? void : never;
+type GetQueryResult<T extends PickQueryReturnType, Result extends QueryColumns> = QueryReturnsAll<T['returnType']> extends true ? 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 : T['returnType'] extends 'void' ? void : never;
 type AddQuerySelect<T extends PickQueryMetaResultReturnType, Result extends QueryColumns> = {
     [K in keyof T]: K extends 'result' ? {
         [K in (T['meta']['hasSelect'] extends true ? keyof T['result'] : never) | keyof Result]: K extends keyof Result ? Result[K] : K extends keyof T['result'] ? T['result'][K] : never;
-    } : K extends 'then' ? QueryThen<GetQueryResult<T['returnType'], Result>> : K extends 'catch' ? QueryCatch<GetQueryResult<T['returnType'], Result>> : T[K];
+    } : K extends 'then' ? QueryThen<GetQueryResult<T, Result>> : K extends 'catch' ? QueryCatch<GetQueryResult<T, Result>> : T[K];
 } & QueryMetaHasSelect;
 interface QueryMetaHasSelect {
     meta: {
@@ -7102,4 +7186,4 @@ type CopyResult<T extends PickQueryMeta> = SetQueryKind<T, 'copy'>;
  */
 declare function copyTableData<T extends PickQueryMetaShape>(query: T, arg: CopyArg<T>): CopyResult<T>;
 
-export { Adapter, AdapterConfig, AdapterOptions, AddQueryDefaults, AddQuerySelect, AddQueryWith, AfterHook, AggregateMethods, AggregateOptions, AliasOrTable, ArrayColumn, ArrayColumnValue, ArrayData, AsMethods, AsQueryArg, BaseOperators, BigIntColumn, BigSerialColumn, BitColumn, BitVaryingColumn, BooleanColumn$1 as BooleanColumn, BooleanQueryColumn, BoxColumn, ByteaColumn, CharColumn, CidrColumn, CircleColumn, CitextColumn, Clear, ClearStatement, CloneSelfKeys, ColumnData, ColumnExpression, ColumnFromDbParams, ColumnInfoQueryData, ColumnOperators, ColumnRefExpression, ColumnType, ColumnsByType, ColumnsShape, ColumnsShapeToNullableObject, ColumnsShapeToObject, ColumnsShapeToObjectArray, ColumnsShapeToPluck, CommonQueryData, ComputedColumnsBase, CopyOptions, CopyQueryData, Create, CreateColumn, CreateCtx, CreateData, CreateKind, CreateMethodsNames, CreateRelationsData, CreateRelationsDataOmittingFKeys, CreateSelf, CustomTypeColumn, DateBaseColumn, DateColumn, DateColumnInput, DateTimeBaseClass, DateTimeTzBaseClass, Db, DbOptions, DbResult, DbTableConstructor, DbTableOptionScopes, DbTableOptions, DecimalColumn, DefaultColumnTypes, DefaultSchemaConfig, Delete, DeleteArgs, DeleteMethodsNames, DeleteQueryData, DeleteResult, DomainColumn, DoublePrecisionColumn, DropMode, DynamicRawSQL, EnumColumn, ExpressionOrQueryReturning, ExpressionOutput, FnExpression, FnExpressionArgs, FnExpressionArgsPairs, FnExpressionArgsValue, For, ForeignKey, ForeignKeyAction, ForeignKeyMatch, ForeignKeyOptions, From, FromArgs, FromQuerySelf, FromResult, GetArg, GetColumnInfo, GetQueryResult, GetResult, GetResultOptional, GetStringArg, GroupArg, Having, HavingItem, HookAction, HookSelect, IdentityColumn, IndexColumnOptions, IndexOptions, InetColumn, InsertQueryData, IntegerBaseColumn, IntegerColumn, IntervalColumn, IsolationLevel, JSONColumn, JSONTextColumn, Join, JoinArgs, JoinCallback, JoinFirstArg, JoinItem, JoinLateralCallback, JoinLateralItem, JoinLateralResult, JoinOverrides, JoinQueryMethod, JoinResult, JoinedParsers, JoinedShapes, JsonItem, JsonMethods, JsonModifiers, LimitedTextBaseColumn, LineColumn, LsegColumn, MacAddr8Column, MacAddrColumn, MapTableScopesOption, MergeQuery, MergeQueryMethods, MoneyColumn, MoreThanOneRowError, NoPrimaryKeyOption, NotFoundError, NumberAsStringBaseColumn, NumberBaseColumn, NumberColumnData, OnConflictItem, OnConflictMergeUpdate, OnConflictQueryBuilder, OnQueryBuilder, Operator, Operators, OperatorsAny, OperatorsArray, OperatorsBoolean, OperatorsDate, OperatorsJson, OperatorsNumber, OperatorsText, OperatorsTime, OrCreateArg, OrchidOrmError, OrchidOrmInternalError, OrderArg, OrderArgSelf, OrderArgs, OrderItem, OrderTsQueryConfig, Over, PathColumn, PickColumnData, PickQueryBaseQuery, PickQueryDataShapeAndJoinedShapes, PickQueryInternal, PickQueryMetaRelations, PickQueryMetaResultRelations, PickQueryMetaResultRelationsWindows, PickQueryMetaResultRelationsWindowsColumnTypes, PickQueryMetaResultRelationsWithDataReturnType, PickQueryMetaResultRelationsWithDataReturnTypeShape, PickQueryMetaResultReturnType, PickQueryMetaResultReturnTypeWithDataWindows, PickQueryMetaResultReturnTypeWithDataWindowsTable, PickQueryMetaShapeRelationsWithData, PickQueryMetaTable, PickQueryMetaTableShape, PickQueryMetaTableShapeReturnTypeWithData, PickQueryMetaWithData, PickQueryQ, PickQueryQAndBaseQuery, PickQueryQAndInternal, PickQueryRelations, PickQueryRelationsWithData, PickQueryShapeResultSinglePrimaryKey, PickQueryShapeSinglePrimaryKey, PickQuerySinglePrimaryKey, PickQueryWindows, PickQueryWithData, PointColumn, PolygonColumn, Query, QueryAfterHook, QueryArraysResult, QueryBase, QueryBaseThen, QueryBeforeHook, QueryData, QueryDataJoinTo, QueryDefaultReturnData, QueryError, QueryErrorName, QueryGet, QueryGetSelf, QueryHelperResult, QueryHookSelect, QueryHooks, QueryLog, QueryLogObject, QueryLogOptions, QueryLogger, QueryMetaHasSelect, QueryMetaHasWhere, QueryMethods, QueryResult, QueryReturnsAll, QueryScopeData, QueryScopes, QuerySourceItem, QueryTransform, QueryTransformFn, QueryUpsertOrCreate, QueryWithComputed, QueryWithTable, RawSQL, RawSqlMethods, RealColumn, RelationConfigBase, RelationConfigDataForCreate, RelationJoinQuery, RelationQuery, RelationQueryBase, RelationsBase, RelationsChain, SearchArg, SearchMethods, SearchWeight, Select, SelectArg, SelectAs, SelectItem, SelectQueryData, SelectSubQueryResult, SelectableFromShape, SelectableOfType, SelectableOrExpression, SelectableOrExpressionOfType, SerialColumn, SerialColumnData, SetQueryKind, SetQueryReturnsAll, SetQueryReturnsAllKind, SetQueryReturnsColumnInfo, SetQueryReturnsColumnKind, SetQueryReturnsColumnOptional, SetQueryReturnsColumnOrThrow, SetQueryReturnsOne, SetQueryReturnsOneKind, SetQueryReturnsOneOptional, SetQueryReturnsPluck, SetQueryReturnsPluckColumn, SetQueryReturnsPluckColumnKind, SetQueryReturnsRowCount, SetQueryReturnsRows, SetQueryReturnsValueOptional, SetQueryReturnsValueOrThrow, SetQueryReturnsVoid, SetQueryReturnsVoidKind, SetQueryTableAlias, SetQueryWith, SimpleJoinItem, SingleColumnIndexOptions, SingleColumnIndexOptionsForColumn, SmallIntColumn, SmallSerialColumn, SortDir, StringColumn$1 as StringColumn, TableData, TextBaseColumn, TextColumn, TextColumnData, Then, TimeColumn, TimestampColumn, TimestampTZColumn, ToSQLCtx, ToSQLOptions, ToSQLQuery, Transaction, TransactionAdapter, TransactionOptions, TransformMethods, TruncateQueryData, TsQueryColumn, TsVectorColumn, TypeParsers, UUIDColumn, UnhandledTypeError, Union, UnionArg, UnionItem, UnionKind, UnknownColumn, Update, UpdateArg, UpdateCtx, UpdateData, UpdateQueryData, UpdateQueryDataItem, UpdateQueryDataObject, UpdateSelf, UpdatedAtDataInjector, UpsertArg, UpsertResult, UpsertThis, VarCharColumn, VirtualColumn, Where, WhereArg, WhereArgs, WhereInArg, WhereInColumn, WhereInItem, WhereInValues, WhereItem, WhereJsonPathEqualsItem, WhereNotArgs, WhereOnItem, WhereOnJoinItem, WhereQueryBase, WhereQueryBuilder, WhereResult, WhereSearchItem, WhereSearchResult, WindowArg, WindowArgDeclaration, WindowDeclaration, WindowItem, With, WithDataBase, WithDataItem, WithDataItems, WithItem, WithOptions, WrapQueryArg, XMLColumn, _queryAfterSaveCommit, _queryAll, _queryAs, _queryChangeCounter, _queryCreate, _queryCreateFrom, _queryCreateMany, _queryCreateManyFrom, _queryCreateManyRaw, _queryCreateRaw, _queryDefaults, _queryDelete, _queryExec, _queryFindBy, _queryFindByOptional, _queryGet, _queryGetOptional, _queryHookAfterCreate, _queryHookAfterCreateCommit, _queryHookAfterDelete, _queryHookAfterDeleteCommit, _queryHookAfterQuery, _queryHookAfterSave, _queryHookAfterUpdate, _queryHookAfterUpdateCommit, _queryHookBeforeCreate, _queryHookBeforeDelete, _queryHookBeforeQuery, _queryHookBeforeSave, _queryHookBeforeUpdate, _queryInsert, _queryInsertFrom, _queryInsertMany, _queryInsertManyFrom, _queryInsertManyRaw, _queryInsertRaw, _queryJoinOn, _queryJoinOnJsonPathEquals, _queryJoinOrOn, _queryOr, _queryOrNot, _queryRows, _querySelect, _queryTake, _queryTakeOptional, _queryUpdate, _queryUpdateOrThrow, _queryUpdateRaw, _queryWhere, _queryWhereIn, _queryWhereNot, addComputedColumns, addParserForRawExpression, addParserForSelectItem, addQueryOn, anyShape, checkIfASimpleQuery, cloneQuery, columnCheckToCode, columnCode, columnForeignKeysToCode, columnIndexesToCode, columnsShapeToCode, constraintPropsToCode, constraintToCode, copyTableData, countSelect, createDb, defaultSchemaConfig, extendQuery, foreignKeyArgumentToCode, getClonedQueryData, getColumnInfo, getColumnTypes, getConstraintKind, getQueryAs, getShapeFromSelect, getTableData, handleResult, identityToCode, indexToCode, instantiateColumn, isQueryReturnsAll, isSelectingCount, joinSubQuery, logColors, logParamToLogObject, makeColumnTypes, makeColumnsByType, makeExpression, makeFnExpression, makeRegexToFindInSql, makeSQL, newTableData, parseRecord, parseResult, primaryKeyToCode, processSelectArg, pushLimitSQL, pushQueryArray, pushQueryOn, pushQueryOrOn, pushQueryValue, queryFrom, queryJson, queryMethodByReturnType, queryTypeWithLimitOne, queryWrap, quote, quoteString, raw, referencesArgsToCode, resetTableData, resolveSubQueryCallback, saveSearchAlias, setParserForSelectedString, setQueryObjectValue, setQueryOperators, simplifyColumnDefault, templateLiteralToSQL, testTransaction, throwIfNoWhere, toSQL, toSQLCacheKey };
+export { Adapter, AdapterConfig, AdapterOptions, AddQueryDefaults, AddQuerySelect, AddQueryWith, AfterHook, AggregateMethods, AggregateOptions, AliasOrTable, ArrayColumn, ArrayColumnValue, ArrayData, AsMethods, AsQueryArg, BaseOperators, BigIntColumn, BigSerialColumn, BitColumn, BitVaryingColumn, BooleanColumn$1 as BooleanColumn, BooleanQueryColumn, BoxColumn, ByteaColumn, CharColumn, CidrColumn, CircleColumn, CitextColumn, Clear, ClearStatement, CloneSelfKeys, ColumnData, ColumnExpression, ColumnFromDbParams, ColumnInfoQueryData, ColumnOperators, ColumnRefExpression, ColumnType, ColumnsByType, ColumnsShape, ColumnsShapeToNullableObject, ColumnsShapeToObject, ColumnsShapeToObjectArray, ColumnsShapeToPluck, CommonQueryData, ComputedColumnsBase, CopyOptions, CopyQueryData, Create, CreateColumn, CreateCtx, CreateData, CreateKind, CreateMethodsNames, CreateRelationsData, CreateRelationsDataOmittingFKeys, CreateSelf, CustomTypeColumn, DateBaseColumn, DateColumn, DateColumnInput, DateTimeBaseClass, DateTimeTzBaseClass, Db, DbOptions, DbResult, DbTableConstructor, DbTableOptionScopes, DbTableOptions, DecimalColumn, DefaultColumnTypes, DefaultSchemaConfig, Delete, DeleteArgs, DeleteMethodsNames, DeleteQueryData, DeleteResult, DomainColumn, DoublePrecisionColumn, DropMode, DynamicRawSQL, EnumColumn, ExpressionOrQueryReturning, ExpressionOutput, FnExpression, FnExpressionArgs, FnExpressionArgsPairs, FnExpressionArgsValue, For, ForeignKey, ForeignKeyAction, ForeignKeyMatch, ForeignKeyOptions, From, FromArg, FromArgOptions, FromQuerySelf, FromResult, GetArg, GetColumnInfo, GetQueryResult, GetResult, GetResultOptional, GetStringArg, GroupArg, Having, HavingItem, HookAction, HookSelect, IdentityColumn, IndexColumnOptions, IndexOptions, InetColumn, InsertQueryData, IntegerBaseColumn, IntegerColumn, IntervalColumn, IsolationLevel, JSONColumn, JSONTextColumn, Join, JoinArgs, JoinCallback, JoinFirstArg, JoinItem, JoinLateralCallback, JoinLateralItem, JoinLateralResult, JoinOverrides, JoinQueryMethod, JoinResult, JoinedParsers, JoinedShapes, JsonItem, JsonMethods, JsonModifiers, LimitedTextBaseColumn, LineColumn, LsegColumn, MacAddr8Column, MacAddrColumn, MapTableScopesOption, MergeQuery, MergeQueryMethods, MoneyColumn, MoreThanOneRowError, NoPrimaryKeyOption, NotFoundError, NumberAsStringBaseColumn, NumberBaseColumn, NumberColumnData, OnConflictItem, OnConflictMergeUpdate, OnConflictQueryBuilder, OnQueryBuilder, Operator, Operators, OperatorsAny, OperatorsArray, OperatorsBoolean, OperatorsDate, OperatorsJson, OperatorsNumber, OperatorsText, OperatorsTime, OrCreateArg, OrchidOrmError, OrchidOrmInternalError, OrderArg, OrderArgSelf, OrderArgs, OrderItem, OrderTsQueryConfig, Over, PathColumn, PickColumnData, PickQueryBaseQuery, PickQueryDataShapeAndJoinedShapes, PickQueryInternal, PickQueryMetaRelations, PickQueryMetaResultRelations, PickQueryMetaResultRelationsWindows, PickQueryMetaResultRelationsWindowsColumnTypes, PickQueryMetaResultRelationsWithDataReturnType, PickQueryMetaResultRelationsWithDataReturnTypeShape, PickQueryMetaResultReturnType, PickQueryMetaResultReturnTypeWithDataWindows, PickQueryMetaResultReturnTypeWithDataWindowsTable, PickQueryMetaShapeRelationsWithData, PickQueryMetaTable, PickQueryMetaTableShape, PickQueryMetaTableShapeReturnTypeWithData, PickQueryMetaWithData, PickQueryQ, PickQueryQAndBaseQuery, PickQueryQAndInternal, PickQueryRelations, PickQueryRelationsWithData, PickQueryShapeResultSinglePrimaryKey, PickQueryShapeSinglePrimaryKey, PickQuerySinglePrimaryKey, PickQueryWindows, PickQueryWithData, PointColumn, PolygonColumn, Query, QueryAfterHook, QueryArraysResult, QueryBase, QueryBaseThen, QueryBeforeHook, QueryData, QueryDataJoinTo, QueryDefaultReturnData, QueryError, QueryErrorName, QueryGet, QueryGetSelf, QueryHelperResult, QueryHookSelect, QueryHooks, QueryLog, QueryLogObject, QueryLogOptions, QueryLogger, QueryMetaHasSelect, QueryMetaHasWhere, QueryMethods, QueryResult, QueryReturnsAll, QueryScopeData, QueryScopes, QuerySourceItem, QueryTransform, QueryTransformFn, QueryUpsertOrCreate, QueryWithComputed, QueryWithTable, RawSQL, RawSqlMethods, RealColumn, RelationConfigBase, RelationConfigDataForCreate, RelationJoinQuery, RelationQuery, RelationQueryBase, RelationsBase, RelationsChain, SearchArg, SearchMethods, SearchWeight, Select, SelectArg, SelectAs, SelectItem, SelectQueryData, SelectSubQueryResult, SelectableFromShape, SelectableOfType, SelectableOrExpression, SelectableOrExpressionOfType, SerialColumn, SerialColumnData, SetQueryKind, SetQueryReturnsAll, SetQueryReturnsAllKind, SetQueryReturnsColumnInfo, SetQueryReturnsColumnKind, SetQueryReturnsColumnOptional, SetQueryReturnsColumnOrThrow, SetQueryReturnsOne, SetQueryReturnsOneKind, SetQueryReturnsOneOptional, SetQueryReturnsPluck, SetQueryReturnsPluckColumn, SetQueryReturnsPluckColumnKind, SetQueryReturnsRowCount, SetQueryReturnsRows, SetQueryReturnsValueOptional, SetQueryReturnsValueOrThrow, SetQueryReturnsVoid, SetQueryReturnsVoidKind, SetQueryTableAlias, SetQueryWith, SimpleJoinItem, SingleColumnIndexOptions, SingleColumnIndexOptionsForColumn, SmallIntColumn, SmallSerialColumn, SortDir, StringColumn$1 as StringColumn, TableData, TextBaseColumn, TextColumn, TextColumnData, Then, TimeColumn, TimestampColumn, TimestampTZColumn, ToSQLCtx, ToSQLOptions, ToSQLQuery, Transaction, TransactionAdapter, TransactionOptions, TransformMethods, TruncateQueryData, TsQueryColumn, TsVectorColumn, TypeParsers, UUIDColumn, UnhandledTypeError, Union, UnionArg, UnionItem, UnionKind, UnknownColumn, Update, UpdateArg, UpdateCtx, UpdateData, UpdateQueryData, UpdateQueryDataItem, UpdateQueryDataObject, UpdateSelf, UpdatedAtDataInjector, UpsertArg, UpsertResult, UpsertThis, VarCharColumn, VirtualColumn, Where, WhereArg, WhereArgs, WhereInArg, WhereInColumn, WhereInItem, WhereInValues, WhereItem, WhereJsonPathEqualsItem, WhereNotArgs, WhereOnItem, WhereOnJoinItem, WhereQueryBase, WhereQueryBuilder, WhereResult, WhereSearchItem, WhereSearchResult, WindowArg, WindowArgDeclaration, WindowDeclaration, WindowItem, With, WithDataBase, WithDataItem, WithDataItems, WithItem, WithOptions, WrapQueryArg, XMLColumn, _queryAfterSaveCommit, _queryAll, _queryAs, _queryChangeCounter, _queryCreate, _queryCreateFrom, _queryCreateMany, _queryCreateManyFrom, _queryCreateManyRaw, _queryCreateRaw, _queryDefaults, _queryDelete, _queryExec, _queryFindBy, _queryFindByOptional, _queryGet, _queryGetOptional, _queryHookAfterCreate, _queryHookAfterCreateCommit, _queryHookAfterDelete, _queryHookAfterDeleteCommit, _queryHookAfterQuery, _queryHookAfterSave, _queryHookAfterUpdate, _queryHookAfterUpdateCommit, _queryHookBeforeCreate, _queryHookBeforeDelete, _queryHookBeforeQuery, _queryHookBeforeSave, _queryHookBeforeUpdate, _queryInsert, _queryInsertFrom, _queryInsertMany, _queryInsertManyFrom, _queryInsertManyRaw, _queryInsertRaw, _queryJoinOn, _queryJoinOnJsonPathEquals, _queryJoinOrOn, _queryOr, _queryOrNot, _queryRows, _querySelect, _queryTake, _queryTakeOptional, _queryUpdate, _queryUpdateOrThrow, _queryUpdateRaw, _queryWhere, _queryWhereIn, _queryWhereNot, _queryWhereNotSql, _queryWhereSql, addComputedColumns, addParserForRawExpression, addParserForSelectItem, addQueryOn, anyShape, checkIfASimpleQuery, cloneQuery, columnCheckToCode, columnCode, columnForeignKeysToCode, columnIndexesToCode, columnsShapeToCode, constraintPropsToCode, constraintToCode, copyTableData, countSelect, createDb, defaultSchemaConfig, extendQuery, foreignKeyArgumentToCode, getClonedQueryData, getColumnInfo, getColumnTypes, getConstraintKind, getQueryAs, getShapeFromSelect, getTableData, handleResult, identityToCode, indexToCode, instantiateColumn, isQueryReturnsAll, isSelectingCount, joinSubQuery, logColors, logParamToLogObject, makeColumnTypes, makeColumnsByType, makeExpression, makeFnExpression, makeRegexToFindInSql, makeSQL, newTableData, parseRecord, parseResult, primaryKeyToCode, processSelectArg, pushLimitSQL, pushQueryArray, pushQueryOn, pushQueryOrOn, pushQueryValue, queryFrom, queryFromSql, queryJson, queryMethodByReturnType, queryTypeWithLimitOne, queryWrap, quote, quoteString, raw, referencesArgsToCode, resetTableData, resolveSubQueryCallback, saveSearchAlias, setParserForSelectedString, setQueryObjectValue, setQueryOperators, simplifyColumnDefault, sqlQueryArgsToExpression, templateLiteralToSQL, testTransaction, throwIfNoWhere, toSQL, toSQLCacheKey };