pqb 0.30.3 → 0.30.4

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import * as orchid_core from 'orchid-core';
-import { QueryResultRow, AdapterConfigBase, AdapterBase, QueryInput, Sql, RecordUnknown, RecordKeyTrue, EmptyObject, QueryBaseCommon, QueryColumns, QueryMetaBase, QueryReturnType, QueryThen, Expression, QueryColumn, MaybeArray, SelectableBase, TemplateLiteralArgs, PickOutputTypeAndOperators, PickQueryResult, OperatorToSQL, ColumnsShapeBase, ColumnsParsers, RecordString, PickQueryTable, FnUnknownToUnknown, ExpressionChain, getValueKey, PickQueryShape, PickQueryTableMetaResult, EmptyTuple, PickQueryMeta, PickQueryMetaResultReturnType, QueryColumnToNullable, PickQueryMetaShape, PickQueryTableMetaResultShape, QueryColumnBooleanOrNull, SQLQueryArgs, ColumnSchemaConfig, DateColumnData, Code, TimeInterval, ColumnTypeSchemaArg, ColumnDataBase, ArrayMethodsData, RawSQLBase, RawSQLValues, ExpressionTypeMethod, DynamicSQLArg, StaticSQLArgs, ForeignKeyTable, ColumnNameOfTable, BaseNumberData, PickColumnBaseData, ColumnWithDefault, StringTypeData, PrimaryKeyColumn, ParseColumn, EncodeColumn, PickQueryMetaResult, QueryColumnsInit, DefaultSelectColumns, CoreQueryScopes, DbBase, QueryCatch, TransactionState, ColumnTypeBase, PickQueryMetaResultWindows, CoreBaseOperators, PickQueryUniqueProperties, IsQuery, PickQueryMetaShapeResultReturnType, MergeObjects, ExpressionData, ValExpression, PickOutputType, PickQueryResultUniqueColumns, QueryInternalBase, PickQueryReturnType, PickType, ColumnShapeOutput, PickQueryMetaReturnType, UniqueColumn, TimestampHelpers, Codes, ColumnDataCheckBase, PickQueryTableMetaShape } from 'orchid-core';
+import { QueryResultRow, AdapterConfigBase, AdapterBase, QueryInput, Sql, RecordUnknown, RecordKeyTrue, EmptyObject, QueryBaseCommon, QueryColumns, QueryMetaBase, QueryReturnType, QueryThen, Expression, QueryColumn, MaybeArray, SelectableBase, TemplateLiteralArgs, PickOutputTypeAndOperators, PickQueryResult, OperatorToSQL, ColumnsShapeBase, ColumnsParsers, RecordString, PickQueryTable, FnUnknownToUnknown, ExpressionChain, getValueKey, PickQueryShape, PickQueryTableMetaResult, EmptyTuple, PickQueryMeta, PickQueryMetaResultReturnType, QueryColumnToNullable, PickQueryMetaShape, PickQueryTableMetaResultShape, PickQueryMetaResultWindows, QueryColumnBooleanOrNull, ExpressionData, ValExpression, PickOutputType, SQLQueryArgs, ColumnSchemaConfig, DateColumnData, Code, TimeInterval, ColumnTypeSchemaArg, ColumnDataBase, ArrayMethodsData, RawSQLBase, RawSQLValues, ExpressionTypeMethod, DynamicSQLArg, StaticSQLArgs, ForeignKeyTable, ColumnNameOfTable, BaseNumberData, PickColumnBaseData, ColumnWithDefault, StringTypeData, PrimaryKeyColumn, ParseColumn, EncodeColumn, PickQueryMetaResult, QueryColumnsInit, DefaultSelectColumns, CoreQueryScopes, DbBase, QueryCatch, TransactionState, ColumnTypeBase, CoreBaseOperators, PickQueryUniqueProperties, IsQuery, PickQueryMetaShapeResultReturnType, MergeObjects, PickQueryResultUniqueColumns, QueryInternalBase, PickQueryReturnType, PickType, ColumnShapeOutput, PickQueryMetaReturnType, UniqueColumn, TimestampHelpers, Codes, ColumnDataCheckBase, PickQueryTableMetaShape } from 'orchid-core';
 import { PoolConfig, Pool, PoolClient } from 'pg';
 import { inspect } from 'node:util';
 import { AsyncLocalStorage } from 'node:async_hooks';
@@ -1427,12 +1427,184 @@ declare class OnMethods {
     onJsonPathEquals<T extends PickQueryMeta>(this: T, ...args: OnJsonPathEqualsArgs<T['meta']['selectable']>): T;
 }
 
+interface AggregateOptions<T extends PickQueryMetaResultRelationsWindows> {
+    distinct?: boolean;
+    order?: OrderArg<T> | OrderArg<T>[];
+    filter?: WhereArg<T>;
+    filterOr?: WhereArg<T>[];
+    withinGroup?: boolean;
+    over?: Over<T>;
+}
+type Over<T extends PickQueryMetaResultWindows> = keyof T['windows'] | WindowArgDeclaration<T>;
+type FnExpressionArgs<Q extends PickQueryMeta> = (SelectableOrExpression<Q> | FnExpressionArgsPairs<Q> | FnExpressionArgsValue)[];
+interface FnExpressionArgsPairs<Q extends PickQueryMeta> {
+    pairs: {
+        [K: string]: SelectableOrExpression<Q>;
+    };
+}
+interface FnExpressionArgsValue {
+    value: unknown;
+}
+declare class FnExpression<Q extends Query = Query, T extends QueryColumn = QueryColumn> extends Expression<T> {
+    query: Q;
+    fn: string;
+    args: FnExpressionArgs<Q>;
+    options: AggregateOptions<Q>;
+    result: {
+        value: T;
+    };
+    q: QueryData;
+    /**
+     * @param query - query object.
+     * @param fn - SQL function name.
+     * @param args - arguments of the function.
+     * @param options - aggregate options.
+     * @param value - column type of the function result.
+     */
+    constructor(query: Q, fn: string, args: FnExpressionArgs<Q>, options: AggregateOptions<Q>, value: T);
+    makeSQL(ctx: ToSQLCtx, quotedAs?: string): string;
+}
+type ColumnExpression<C extends QueryColumn, Ops extends BaseOperators = C['operators']> = Expression<C> & {
+    [K in keyof Ops]: (arg: Ops[K]['_opType']) => ColumnExpression<QueryColumnBooleanOrNull>;
+};
+declare function makeFnExpression<T extends PickQueryMetaResultRelationsWindows, C extends QueryColumn>(self: T, type: C, fn: string, args: FnExpressionArgs<Query>, options?: AggregateOptions<T>): SetQueryReturnsColumnOrThrow<T, C> & C['operators'];
+
+declare class ColumnRefExpression<T extends QueryColumn> extends Expression<T> {
+    name: string;
+    result: {
+        value: T;
+    };
+    q: ExpressionData;
+    constructor(value: T, name: string);
+    makeSQL(ctx: ToSQLCtx, quotedAs?: string): string;
+}
+declare class RefExpression<T extends QueryColumn> extends Expression<T> {
+    q: QueryData;
+    ref: string;
+    result: {
+        value: T;
+    };
+    constructor(value: T, q: QueryData, ref: string);
+    makeSQL(ctx: ToSQLCtx, quotedAs?: string): string;
+}
+type OrExpressionArg = QueryOrExpressionBooleanOrNullResult | undefined;
+interface OrExpression extends Expression<BooleanQueryColumn>, OperatorsBoolean {
+}
+declare class OrExpression extends Expression<BooleanQueryColumn> {
+    args: [OrExpressionArg, ...OrExpressionArg[]];
+    result: {
+        value: BooleanQueryColumn;
+    };
+    q: ExpressionData;
+    constructor(args: [OrExpressionArg, ...OrExpressionArg[]]);
+    makeSQL(ctx: {
+        values: unknown[];
+    }, quotedAs?: string): string;
+}
+interface QueryReturnsFnAdd<T extends PickQueryColumnTypes> extends QueryMetaHasSelect {
+    type<C extends QueryColumn>(fn: (types: T['columnTypes']) => C): {
+        [K in keyof T]: K extends 'result' ? {
+            value: C;
+        } : K extends 'returnType' ? 'valueOrThrow' : K extends 'then' ? QueryThen<C['outputType']> : T[K];
+    } & C['operators'];
+}
+type SetQueryReturnsFn<T extends PickQueryColumnTypes, C extends PickOutputType> = {
+    [K in keyof T]: K extends 'result' ? {
+        value: C;
+    } : K extends 'returnType' ? 'valueOrThrow' : K extends 'then' ? QueryThen<C['outputType']> : T[K];
+} & QueryReturnsFnAdd<T>;
+declare class ExpressionMethods {
+    /**
+     * `column` references a table column, this can be used in raw SQL or when building a column expression.
+     * Only for referencing a column in the query's table. For referencing joined table's columns, see [ref](#ref).
+     *
+     * ```ts
+     * await db.table.select({
+     *   // select `("table"."id" = 1 OR "table"."name" = 'name') AS "one"`,
+     *   // returns a boolean
+     *   one: (q) =>
+     *     q.sql<boolean>`${q.column('id')} = ${1} OR ${q.column('name')} = ${'name'}`,
+     *
+     *   // selects the same as above, but by building a query
+     *   two: (q) => q.column('id').equals(1).or(q.column('name').equals('name')),
+     * });
+     * ```
+     *
+     * @param name - column name
+     */
+    column<T extends PickQueryShape, K extends keyof T['shape']>(this: T, name: K): ColumnRefExpression<T['shape'][K]> & T['shape'][K]['operators'];
+    /**
+     * `ref` is similar to [column](#column), but it also allows to reference a column of joined table,
+     * and other dynamically defined columns.
+     *
+     * ```ts
+     * await db.table.join('otherTable').select({
+     *   // select `("otherTable"."id" = 1 OR "otherTable"."name" = 'name') AS "one"`,
+     *   // returns a boolean
+     *   one: (q) =>
+     *     q.sql<boolean>`${q.ref('otherTable.id')} = ${1} OR ${q.ref(
+     *       'otherTable.name',
+     *     )} = ${'name'}`,
+     *
+     *   // selects the same as above, but by building a query
+     *   two: (q) =>
+     *     q
+     *       .ref('otherTable.id')
+     *       .equals(1)
+     *       .or(q.ref('otherTable.name').equals('name')),
+     * });
+     * ```
+     *
+     * @param arg - any available column name, such as of a joined table
+     */
+    ref<T extends PickQueryMeta, K extends keyof T['meta']['selectable'] & string>(this: T, arg: K): RefExpression<T['meta']['selectable'][K]['column']> & T['meta']['selectable'][K]['column']['operators'];
+    val(value: unknown): ValExpression;
+    /**
+     * `fn` allows to call an arbitrary SQL function.
+     *
+     * For example, calling `sqrt` function to get a square root from some numeric column:
+     *
+     * ```ts
+     * const q = await User.select({
+     *   sqrt: (q) => q.fn<number>('sqrt', ['numericColumn']),
+     * }).take();
+     *
+     * q.sqrt; // has type `number` just as provided
+     * ```
+     *
+     * If this is an aggregate function, you can specify aggregation options (see [Aggregate](/guide/aggregate.html)) via third parameter.
+     *
+     * Use `type` method to specify a column type so that its operators such as `lt` and `gt` become available:
+     *
+     * ```ts
+     * const q = await User.select({
+     *   // Produces `sqrt("numericColumn") > 5`
+     *   sqrtIsGreaterThan5: (q) =>
+     *     q
+     *       .fn('sqrt', ['numericColumn'])
+     *       .type((t) => t.float())
+     *       .gt(5),
+     * }).take();
+     *
+     * // Return type is boolean | null
+     * // todo: it should be just boolean if the column is not nullable, but for now it's always nullable
+     * q.sqrtIsGreaterThan5;
+     * ```
+     *
+     * @param fn
+     * @param args
+     * @param options
+     */
+    fn<T extends PickQueryMetaResultRelationsWindowsColumnTypes, Type = unknown, C extends QueryColumn = QueryColumn<Type>>(this: T, fn: string, args: SelectableOrExpression<T>[], options?: AggregateOptions<T>): SetQueryReturnsFn<T, C>;
+    or(...args: [OrExpressionArg, ...OrExpressionArg[]]): OrExpression;
+}
+
 type WhereArg<T extends PickQueryMetaRelations> = {
     [K in keyof T['meta']['selectable'] | 'NOT' | 'OR' | 'IN']?: K extends 'NOT' ? MaybeArray<WhereArg<T>> : K extends 'OR' ? MaybeArray<WhereArg<T>>[] : K extends 'IN' ? MaybeArray<{
         columns: (keyof T['meta']['selectable'])[];
         values: unknown[][] | QueryBase | Expression;
-    }> : T['meta']['selectable'][K]['column']['queryType'] | null | ColumnOperators<T['meta']['selectable'], K> | Expression | QueryBase;
-} | QueryBase | Expression<QueryColumnBooleanOrNull> | ((q: WhereQueryBuilder<T>) => QueryColumnBooleanOrNull | QueryBaseThen<boolean | null> | WhereQueryBuilder<T>);
+    }> : T['meta']['selectable'][K]['column']['queryType'] | null | ColumnOperators<T['meta']['selectable'], K> | QueryOrExpression<T['meta']['selectable'][K]['column']['queryType'] | null> | ((q: T) => QueryOrExpression<T['meta']['selectable'][K]['column']['queryType'] | null>);
+} | QueryOrExpressionBooleanOrNullResult | ((q: WhereQueryBuilder<T>) => QueryOrExpressionBooleanOrNullResult | WhereQueryBuilder<T>);
 /**
  * Callback argument of `where`.
  * It has `where` methods (`where`, `whereNot`, `whereExists`, etc.),
@@ -1442,9 +1614,9 @@ type WhereArg<T extends PickQueryMetaRelations> = {
  * ```
  */
 type WhereQueryBuilder<T extends PickQueryRelations> = RelationsBase extends T['relations'] ? {
-    [K in keyof T]: K extends keyof QueryBase | keyof Where ? T[K] : never;
+    [K in keyof T]: K extends keyof QueryBase | keyof Where | keyof ExpressionMethods | 'sql' ? T[K] : never;
 } : {
-    [K in keyof T]: K extends keyof T['relations'] ? T['relations'][K] : T[K];
+    [K in keyof T]: K extends keyof T['relations'] ? T['relations'][K] : K extends keyof QueryBase | keyof Where | keyof ExpressionMethods | 'sql' ? T[K] : never;
 };
 type WhereArgs<T extends PickQueryMetaRelations> = WhereArg<T>[];
 type WhereNotArgs<T extends PickQueryMetaRelations> = [WhereArg<T>];
@@ -1518,6 +1690,11 @@ declare class Where {
      *   // where column equals to raw SQL
      *   // import `sql` from your `BaseTable`
      *   column: sql`sql expression`,
+     *   // or use `(q) => q.sql` for the same
+     *   column2: (q) => q.sql`sql expression`,
+     *
+     *   // reference other columns in such a way:
+     *   firstName: (q) => q.ref('lastName'),
      * });
      * ```
      *
@@ -3131,48 +3308,6 @@ declare const resolveSubQueryCallback: (q: ToSQLQuery, cb: (q: ToSQLQuery) => To
  */
 declare const joinSubQuery: (q: ToSQLQuery, sub: ToSQLQuery) => Query;
 
-interface AggregateOptions<T extends PickQueryMetaResultRelationsWindows> {
-    distinct?: boolean;
-    order?: OrderArg<T> | OrderArg<T>[];
-    filter?: WhereArg<T>;
-    filterOr?: WhereArg<T>[];
-    withinGroup?: boolean;
-    over?: Over<T>;
-}
-type Over<T extends PickQueryMetaResultWindows> = keyof T['windows'] | WindowArgDeclaration<T>;
-type FnExpressionArgs<Q extends PickQueryMeta> = (SelectableOrExpression<Q> | FnExpressionArgsPairs<Q> | FnExpressionArgsValue)[];
-interface FnExpressionArgsPairs<Q extends PickQueryMeta> {
-    pairs: {
-        [K: string]: SelectableOrExpression<Q>;
-    };
-}
-interface FnExpressionArgsValue {
-    value: unknown;
-}
-declare class FnExpression<Q extends Query = Query, T extends QueryColumn = QueryColumn> extends Expression<T> {
-    query: Q;
-    fn: string;
-    args: FnExpressionArgs<Q>;
-    options: AggregateOptions<Q>;
-    result: {
-        value: T;
-    };
-    q: QueryData;
-    /**
-     * @param query - query object.
-     * @param fn - SQL function name.
-     * @param args - arguments of the function.
-     * @param options - aggregate options.
-     * @param value - column type of the function result.
-     */
-    constructor(query: Q, fn: string, args: FnExpressionArgs<Q>, options: AggregateOptions<Q>, value: T);
-    makeSQL(ctx: ToSQLCtx, quotedAs?: string): string;
-}
-type ColumnExpression<C extends QueryColumn, Ops extends BaseOperators = C['operators']> = Expression<C> & {
-    [K in keyof Ops]: (arg: Ops[K]['_opType']) => ColumnExpression<QueryColumnBooleanOrNull>;
-};
-declare function makeFnExpression<T extends PickQueryMetaResultRelationsWindows, C extends QueryColumn>(self: T, type: C, fn: string, args: FnExpressionArgs<Query>, options?: AggregateOptions<T>): SetQueryReturnsColumnOrThrow<T, C> & C['operators'];
-
 type QueryGetSelf = PickQueryMetaTable;
 type GetArg<T extends QueryGetSelf> = GetStringArg<T> | Expression;
 type GetStringArg<T extends PickQueryMeta> = keyof T['meta']['selectable'] & string;
@@ -6058,121 +6193,6 @@ declare class TransformMethods {
     transform<T extends Query, Fn extends QueryTransformFn<T>>(this: T, fn: Fn): QueryTransform<T, ReturnType<Fn>>;
 }
 
-declare class ColumnRefExpression<T extends QueryColumn> extends Expression<T> {
-    name: string;
-    result: {
-        value: T;
-    };
-    q: ExpressionData;
-    constructor(value: T, name: string);
-    makeSQL(ctx: ToSQLCtx, quotedAs?: string): string;
-}
-declare class RefExpression<T extends QueryColumn> extends Expression<T> {
-    q: QueryData;
-    ref: string;
-    result: {
-        value: T;
-    };
-    constructor(value: T, q: QueryData, ref: string);
-    makeSQL(ctx: ToSQLCtx, quotedAs?: string): string;
-}
-interface QueryReturnsFnAdd<T extends PickQueryColumnTypes> extends QueryMetaHasSelect {
-    type<C extends QueryColumn>(fn: (types: T['columnTypes']) => C): {
-        [K in keyof T]: K extends 'result' ? {
-            value: C;
-        } : K extends 'returnType' ? 'valueOrThrow' : K extends 'then' ? QueryThen<C['outputType']> : T[K];
-    } & C['operators'];
-}
-type SetQueryReturnsFn<T extends PickQueryColumnTypes, C extends PickOutputType> = {
-    [K in keyof T]: K extends 'result' ? {
-        value: C;
-    } : K extends 'returnType' ? 'valueOrThrow' : K extends 'then' ? QueryThen<C['outputType']> : T[K];
-} & QueryReturnsFnAdd<T>;
-declare class ExpressionMethods {
-    /**
-     * `column` references a table column, this can be used in raw SQL or when building a column expression.
-     * Only for referencing a column in the query's table. For referencing joined table's columns, see [ref](#ref).
-     *
-     * ```ts
-     * await db.table.select({
-     *   // select `("table"."id" = 1 OR "table"."name" = 'name') AS "one"`,
-     *   // returns a boolean
-     *   one: (q) =>
-     *     q.sql<boolean>`${q.column('id')} = ${1} OR ${q.column('name')} = ${'name'}`,
-     *
-     *   // selects the same as above, but by building a query
-     *   two: (q) => q.column('id').equals(1).or(q.column('name').equals('name')),
-     * });
-     * ```
-     *
-     * @param name - column name
-     */
-    column<T extends PickQueryShape, K extends keyof T['shape']>(this: T, name: K): ColumnRefExpression<T['shape'][K]> & T['shape'][K]['operators'];
-    /**
-     * `ref` is similar to [column](#column), but it also allows to reference a column of joined table,
-     * and other dynamically defined columns.
-     *
-     * ```ts
-     * await db.table.join('otherTable').select({
-     *   // select `("otherTable"."id" = 1 OR "otherTable"."name" = 'name') AS "one"`,
-     *   // returns a boolean
-     *   one: (q) =>
-     *     q.sql<boolean>`${q.ref('otherTable.id')} = ${1} OR ${q.ref(
-     *       'otherTable.name',
-     *     )} = ${'name'}`,
-     *
-     *   // selects the same as above, but by building a query
-     *   two: (q) =>
-     *     q
-     *       .ref('otherTable.id')
-     *       .equals(1)
-     *       .or(q.ref('otherTable.name').equals('name')),
-     * });
-     * ```
-     *
-     * @param arg - any available column name, such as of a joined table
-     */
-    ref<T extends PickQueryMeta, K extends keyof T['meta']['selectable'] & string>(this: T, arg: K): RefExpression<T['meta']['selectable'][K]['column']> & T['meta']['selectable'][K]['column']['operators'];
-    val(value: unknown): ValExpression;
-    /**
-     * `fn` allows to call an arbitrary SQL function.
-     *
-     * For example, calling `sqrt` function to get a square root from some numeric column:
-     *
-     * ```ts
-     * const q = await User.select({
-     *   sqrt: (q) => q.fn<number>('sqrt', ['numericColumn']),
-     * }).take();
-     *
-     * q.sqrt; // has type `number` just as provided
-     * ```
-     *
-     * If this is an aggregate function, you can specify aggregation options (see [Aggregate](/guide/aggregate.html)) via third parameter.
-     *
-     * Use `type` method to specify a column type so that its operators such as `lt` and `gt` become available:
-     *
-     * ```ts
-     * const q = await User.select({
-     *   // Produces `sqrt("numericColumn") > 5`
-     *   sqrtIsGreaterThan5: (q) =>
-     *     q
-     *       .fn('sqrt', ['numericColumn'])
-     *       .type((t) => t.float())
-     *       .gt(5),
-     * }).take();
-     *
-     * // Return type is boolean | null
-     * // todo: it should be just boolean if the column is not nullable, but for now it's always nullable
-     * q.sqrtIsGreaterThan5;
-     * ```
-     *
-     * @param fn
-     * @param args
-     * @param options
-     */
-    fn<T extends PickQueryMetaResultRelationsWindowsColumnTypes, Type = unknown, C extends QueryColumn = QueryColumn<Type>>(this: T, fn: string, args: SelectableOrExpression<T>[], options?: AggregateOptions<T>): SetQueryReturnsFn<T, C>;
-}
-
 interface WindowArg<T extends OrderArgSelf> {
     [K: string]: WindowArgDeclaration<T> | Expression;
 }
@@ -7011,6 +7031,12 @@ type SetQueryWith<T, WithData> = {
 type AddQueryWith<T extends PickQueryWithData, With extends WithDataItem> = SetQueryWith<T, {
     [K in keyof T['withData'] | With['table']]: K extends With['table'] ? With : K extends keyof T['withData'] ? T['withData'][K] : never;
 }>;
+interface QueryOrExpression<T> {
+    result: {
+        value: QueryColumn<T>;
+    };
+}
+type QueryOrExpressionBooleanOrNullResult = QueryOrExpression<boolean | null>;
 
 interface ColumnData extends ColumnDataBase {
     maxChars?: number;
@@ -7673,4 +7699,4 @@ type CopyResult<T extends PickQueryMeta> = SetQueryKind<T, 'copy'>;
  */
 declare function copyTableData<T extends PickQueryMetaShape>(query: T, arg: CopyArg<T>): CopyResult<T>;
 
-export { Adapter, AdapterConfig, AdapterOptions, AddQueryDefaults, AddQuerySelect, AddQueryWith, AfterHook, AggregateMethods, AggregateOptions, AliasOrTable, ArrayColumn, ArrayColumnValue, ArrayData, AsMethods, AsQueryArg, BaseOperators, BigIntColumn, BigSerialColumn, BitColumn, BitVaryingColumn, BooleanColumn, BooleanQueryColumn, BoxColumn, ByteaColumn, CharColumn, CidrColumn, CircleColumn, CitextColumn, Clear, ClearStatement, CloneSelfKeys, ColumnData, ColumnExpression, ColumnFromDbParams, ColumnInfoQueryData, ColumnOperators, ColumnRefExpression, ColumnType, ColumnsByType, ColumnsShape, ColumnsShapeToNullableObject, ColumnsShapeToObject, ColumnsShapeToObjectArray, ColumnsShapeToPluck, CommonQueryData, ComputedColumnsBase, CopyOptions, CopyQueryData, Create, CreateBelongsToData, CreateColumn, CreateCtx, CreateData, CreateKind, CreateMethodsNames, CreateRelationsData, CreateRelationsDataOmittingFKeys, CreateSelf, CustomTypeColumn, DateBaseColumn, DateColumn, DateColumnInput, DateTimeBaseClass, DateTimeTzBaseClass, Db, DbDomainArg, DbDomainArgRecord, DbExtension, DbOptions, DbResult, DbSharedOptions, DbTableConstructor, DbTableOptionScopes, DbTableOptions, DecimalColumn, DecimalColumnData, DefaultColumnTypes, DefaultSchemaConfig, Delete, DeleteArgs, DeleteMethodsNames, DeleteQueryData, DeleteResult, DomainColumn, DoublePrecisionColumn, DynamicRawSQL, EnumColumn, ExpressionMethods, ExpressionOutput, FnExpression, FnExpressionArgs, FnExpressionArgsPairs, FnExpressionArgsValue, For, From, FromArg, FromQuerySelf, FromResult, GetArg, GetColumnInfo, GetQueryResult, GetResult, GetResultOptional, GetStringArg, GroupArg, Having, HavingItem, HookAction, HookSelect, IdentityColumn, InetColumn, InsertQueryData, IntegerBaseColumn, IntegerColumn, IntervalColumn, IsolationLevel, JSONColumn, JSONTextColumn, Join, JoinArgs, JoinCallback, JoinFirstArg, JoinItem, JoinItemArgs, JoinLateralCallback, JoinLateralItem, JoinLateralResult, JoinOverrides, JoinQueryBuilder, JoinQueryMethod, JoinResult, JoinedParsers, JoinedShapes, JsonItem, JsonMethods, JsonModifiers, LimitedTextBaseColumn, LineColumn, LsegColumn, MacAddr8Column, MacAddrColumn, MapTableScopesOption, MergeQuery, MergeQueryMethods, MoneyColumn, MoreThanOneRowError, NoPrimaryKeyOption, NotFoundError, NumberAsStringBaseColumn, NumberBaseColumn, NumberColumnData, OnConflictMerge, OnConflictQueryBuilder, OnConflictSet, OnConflictTarget, OnMethods, Operator, Operators, OperatorsAny, OperatorsArray, OperatorsBoolean, OperatorsDate, OperatorsJson, OperatorsNumber, OperatorsText, OperatorsTime, OrCreateArg, OrchidOrmError, OrchidOrmInternalError, OrderArg, OrderArgSelf, OrderArgs, OrderItem, OrderTsQueryConfig, Over, PathColumn, PickColumnData, PickQueryBaseQuery, PickQueryColumnTypes, PickQueryDataShapeAndJoinedShapes, PickQueryInternal, PickQueryMetaRelations, PickQueryMetaResultRelations, PickQueryMetaResultRelationsWindows, PickQueryMetaResultRelationsWindowsColumnTypes, PickQueryMetaResultRelationsWithDataReturnType, PickQueryMetaResultRelationsWithDataReturnTypeShape, PickQueryMetaResultReturnTypeWithDataWindows, PickQueryMetaResultReturnTypeWithDataWindowsTable, PickQueryMetaShapeRelationsWithData, PickQueryMetaTable, PickQueryMetaTableShape, PickQueryMetaTableShapeReturnTypeWithData, PickQueryMetaWithData, PickQueryQ, PickQueryQAndBaseQuery, PickQueryQAndInternal, PickQueryRelations, PickQueryRelationsWithData, PickQueryShapeResultSinglePrimaryKey, PickQueryShapeSinglePrimaryKey, PickQuerySinglePrimaryKey, PickQueryWindows, PickQueryWithData, PointColumn, PolygonColumn, Query, QueryAfterHook, QueryArraysResult, QueryBase, QueryBaseThen, QueryBeforeHook, QueryData, QueryDataFromItem, QueryDataJoinTo, QueryDefaultReturnData, QueryError, QueryErrorName, QueryGet, QueryGetSelf, QueryHelperResult, QueryHookSelect, QueryHooks, QueryInternal, QueryLog, QueryLogObject, QueryLogOptions, QueryLogger, QueryMetaHasSelect, QueryMetaHasWhere, QueryMethods, QueryResult, QueryReturnsAll, QueryScopeData, QueryScopes, QuerySourceItem, QueryTransform, QueryTransformFn, QueryUpsertOrCreate, QueryWithComputed, QueryWithTable, RawSQL, RealColumn, RecordOfColumnsShapeBase, RefExpression, RelationConfigBase, RelationConfigDataForCreate, RelationJoinQuery, RelationQuery, RelationQueryBase, RelationsBase, SearchArg, SearchMethods, SearchWeight, SearchWeightRecord, Select, SelectArg, SelectAs, SelectItem, SelectQueryData, SelectSubQueryResult, SelectableFromShape, SelectableOfType, SelectableOrExpression, SelectableOrExpressionOfType, SerialColumn, SerialColumnData, SetQueryKind, SetQueryKindResult, SetQueryReturnsAll, SetQueryReturnsAllKind, SetQueryReturnsAllKindResult, SetQueryReturnsColumnInfo, SetQueryReturnsColumnKind, SetQueryReturnsColumnKindResult, SetQueryReturnsColumnOptional, SetQueryReturnsColumnOrThrow, SetQueryReturnsOne, SetQueryReturnsOneKind, SetQueryReturnsOneKindResult, SetQueryReturnsOneOptional, SetQueryReturnsPluck, SetQueryReturnsPluckColumn, SetQueryReturnsPluckColumnKind, SetQueryReturnsPluckColumnKindResult, SetQueryReturnsRowCount, SetQueryReturnsRows, SetQueryReturnsValueOptional, SetQueryReturnsValueOrThrow, SetQueryReturnsVoid, SetQueryReturnsVoidKind, SetQueryTableAlias, SetQueryWith, ShapeColumnPrimaryKeys, ShapeUniqueColumns, SimpleJoinItem, SimpleJoinItemNonSubQueryArgs, SmallIntColumn, SmallSerialColumn, SortDir, SqlFn, SqlMethod, StringColumn$1 as StringColumn, TableData, TableDataFn, TableDataInput, TableDataItem, TableDataItemsUniqueColumnTuples, TableDataItemsUniqueColumns, TableDataItemsUniqueConstraints, TableDataMethods, TextBaseColumn, TextColumn, TextColumnData, Then, TimeColumn, TimestampColumn, TimestampTZColumn, ToSQLCtx, ToSQLOptions, ToSQLQuery, Transaction, TransactionAdapter, TransactionOptions, TransformMethods, TruncateQueryData, TsQueryColumn, TsVectorColumn, TypeParsers, UUIDColumn, UnhandledTypeError, Union, UnionArg, UnionItem, UnionKind, UniqueConstraints, UniqueQueryTypeOrExpression, UniqueTableDataItem, UnknownColumn, Update, UpdateArg, UpdateCtx, UpdateCtxCollect, UpdateData, UpdateQueryData, UpdateQueryDataItem, UpdateQueryDataObject, UpdateSelf, UpdatedAtDataInjector, UpsertArg, UpsertResult, UpsertThis, VarCharColumn, VirtualColumn, Where, WhereArg, WhereArgs, WhereInArg, WhereInColumn, WhereInItem, WhereInValues, WhereItem, WhereJsonPathEqualsItem, WhereNotArgs, WhereOnItem, WhereOnJoinItem, WhereQueryBuilder, WhereResult, WhereSearchItem, WhereSearchResult, WindowArg, WindowArgDeclaration, WindowDeclaration, WindowItem, With, WithDataBase, WithDataItem, WithDataItems, WithItem, WithOptions, WrapQueryArg, XMLColumn, _initQueryBuilder, _queryAfterSaveCommit, _queryAll, _queryAs, _queryChangeCounter, _queryCreate, _queryCreateFrom, _queryCreateMany, _queryCreateManyFrom, _queryCreateManyRaw, _queryCreateRaw, _queryDefaults, _queryDelete, _queryExec, _queryFindBy, _queryFindByOptional, _queryGet, _queryGetOptional, _queryHookAfterCreate, _queryHookAfterCreateCommit, _queryHookAfterDelete, _queryHookAfterDeleteCommit, _queryHookAfterQuery, _queryHookAfterSave, _queryHookAfterUpdate, _queryHookAfterUpdateCommit, _queryHookBeforeCreate, _queryHookBeforeDelete, _queryHookBeforeQuery, _queryHookBeforeSave, _queryHookBeforeUpdate, _queryInsert, _queryInsertFrom, _queryInsertMany, _queryInsertManyFrom, _queryInsertManyRaw, _queryInsertRaw, _queryJoinOn, _queryJoinOnJsonPathEquals, _queryJoinOrOn, _queryOr, _queryOrNot, _queryRows, _querySelect, _queryTake, _queryTakeOptional, _queryUpdate, _queryUpdateOrThrow, _queryUpdateRaw, _queryWhere, _queryWhereExists, _queryWhereIn, _queryWhereNot, _queryWhereNotSql, _queryWhereSql, addComputedColumns, addParserForRawExpression, addParserForSelectItem, addQueryOn, anyShape, checkIfASimpleQuery, cloneQuery, cloneQueryBaseUnscoped, columnCheckToCode, columnCode, columnForeignKeysToCode, columnIndexesToCode, columnsShapeToCode, constraintInnerToCode, constraintToCode, copyTableData, countSelect, createDb, defaultSchemaConfig, extendQuery, foreignKeyArgumentToCode, getClonedQueryData, getColumnInfo, getColumnTypes, getPrimaryKeys, getQueryAs, getShapeFromSelect, handleResult, identityToCode, indexInnerToCode, indexToCode, instantiateColumn, isDefaultTimeStamp, isQueryReturnsAll, isSelectingCount, joinSubQuery, logColors, logParamToLogObject, makeColumnTypes, makeColumnsByType, makeFnExpression, makeRegexToFindInSql, makeSQL, parseRecord, parseResult, parseTableData, parseTableDataInput, primaryKeyInnerToCode, processSelectArg, pushLimitSQL, pushQueryArray, pushQueryOn, pushQueryOrOn, pushQueryValue, pushTableDataCode, queryFrom, queryFromSql, queryJson, queryMethodByReturnType, queryTypeWithLimitOne, queryWrap, quote, quoteString, raw, referencesArgsToCode, resolveSubQueryCallback, saveSearchAlias, setParserForSelectedString, setQueryObjectValue, setQueryOperators, simplifyColumnDefault, sqlFn, sqlQueryArgsToExpression, tableDataMethods, templateLiteralToSQL, testTransaction, throwIfNoWhere, toSQL, toSQLCacheKey };
+export { Adapter, AdapterConfig, AdapterOptions, AddQueryDefaults, AddQuerySelect, AddQueryWith, AfterHook, AggregateMethods, AggregateOptions, AliasOrTable, ArrayColumn, ArrayColumnValue, ArrayData, AsMethods, AsQueryArg, BaseOperators, BigIntColumn, BigSerialColumn, BitColumn, BitVaryingColumn, BooleanColumn, BooleanQueryColumn, BoxColumn, ByteaColumn, CharColumn, CidrColumn, CircleColumn, CitextColumn, Clear, ClearStatement, CloneSelfKeys, ColumnData, ColumnExpression, ColumnFromDbParams, ColumnInfoQueryData, ColumnOperators, ColumnRefExpression, ColumnType, ColumnsByType, ColumnsShape, ColumnsShapeToNullableObject, ColumnsShapeToObject, ColumnsShapeToObjectArray, ColumnsShapeToPluck, CommonQueryData, ComputedColumnsBase, CopyOptions, CopyQueryData, Create, CreateBelongsToData, CreateColumn, CreateCtx, CreateData, CreateKind, CreateMethodsNames, CreateRelationsData, CreateRelationsDataOmittingFKeys, CreateSelf, CustomTypeColumn, DateBaseColumn, DateColumn, DateColumnInput, DateTimeBaseClass, DateTimeTzBaseClass, Db, DbDomainArg, DbDomainArgRecord, DbExtension, DbOptions, DbResult, DbSharedOptions, DbTableConstructor, DbTableOptionScopes, DbTableOptions, DecimalColumn, DecimalColumnData, DefaultColumnTypes, DefaultSchemaConfig, Delete, DeleteArgs, DeleteMethodsNames, DeleteQueryData, DeleteResult, DomainColumn, DoublePrecisionColumn, DynamicRawSQL, EnumColumn, ExpressionMethods, ExpressionOutput, FnExpression, FnExpressionArgs, FnExpressionArgsPairs, FnExpressionArgsValue, For, From, FromArg, FromQuerySelf, FromResult, GetArg, GetColumnInfo, GetQueryResult, GetResult, GetResultOptional, GetStringArg, GroupArg, Having, HavingItem, HookAction, HookSelect, IdentityColumn, InetColumn, InsertQueryData, IntegerBaseColumn, IntegerColumn, IntervalColumn, IsolationLevel, JSONColumn, JSONTextColumn, Join, JoinArgs, JoinCallback, JoinFirstArg, JoinItem, JoinItemArgs, JoinLateralCallback, JoinLateralItem, JoinLateralResult, JoinOverrides, JoinQueryBuilder, JoinQueryMethod, JoinResult, JoinedParsers, JoinedShapes, JsonItem, JsonMethods, JsonModifiers, LimitedTextBaseColumn, LineColumn, LsegColumn, MacAddr8Column, MacAddrColumn, MapTableScopesOption, MergeQuery, MergeQueryMethods, MoneyColumn, MoreThanOneRowError, NoPrimaryKeyOption, NotFoundError, NumberAsStringBaseColumn, NumberBaseColumn, NumberColumnData, OnConflictMerge, OnConflictQueryBuilder, OnConflictSet, OnConflictTarget, OnMethods, Operator, Operators, OperatorsAny, OperatorsArray, OperatorsBoolean, OperatorsDate, OperatorsJson, OperatorsNumber, OperatorsText, OperatorsTime, OrCreateArg, OrExpression, OrchidOrmError, OrchidOrmInternalError, OrderArg, OrderArgSelf, OrderArgs, OrderItem, OrderTsQueryConfig, Over, PathColumn, PickColumnData, PickQueryBaseQuery, PickQueryColumnTypes, PickQueryDataShapeAndJoinedShapes, PickQueryInternal, PickQueryMetaRelations, PickQueryMetaResultRelations, PickQueryMetaResultRelationsWindows, PickQueryMetaResultRelationsWindowsColumnTypes, PickQueryMetaResultRelationsWithDataReturnType, PickQueryMetaResultRelationsWithDataReturnTypeShape, PickQueryMetaResultReturnTypeWithDataWindows, PickQueryMetaResultReturnTypeWithDataWindowsTable, PickQueryMetaShapeRelationsWithData, PickQueryMetaTable, PickQueryMetaTableShape, PickQueryMetaTableShapeReturnTypeWithData, PickQueryMetaWithData, PickQueryQ, PickQueryQAndBaseQuery, PickQueryQAndInternal, PickQueryRelations, PickQueryRelationsWithData, PickQueryShapeResultSinglePrimaryKey, PickQueryShapeSinglePrimaryKey, PickQuerySinglePrimaryKey, PickQueryWindows, PickQueryWithData, PointColumn, PolygonColumn, Query, QueryAfterHook, QueryArraysResult, QueryBase, QueryBaseThen, QueryBeforeHook, QueryData, QueryDataFromItem, QueryDataJoinTo, QueryDefaultReturnData, QueryError, QueryErrorName, QueryGet, QueryGetSelf, QueryHelperResult, QueryHookSelect, QueryHooks, QueryInternal, QueryLog, QueryLogObject, QueryLogOptions, QueryLogger, QueryMetaHasSelect, QueryMetaHasWhere, QueryMethods, QueryOrExpression, QueryOrExpressionBooleanOrNullResult, QueryResult, QueryReturnsAll, QueryScopeData, QueryScopes, QuerySourceItem, QueryTransform, QueryTransformFn, QueryUpsertOrCreate, QueryWithComputed, QueryWithTable, RawSQL, RealColumn, RecordOfColumnsShapeBase, RefExpression, RelationConfigBase, RelationConfigDataForCreate, RelationJoinQuery, RelationQuery, RelationQueryBase, RelationsBase, SearchArg, SearchMethods, SearchWeight, SearchWeightRecord, Select, SelectArg, SelectAs, SelectItem, SelectQueryData, SelectSubQueryResult, SelectableFromShape, SelectableOfType, SelectableOrExpression, SelectableOrExpressionOfType, SerialColumn, SerialColumnData, SetQueryKind, SetQueryKindResult, SetQueryReturnsAll, SetQueryReturnsAllKind, SetQueryReturnsAllKindResult, SetQueryReturnsColumnInfo, SetQueryReturnsColumnKind, SetQueryReturnsColumnKindResult, SetQueryReturnsColumnOptional, SetQueryReturnsColumnOrThrow, SetQueryReturnsOne, SetQueryReturnsOneKind, SetQueryReturnsOneKindResult, SetQueryReturnsOneOptional, SetQueryReturnsPluck, SetQueryReturnsPluckColumn, SetQueryReturnsPluckColumnKind, SetQueryReturnsPluckColumnKindResult, SetQueryReturnsRowCount, SetQueryReturnsRows, SetQueryReturnsValueOptional, SetQueryReturnsValueOrThrow, SetQueryReturnsVoid, SetQueryReturnsVoidKind, SetQueryTableAlias, SetQueryWith, ShapeColumnPrimaryKeys, ShapeUniqueColumns, SimpleJoinItem, SimpleJoinItemNonSubQueryArgs, SmallIntColumn, SmallSerialColumn, SortDir, SqlFn, SqlMethod, StringColumn$1 as StringColumn, TableData, TableDataFn, TableDataInput, TableDataItem, TableDataItemsUniqueColumnTuples, TableDataItemsUniqueColumns, TableDataItemsUniqueConstraints, TableDataMethods, TextBaseColumn, TextColumn, TextColumnData, Then, TimeColumn, TimestampColumn, TimestampTZColumn, ToSQLCtx, ToSQLOptions, ToSQLQuery, Transaction, TransactionAdapter, TransactionOptions, TransformMethods, TruncateQueryData, TsQueryColumn, TsVectorColumn, TypeParsers, UUIDColumn, UnhandledTypeError, Union, UnionArg, UnionItem, UnionKind, UniqueConstraints, UniqueQueryTypeOrExpression, UniqueTableDataItem, UnknownColumn, Update, UpdateArg, UpdateCtx, UpdateCtxCollect, UpdateData, UpdateQueryData, UpdateQueryDataItem, UpdateQueryDataObject, UpdateSelf, UpdatedAtDataInjector, UpsertArg, UpsertResult, UpsertThis, VarCharColumn, VirtualColumn, Where, WhereArg, WhereArgs, WhereInArg, WhereInColumn, WhereInItem, WhereInValues, WhereItem, WhereJsonPathEqualsItem, WhereNotArgs, WhereOnItem, WhereOnJoinItem, WhereQueryBuilder, WhereResult, WhereSearchItem, WhereSearchResult, WindowArg, WindowArgDeclaration, WindowDeclaration, WindowItem, With, WithDataBase, WithDataItem, WithDataItems, WithItem, WithOptions, WrapQueryArg, XMLColumn, _initQueryBuilder, _queryAfterSaveCommit, _queryAll, _queryAs, _queryChangeCounter, _queryCreate, _queryCreateFrom, _queryCreateMany, _queryCreateManyFrom, _queryCreateManyRaw, _queryCreateRaw, _queryDefaults, _queryDelete, _queryExec, _queryFindBy, _queryFindByOptional, _queryGet, _queryGetOptional, _queryHookAfterCreate, _queryHookAfterCreateCommit, _queryHookAfterDelete, _queryHookAfterDeleteCommit, _queryHookAfterQuery, _queryHookAfterSave, _queryHookAfterUpdate, _queryHookAfterUpdateCommit, _queryHookBeforeCreate, _queryHookBeforeDelete, _queryHookBeforeQuery, _queryHookBeforeSave, _queryHookBeforeUpdate, _queryInsert, _queryInsertFrom, _queryInsertMany, _queryInsertManyFrom, _queryInsertManyRaw, _queryInsertRaw, _queryJoinOn, _queryJoinOnJsonPathEquals, _queryJoinOrOn, _queryOr, _queryOrNot, _queryRows, _querySelect, _queryTake, _queryTakeOptional, _queryUpdate, _queryUpdateOrThrow, _queryUpdateRaw, _queryWhere, _queryWhereExists, _queryWhereIn, _queryWhereNot, _queryWhereNotSql, _queryWhereSql, addComputedColumns, addParserForRawExpression, addParserForSelectItem, addQueryOn, anyShape, checkIfASimpleQuery, cloneQuery, cloneQueryBaseUnscoped, columnCheckToCode, columnCode, columnForeignKeysToCode, columnIndexesToCode, columnsShapeToCode, constraintInnerToCode, constraintToCode, copyTableData, countSelect, createDb, defaultSchemaConfig, extendQuery, foreignKeyArgumentToCode, getClonedQueryData, getColumnInfo, getColumnTypes, getPrimaryKeys, getQueryAs, getShapeFromSelect, handleResult, identityToCode, indexInnerToCode, indexToCode, instantiateColumn, isDefaultTimeStamp, isQueryReturnsAll, isSelectingCount, joinSubQuery, logColors, logParamToLogObject, makeColumnTypes, makeColumnsByType, makeFnExpression, makeRegexToFindInSql, makeSQL, parseRecord, parseResult, parseTableData, parseTableDataInput, primaryKeyInnerToCode, processSelectArg, pushLimitSQL, pushQueryArray, pushQueryOn, pushQueryOrOn, pushQueryValue, pushTableDataCode, queryFrom, queryFromSql, queryJson, queryMethodByReturnType, queryTypeWithLimitOne, queryWrap, quote, quoteString, raw, referencesArgsToCode, resolveSubQueryCallback, saveSearchAlias, setParserForSelectedString, setQueryObjectValue, setQueryOperators, simplifyColumnDefault, sqlFn, sqlQueryArgsToExpression, tableDataMethods, templateLiteralToSQL, testTransaction, throwIfNoWhere, toSQL, toSQLCacheKey };

package/dist/index.js

@@ -2024,13 +2024,23 @@ const processWhere = (ands, ctx, table, query, data, quotedAs) => {
     qb.q.and = qb.q.or = void 0;
     qb.q.isSubQuery = true;
     const res = resolveSubQueryCallback(qb, data);
-    const expr = res instanceof orchidCore.Expression ? res : res.q.expr;
-    if (!(res instanceof orchidCore.Expression) && res.q.expr) {
-      const q = joinSubQuery(table, res);
-      q.q.select = [expr];
-      ands.push(`(${makeSQL(q, ctx).text})`);
+    if (orchidCore.isExpression(res)) {
+      ands.push(`(${res.toSQL(ctx, quotedAs)})`);
     } else {
-      pushWhereToSql(ands, ctx, res, res.q, quotedAs, true);
+      if (res.q.expr) {
+        const q = joinSubQuery(table, res);
+        q.q.select = [res.q.expr];
+        ands.push(`(${makeSQL(q, ctx).text})`);
+      } else {
+        pushWhereToSql(
+          ands,
+          ctx,
+          res,
+          res.q,
+          quotedAs,
+          true
+        );
+      }
     }
     return;
   }
@@ -2208,9 +2218,15 @@ const processWhere = (ands, ctx, table, query, data, quotedAs) => {
         }
       }
     } else {
-      ands.push(
-        `${columnToSql(ctx, query, query.shape, key, quotedAs)} ${value === null ? "IS NULL" : `= ${orchidCore.addValue(ctx.values, value)}`}`
-      );
+      const column = columnToSql(ctx, query, query.shape, key, quotedAs);
+      if (typeof value === "function") {
+        const expr = value(table);
+        ands.push(`${column} = ${expr.toSQL(ctx, quotedAs)}`);
+      } else {
+        ands.push(
+          `${column} ${value === null ? "IS NULL" : `= ${orchidCore.addValue(ctx.values, value)}`}`
+        );
+      }
     }
   }
 };
@@ -4706,7 +4722,7 @@ const makeSQL = (table, options) => {
     sql.push(`WINDOW ${window.join(", ")}`);
   }
   if (query.union) {
-    query.union.forEach((item) => {
+    for (const item of query.union) {
       let itemSql;
       if (orchidCore.isExpression(item.arg)) {
         itemSql = item.arg.toSQL(ctx, quotedAs);
@@ -4715,7 +4731,7 @@ const makeSQL = (table, options) => {
         itemSql = argSql.text;
       }
       sql.push(`${item.kind} ${item.wrap ? `(${itemSql})` : itemSql}`);
-    });
+    }
   }
   if (query.order) {
     pushOrderBySql(ctx, query, quotedAs, query.order);
@@ -8488,6 +8504,11 @@ class Where {
    *   // where column equals to raw SQL
    *   // import `sql` from your `BaseTable`
    *   column: sql`sql expression`,
+   *   // or use `(q) => q.sql` for the same
+   *   column2: (q) => q.sql`sql expression`,
+   *
+   *   // reference other columns in such a way:
+   *   firstName: (q) => q.ref('lastName'),
    * });
    * ```
    *
@@ -10336,6 +10357,29 @@ class RefExpression extends orchidCore.Expression {
     return columnToSql(ctx, this.q, this.q.shape, this.ref, quotedAs);
   }
 }
+class OrExpression extends orchidCore.Expression {
+  constructor(args) {
+    super();
+    this.args = args;
+    this.q = { expr: this };
+  }
+  makeSQL(ctx, quotedAs) {
+    const res = [];
+    for (const arg of this.args) {
+      if (arg) {
+        if (orchidCore.isExpression(arg)) {
+          const sql = arg.toSQL(ctx, quotedAs);
+          if (sql)
+            res.push(sql);
+        } else {
+          res.push(`(${arg.toSQL(ctx).text})`);
+        }
+      }
+    }
+    return `(${res.join(" OR ")})`;
+  }
+}
+Object.assign(OrExpression.prototype, Operators.boolean);
 class ExpressionMethods {
   /**
    * `column` references a table column, this can be used in raw SQL or when building a column expression.
@@ -10446,6 +10490,9 @@ class ExpressionMethods {
   fn(fn, args, options) {
     return makeFnExpression(this, orchidCore.emptyObject, fn, args, options);
   }
+  or(...args) {
+    return new OrExpression(args);
+  }
 }
 
 const _queryAll = (q) => {
@@ -11755,6 +11802,7 @@ exports.NumberBaseColumn = NumberBaseColumn;
 exports.OnConflictQueryBuilder = OnConflictQueryBuilder;
 exports.OnMethods = OnMethods;
 exports.Operators = Operators;
+exports.OrExpression = OrExpression;
 exports.OrchidOrmError = OrchidOrmError;
 exports.OrchidOrmInternalError = OrchidOrmInternalError;
 exports.PathColumn = PathColumn;