hysteria-orm 12.1.0 → 12.2.0

package/lib/index.d.ts

@@ -710,13 +710,14 @@ declare abstract class QueryNode {
 
 declare class RawNode extends QueryNode {
     rawValue: string;
+    bindings?: any[];
     canKeywordBeSeenMultipleTimes: boolean;
     chainsWith: string;
     currParamIndex: number;
     isRawValue: boolean;
     folder: string;
     file: string;
-    constructor(value: string);
+    constructor(value: string, bindings?: any[]);
 }
 
 /**
@@ -726,9 +727,9 @@ type Simplify<T, Strip> = T extends infer U ? {
     [K in keyof U as K extends Strip ? never : K]: U[K];
 } : never;
 
-type BaseValues$2 = string | number | boolean | null | SqlFuncNode;
-type BinaryOperatorType$2 = "=" | "!=" | "<>" | ">" | "<" | ">=" | "<=" | "like" | "ilike" | "in";
-declare class HavingNode extends QueryNode {
+type BaseValues$2 = string | number | boolean | undefined | null | RawNode | SqlFuncNode;
+type BinaryOperatorType$2 = "=" | "!=" | "<>" | ">" | "<" | ">=" | "<=" | "is" | "is not" | "like" | "not like" | "is null" | "is not null" | "ilike" | "in" | "not in" | "between" | "not between" | "regexp" | "not regexp" | "not ilike" | (string & {});
+declare class WhereNode extends QueryNode {
     column: string;
     isNegated: boolean;
     operator: BinaryOperatorType$2;
@@ -740,20 +741,6 @@ declare class HavingNode extends QueryNode {
     constructor(column: string, chainsWith: "and" | "or", isNegated: boolean | undefined, operator: BinaryOperatorType$2, value: BaseValues$2 | BaseValues$2[], isRawValue?: boolean);
 }
 
-type BaseValues$1 = string | number | boolean | undefined | null | RawNode | SqlFuncNode;
-type BinaryOperatorType$1 = "=" | "!=" | "<>" | ">" | "<" | ">=" | "<=" | "is" | "is not" | "like" | "not like" | "is null" | "is not null" | "ilike" | "in" | "not in" | "between" | "not between" | "regexp" | "not regexp" | "not ilike" | (string & {});
-declare class WhereNode extends QueryNode {
-    column: string;
-    isNegated: boolean;
-    operator: BinaryOperatorType$1;
-    value: BaseValues$1 | BaseValues$1[];
-    chainsWith: "and" | "or";
-    canKeywordBeSeenMultipleTimes: boolean;
-    folder: string;
-    file: string;
-    constructor(column: string, chainsWith: "and" | "or", isNegated: boolean | undefined, operator: BinaryOperatorType$1, value: BaseValues$1 | BaseValues$1[], isRawValue?: boolean);
-}
-
 type SubqueryOperatorType = "in" | "not in" | "exists" | "not exists" | "between" | "not between" | ">" | "<" | ">=" | "<=" | (string & {});
 declare class WhereSubqueryNode extends QueryNode {
     column: string;
@@ -775,6 +762,24 @@ declare class WhereGroupNode extends QueryNode {
     constructor(nodes: (WhereNode | WhereGroupNode | WhereSubqueryNode)[], chainsWith?: "and" | "or");
 }
 
+type BaseValues$1 = string | number | boolean | null | SqlFuncNode;
+type BinaryOperatorType$1 = "=" | "!=" | "<>" | ">" | "<" | ">=" | "<=" | "like" | "ilike" | "is null" | "is not null" | "in" | "not in" | "between" | "not between" | "exists" | "not exists";
+declare class HavingNode extends QueryNode {
+    column: string;
+    isNegated: boolean;
+    operator: BinaryOperatorType$1;
+    value: BaseValues$1 | BaseValues$1[] | undefined;
+    /** Subquery used by the in/exists operators. */
+    subquery?: string | QueryNode | QueryNode[];
+    /** Nested HAVING conditions wrapped in parentheses. */
+    group?: HavingNode[];
+    chainsWith: "and" | "or";
+    canKeywordBeSeenMultipleTimes: boolean;
+    folder: string;
+    file: string;
+    constructor(column: string, chainsWith: "and" | "or", isNegated: boolean | undefined, operator: BinaryOperatorType$1, value: BaseValues$1 | BaseValues$1[] | undefined, isRawValue?: boolean, subquery?: string | QueryNode | QueryNode[], group?: HavingNode[]);
+}
+
 type OpenApiModelType = {
     type: "object";
     properties: Record<string, OpenApiModelPropertyType>;
@@ -792,31 +797,6 @@ type OpenApiModelPropertyType = {
     excludeFromSwagger?: boolean;
 };
 
-declare abstract class DataSource {
-    type: DataSourceType;
-    host: string;
-    port: number;
-    username: string;
-    password: string;
-    database: string;
-    url: string;
-    /** @see CommonDataSourceInput.logs — off by default; sync when enabled */
-    logs: boolean | LoggerConfig;
-    protected constructor(input?: DataSourceInput);
-    protected handleCockroachdbSource(input?: PostgresSqlDataSourceInput): void;
-    protected handlePostgresSource(input?: PostgresSqlDataSourceInput): void;
-    protected handleMysqlSource(input?: MysqlSqlDataSourceInput): void;
-    protected handleSqliteSource(input?: SqliteDataSourceInput): void;
-    protected handleMongoSource(input?: MongoDataSourceInput$1): void;
-    protected handleMssqlSource(input?: MssqlDataSourceInput): void;
-}
-
-declare abstract class BaseBuilder {
-    protected nodes: QueryNode[];
-    constructor(nodes: QueryNode[]);
-    getNodes(): QueryNode[];
-}
-
 declare class ColumnTypeNode extends QueryNode {
     column: string | (() => string);
     dataType: string;
@@ -856,6 +836,134 @@ declare class ColumnTypeNode extends QueryNode {
     });
 }
 
+type ConstraintType = "primary_key" | "foreign_key" | "unique" | "not_null" | "null" | "default" | "check";
+declare class ConstraintNode extends QueryNode {
+    constraintType: ConstraintType;
+    columns?: (string | (() => string))[];
+    references?: {
+        table: string;
+        columns: (string | (() => string))[];
+    };
+    constraintName?: string;
+    onDelete?: "cascade" | "restrict" | "set null" | "no action";
+    onUpdate?: "cascade" | "restrict" | "set null" | "no action";
+    defaultValue?: string | RawNode | SqlFuncNode | undefined;
+    checkExpression?: string;
+    chainsWith: string;
+    canKeywordBeSeenMultipleTimes: boolean;
+    folder: string;
+    file: string;
+    constructor(constraintType: ConstraintType, args?: {
+        columns?: string[];
+        references?: {
+            table: string;
+            columns: string[];
+        };
+        constraintName?: string;
+        onDelete?: "cascade" | "restrict" | "set null" | "no action";
+        onUpdate?: "cascade" | "restrict" | "set null" | "no action";
+        defaultValue?: string | RawNode | SqlFuncNode | undefined;
+        checkExpression?: string;
+    }, isRawValue?: boolean);
+}
+
+type JsonMutationOperation = "set" | "insert" | "remove";
+/** A JSON path as a `'$.a.b[0]'` JsonPath string or an array of segments. */
+type JsonPath = string | (string | number)[];
+/**
+ * @description Expression node that mutates a JSON column at a path. Used as an
+ * update value (e.g. `update({ meta: sql.jsonSet("meta", "$.a", 1) })`) and can
+ * also be projected. `set` replaces an existing value, `insert` keeps it when
+ * present, `remove` deletes it.
+ */
+declare class JsonMutationNode extends QueryNode {
+    operation: JsonMutationOperation;
+    column: string;
+    path: JsonPath;
+    value?: unknown;
+    alias?: string;
+    chainsWith: string;
+    canKeywordBeSeenMultipleTimes: boolean;
+    folder: string;
+    file: string;
+    constructor(operation: JsonMutationOperation, column: string, path: JsonPath, value?: unknown, alias?: string);
+}
+
+type LockType = "for_update" | "for_share" | "for_no_key_update" | "for_key_share";
+declare class LockNode extends QueryNode {
+    lockType: LockType;
+    skipLocked: boolean;
+    noWait: boolean;
+    chainsWith: string;
+    canKeywordBeSeenMultipleTimes: boolean;
+    folder: string;
+    file: string;
+    constructor(lockType: LockType, skipLocked?: boolean, noWait?: boolean);
+}
+
+type WindowDirection = "asc" | "desc";
+interface WindowOrder {
+    column: string;
+    order?: WindowDirection;
+}
+/** ORDER BY input: a column, a { column, order } object, or an array of either. */
+type WindowOrderInput = string | WindowOrder | (string | WindowOrder)[];
+/** PARTITION BY input: a column or an array of columns. */
+type WindowPartitionInput = string | string[];
+/** Options for `rank`/`denseRank`/`rowNumber`. */
+interface WindowOptions {
+    partitionBy?: WindowPartitionInput;
+    orderBy?: WindowOrderInput;
+}
+
+type SetOperationType = "union" | "intersect" | "except";
+declare class UnionNode extends QueryNode {
+    query: QueryNode | QueryNode[] | string;
+    isAll: boolean;
+    type: SetOperationType;
+    chainsWith: string;
+    canKeywordBeSeenMultipleTimes: boolean;
+    folder: string;
+    file: string;
+    constructor(query: QueryNode | QueryNode[] | string, isAll?: boolean, type?: SetOperationType);
+}
+
+declare class WithNode extends QueryNode {
+    alias: string;
+    body: QueryNode | QueryNode[];
+    clause: string;
+    chainsWith: string;
+    canKeywordBeSeenMultipleTimes: boolean;
+    folder: string;
+    file: string;
+    constructor(clause: string, alias: string, body: QueryNode | QueryNode[]);
+}
+
+declare abstract class DataSource {
+    type: DataSourceType;
+    host: string;
+    port: number;
+    username: string;
+    password: string;
+    database: string;
+    url: string;
+    /** @see CommonDataSourceInput.logs — off by default; sync when enabled */
+    logs: boolean | LoggerConfig;
+    protected constructor(input?: DataSourceInput);
+    protected handleCockroachdbSource(input?: PostgresSqlDataSourceInput): void;
+    protected handlePostgresSource(input?: PostgresSqlDataSourceInput): void;
+    protected handleMysqlSource(input?: MysqlSqlDataSourceInput): void;
+    protected handleSqliteSource(input?: SqliteDataSourceInput): void;
+    protected handleMongoSource(input?: MongoDataSourceInput$1): void;
+    protected handleMssqlSource(input?: MssqlDataSourceInput): void;
+}
+
+declare abstract class BaseBuilder {
+    protected nodes: QueryNode[];
+    constructor(nodes: QueryNode[]);
+    getNodes(): QueryNode[];
+}
+
 declare class ConstraintBuilder extends BaseBuilder {
     private readonly columnNode;
     private readonly tableName?;
@@ -1269,70 +1377,6 @@ declare class CreateTableBuilder extends BaseBuilder {
     getNamedConstraints(): QueryNode[];
 }
 
-type ConstraintType = "primary_key" | "foreign_key" | "unique" | "not_null" | "null" | "default" | "check";
-declare class ConstraintNode extends QueryNode {
-    constraintType: ConstraintType;
-    columns?: (string | (() => string))[];
-    references?: {
-        table: string;
-        columns: (string | (() => string))[];
-    };
-    constraintName?: string;
-    onDelete?: "cascade" | "restrict" | "set null" | "no action";
-    onUpdate?: "cascade" | "restrict" | "set null" | "no action";
-    defaultValue?: string | RawNode | SqlFuncNode | undefined;
-    checkExpression?: string;
-    chainsWith: string;
-    canKeywordBeSeenMultipleTimes: boolean;
-    folder: string;
-    file: string;
-    constructor(constraintType: ConstraintType, args?: {
-        columns?: string[];
-        references?: {
-            table: string;
-            columns: string[];
-        };
-        constraintName?: string;
-        onDelete?: "cascade" | "restrict" | "set null" | "no action";
-        onUpdate?: "cascade" | "restrict" | "set null" | "no action";
-        defaultValue?: string | RawNode | SqlFuncNode | undefined;
-        checkExpression?: string;
-    }, isRawValue?: boolean);
-}
-
-type LockType = "for_update" | "for_share" | "for_no_key_update" | "for_key_share";
-declare class LockNode extends QueryNode {
-    lockType: LockType;
-    skipLocked: boolean;
-    noWait: boolean;
-    chainsWith: string;
-    canKeywordBeSeenMultipleTimes: boolean;
-    folder: string;
-    file: string;
-    constructor(lockType: LockType, skipLocked?: boolean, noWait?: boolean);
-}
-
-declare class UnionNode extends QueryNode {
-    query: QueryNode | QueryNode[] | string;
-    isAll: boolean;
-    chainsWith: string;
-    canKeywordBeSeenMultipleTimes: boolean;
-    folder: string;
-    file: string;
-    constructor(query: QueryNode | QueryNode[] | string, isAll?: boolean);
-}
-
-declare class WithNode extends QueryNode {
-    alias: string;
-    body: QueryNode | QueryNode[];
-    clause: string;
-    chainsWith: string;
-    canKeywordBeSeenMultipleTimes: boolean;
-    folder: string;
-    file: string;
-    constructor(clause: string, alias: string, body: QueryNode | QueryNode[]);
-}
-
 declare class AlterTableBuilder extends BaseBuilder {
     private table;
     private sqlType;
@@ -1785,6 +1829,8 @@ declare class FromNode extends QueryNode {
     folder: string;
     file: string;
     alias?: string;
+    /** Schema applied to the table reference (e.g. `public.users`). */
+    schema?: string;
     constructor(table: string | QueryNode | QueryNode[], alias?: string);
 }
 
@@ -1862,6 +1908,18 @@ declare class InterpreterUtils {
      * @description Formats the table name for the database type, idempotent for quoting
      */
     formatStringTable(dbType: SqlDataSourceType, table: string): string;
+    /**
+     * @description Quotes a single identifier for the given dialect.
+     */
+    quoteIdentifier(dbType: SqlDataSourceType, name: string): string;
+    /**
+     * @description Rewrites `?` placeholders in a raw SQL fragment to the dialect's
+     * placeholder starting at `startIndex`, returning the fragment and its bindings.
+     */
+    formatRawPlaceholders(dbType: SqlDataSourceType, raw: string, bindings?: any[], startIndex?: number): {
+        sql: string;
+        bindings: any[];
+    };
     prepareColumns(columns: string[], values: any[], mode?: "insert" | "update", dbType?: SqlDataSourceType): {
         columns: string[];
         values: any[];
@@ -2189,6 +2247,49 @@ declare class DeleteNode extends QueryNode {
     constructor(fromNode: FromNode, isRawValue?: boolean);
 }
 
+type TableColumnInfo = {
+    name: string;
+    dataType: string;
+    isNullable: boolean;
+    defaultValue: string | number | boolean | null;
+    length?: number | null;
+    precision?: number | null;
+    scale?: number | null;
+    withTimezone?: boolean | null;
+    enumValues?: string[] | null;
+    unsigned?: boolean | null;
+    zerofill?: boolean | null;
+    stringMode?: boolean | null;
+};
+type TableIndexInfo = {
+    name: string;
+    columns: string[];
+    isUnique: boolean;
+};
+type TablePrimaryKeyInfo = {
+    name?: string;
+    columns: string[];
+};
+type TableCheckConstraintInfo = {
+    name: string;
+    expression: string;
+};
+type TableSchemaInfo = {
+    columns: TableColumnInfo[];
+    indexes: TableIndexInfo[];
+    foreignKeys: TableForeignKeyInfo[];
+    primaryKey?: TablePrimaryKeyInfo;
+    checkConstraints: TableCheckConstraintInfo[];
+};
+type TableForeignKeyInfo = {
+    name?: string;
+    columns: string[];
+    referencedTable: string;
+    referencedColumns: string[];
+    onDelete?: string | null;
+    onUpdate?: string | null;
+};
+
 declare class InsertNode extends QueryNode {
     fromNode: FromNode;
     records: Record<string, any>[];
@@ -2824,6 +2925,11 @@ declare class QueryBuilder<T extends Model = any, S extends Record<string, any>
     protected returningNode: ReturningNode | null;
     protected truncateNode: TruncateNode | null;
     protected replicationMode: ReplicationType | null;
+    protected schemaName?: string;
+    protected queryTimeout?: {
+        ms: number;
+        cancel: boolean;
+    };
     constructor(model: typeof Model, sqlDataSource: SqlDataSource);
     /**
      * @description Sets the replication mode for the query builder
@@ -2987,6 +3093,38 @@ declare class QueryBuilder<T extends Model = any, S extends Record<string, any>
         skipLocked?: boolean;
         noWait?: boolean;
     }): this;
+    /**
+     * @description Locks the selected rows with the `FOR NO KEY UPDATE` strength.
+     * Weaker than `FOR UPDATE`: it does not block foreign keys that reference the row.
+     * @postgres only
+     * @throws HysteriaError if the database type is not postgres
+     */
+    forNoKeyUpdate(options?: {
+        skipLocked?: boolean;
+        noWait?: boolean;
+    }): this;
+    /**
+     * @description Locks the selected rows with the `FOR KEY SHARE` strength.
+     * The weakest row lock: only blocks updates that change a key value.
+     * @postgres only
+     * @throws HysteriaError if the database type is not postgres
+     */
+    forKeyShare(options?: {
+        skipLocked?: boolean;
+        noWait?: boolean;
+    }): this;
+    private assertPgLockStrength;
+    /**
+     * @description Sets a wall-clock timeout for this query. When exceeded the
+     * query rejects with a `QUERY_TIMEOUT` HysteriaError.
+     * @param ms - Maximum execution time in milliseconds
+     * @param options.cancel - When true, ask the driver to cancel the running
+     *   query. Honored by PostgreSQL and MySQL/MariaDB; MSSQL cancels its request;
+     *   SQLite and Bun have no cancellation and only enforce the timeout.
+     */
+    timeout(ms: number, options?: {
+        cancel?: boolean;
+    }): this;
     /**
      * @description Prepends a native SQL comment to the select statement, in the
      * syntax of the active dialect (e.g. `-- line`, `/* block *\/`; MySQL adds
@@ -3029,6 +3167,17 @@ declare class QueryBuilder<T extends Model = any, S extends Record<string, any>
     unionAll(query: string, bindings?: any[]): this;
     unionAll(cb: UnionCallBack<T>): this;
     unionAll(queryBuilder: QueryBuilder<any>): this;
+    /**
+     * @description Adds an INTERSECT to the query (keeps only rows present in both queries).
+     */
+    intersect(query: string): this;
+    intersect(cb: UnionCallBack<T>): this;
+    /**
+     * @description Adds an EXCEPT to the query (keeps rows from the first query not present in the second).
+     */
+    except(query: string): this;
+    except(cb: UnionCallBack<T>): this;
+    private resolveSetOperationNodes;
     /**
      * @description Increments the value of a column by a given amount
      * @typeSafe - In typescript, only numeric columns of the model will be accepted if using a Model
@@ -3079,6 +3228,12 @@ declare class QueryBuilder<T extends Model = any, S extends Record<string, any>
      * @description Executes the query and retrieves the sum of a column, it ignores all select, group by, order by, limit and offset clauses if they are present.
      */
     getSum(column: string): Promise<number>;
+    /**
+     * @description Introspects column metadata for the query's table. With a
+     * column name it returns that column's info, otherwise every column.
+     */
+    columnInfo(): Promise<TableColumnInfo[]>;
+    columnInfo(column: string): Promise<TableColumnInfo | undefined>;
     /**
      * @description Executes the query and retrieves multiple paginated results.
      * @description Overrides the limit and offset clauses in order to paginate the results.
@@ -3090,6 +3245,16 @@ declare class QueryBuilder<T extends Model = any, S extends Record<string, any>
      */
     table<S extends string>(table: TableFormat<S>, maybeAlias?: string): this;
     table<S extends string>(cb: (qb: QueryBuilder<T>) => void | SubQueryable, alias: string): this;
+    /**
+     * @description Sets the schema (search path) applied to every table reference in
+     * this query, rendering two-part names such as `schema.table`.
+     */
+    withSchema(schemaName: string): this;
+    /**
+     * @description Uses a raw SQL fragment as the FROM source. `?` placeholders are
+     * rewritten to the dialect's placeholders, in order with the rest of the query.
+     */
+    fromRaw(raw: string, bindings?: any[]): this;
     /**
      * @description Adds a CTE to the query using a callback to build the subquery.
      */
@@ -3105,6 +3270,12 @@ declare class QueryBuilder<T extends Model = any, S extends Record<string, any>
      * @throws HysteriaError if the database type is not postgres or cockroachdb
      */
     withMaterialized(alias: string, cb: (qb: QueryBuilder<T>) => void | SubQueryable): this;
+    /**
+     * @description Adds a non-materialized CTE to the query using a callback to build the subquery.
+     * @postgres only
+     * @throws HysteriaError if the database type is not postgres or cockroachdb
+     */
+    withNotMaterialized(alias: string, cb: (qb: QueryBuilder<T>) => void | SubQueryable): this;
     /**
      * @description Insert record into a table, you can use raw statements in the data object for literal references to other columns
      * @param returning - The columns to return from the query, only supported by postgres and cockroachdb - default is "*"
@@ -3238,49 +3409,6 @@ declare class QueryBuilder<T extends Model = any, S extends Record<string, any>
     protected execSqlWithSlaveHandling<R>(mode: "read" | "write", operation: (dataSource: SqlDataSource) => Promise<R>): Promise<R>;
 }
 
-type TableColumnInfo = {
-    name: string;
-    dataType: string;
-    isNullable: boolean;
-    defaultValue: string | number | boolean | null;
-    length?: number | null;
-    precision?: number | null;
-    scale?: number | null;
-    withTimezone?: boolean | null;
-    enumValues?: string[] | null;
-    unsigned?: boolean | null;
-    zerofill?: boolean | null;
-    stringMode?: boolean | null;
-};
-type TableIndexInfo = {
-    name: string;
-    columns: string[];
-    isUnique: boolean;
-};
-type TablePrimaryKeyInfo = {
-    name?: string;
-    columns: string[];
-};
-type TableCheckConstraintInfo = {
-    name: string;
-    expression: string;
-};
-type TableSchemaInfo = {
-    columns: TableColumnInfo[];
-    indexes: TableIndexInfo[];
-    foreignKeys: TableForeignKeyInfo[];
-    primaryKey?: TablePrimaryKeyInfo;
-    checkConstraints: TableCheckConstraintInfo[];
-};
-type TableForeignKeyInfo = {
-    name?: string;
-    columns: string[];
-    referencedTable: string;
-    referencedColumns: string[];
-    onDelete?: string | null;
-    onUpdate?: string | null;
-};
-
 type Returning = "rows" | "affectedRows" | "raw";
 /**
  * @description Maps a SqlDataSourceType to the raw driver response type
@@ -3637,6 +3765,11 @@ declare class SqlDataSource<D extends SqlDataSourceType = SqlDataSourceType, T e
      * ```
      */
     from<S extends string>(table: TableFormat<S>, options?: RawModelOptions): QueryBuilder<any, Record<string, any>, D>;
+    /**
+     * @description Starts a query from a raw SQL fragment, e.g. a table-valued
+     * function or a derived table. `?` placeholders are rewritten per dialect.
+     */
+    fromRaw(raw: string, bindings?: any[], options?: RawModelOptions): QueryBuilder<any, Record<string, any>, D>;
     /**
      * @description Returns a SchemaBuilder instance for DDL operations
      * @description The builder will execute queries when awaited or when .execute() is called
@@ -3751,6 +3884,20 @@ declare class SqlDataSource<D extends SqlDataSourceType = SqlDataSourceType, T e
      * ```
      */
     rawStatement(value: string): RawNode;
+    /**
+     * @description Sets a value at a JSON path, replacing any existing value.
+     * Use as an update value: `update({ meta: sql.jsonSet("meta", "$.a", 1) })`.
+     */
+    jsonSet(column: string, path: JsonPath, value: unknown, alias?: string): JsonMutationNode;
+    /**
+     * @description Inserts a value at a JSON path only when the path is absent.
+     * Use as an update value.
+     */
+    jsonInsert(column: string, path: JsonPath, value: unknown, alias?: string): JsonMutationNode;
+    /**
+     * @description Removes the value at a JSON path. Use as an update value.
+     */
+    jsonRemove(column: string, path: JsonPath, alias?: string): JsonMutationNode;
     /**
      * @description Retrieves information from the database for the given table
      */
@@ -3937,11 +4084,13 @@ declare class SelectNode extends QueryNode {
     column: string | QueryNode | QueryNode[];
     alias?: string;
     sqlFunction?: string;
+    /** Renders the aggregate as `fn(DISTINCT col)` (e.g. count/sum/avg). */
+    distinct?: boolean;
     chainsWith: string;
     canKeywordBeSeenMultipleTimes: boolean;
     folder: string;
     file: string;
-    constructor(column: string | QueryNode | QueryNode[], alias?: string, sqlFunction?: string, isRaw?: boolean);
+    constructor(column: string | QueryNode | QueryNode[], alias?: string, sqlFunction?: string, isRaw?: boolean, distinct?: boolean);
 }
 
 declare class JoinNode extends QueryNode {
@@ -3959,6 +4108,10 @@ declare class JoinNode extends QueryNode {
     file: string;
     type: "inner" | "left" | "right" | "full" | "cross" | "natural";
     additionalConditions?: (WhereNode | WhereGroupNode | WhereSubqueryNode)[];
+    /** When set, renders `using (cols)` instead of an `on` condition. */
+    using?: string[];
+    /** Schema applied to the joined table reference. */
+    schema?: string;
     constructor(table: string, left: string, right: string, type: "inner" | "left" | "right" | "full" | "cross" | "natural" | undefined, on: {
         left?: string;
         right?: string;
@@ -4377,60 +4530,60 @@ declare class JoinOnQueryBuilder {
     /**
      * @description Adds a WHERE condition to the query.
      */
-    where(column: SelectableColumn$1<string>, operator: BinaryOperatorType$1, value: BaseValues$1): this;
+    where(column: SelectableColumn$1<string>, operator: BinaryOperatorType$2, value: BaseValues$2): this;
     where(cb: (queryBuilder: JoinOnQueryBuilder) => void): this;
-    where(column: SelectableColumn$1<string>, value: BaseValues$1): this;
+    where(column: SelectableColumn$1<string>, value: BaseValues$2): this;
     /**
      * @description Adds an AND WHERE condition to the query.
      */
-    andWhere(column: SelectableColumn$1<string>, operator: BinaryOperatorType$1, value: BaseValues$1): this;
-    andWhere(column: SelectableColumn$1<string>, value: BaseValues$1): this;
+    andWhere(column: SelectableColumn$1<string>, operator: BinaryOperatorType$2, value: BaseValues$2): this;
+    andWhere(column: SelectableColumn$1<string>, value: BaseValues$2): this;
     andWhere(cb: (queryBuilder: JoinOnQueryBuilder) => void): this;
     /**
      * @description Adds an OR WHERE condition to the query.
      */
-    orWhere(column: SelectableColumn$1<string>, operator: BinaryOperatorType$1, value: BaseValues$1): this;
-    orWhere(column: SelectableColumn$1<string>, value: BaseValues$1): this;
+    orWhere(column: SelectableColumn$1<string>, operator: BinaryOperatorType$2, value: BaseValues$2): this;
+    orWhere(column: SelectableColumn$1<string>, value: BaseValues$2): this;
     orWhere(cb: (queryBuilder: JoinOnQueryBuilder) => void): this;
     /**
      * @description Adds a negated WHERE condition to the query.
      */
-    whereNot(column: SelectableColumn$1<string>, operator: BinaryOperatorType$1, value: BaseValues$1): this;
-    whereNot(column: SelectableColumn$1<string>, value: BaseValues$1): this;
+    whereNot(column: SelectableColumn$1<string>, operator: BinaryOperatorType$2, value: BaseValues$2): this;
+    whereNot(column: SelectableColumn$1<string>, value: BaseValues$2): this;
     /**
      * @description Adds a negated AND WHERE condition to the query.
      */
-    andWhereNot(column: SelectableColumn$1<string>, operator: BinaryOperatorType$1, value: BaseValues$1): this;
-    andWhereNot(column: SelectableColumn$1<string>, value: BaseValues$1): this;
+    andWhereNot(column: SelectableColumn$1<string>, operator: BinaryOperatorType$2, value: BaseValues$2): this;
+    andWhereNot(column: SelectableColumn$1<string>, value: BaseValues$2): this;
     /**
      * @description Adds a negated OR WHERE condition to the query.
      */
-    orWhereNot(column: SelectableColumn$1<string>, operator: BinaryOperatorType$1, value: BaseValues$1): this;
-    orWhereNot(column: SelectableColumn$1<string>, value: BaseValues$1): this;
+    orWhereNot(column: SelectableColumn$1<string>, operator: BinaryOperatorType$2, value: BaseValues$2): this;
+    orWhereNot(column: SelectableColumn$1<string>, value: BaseValues$2): this;
     /**
      * @description Adds a WHERE BETWEEN condition to the query.
      */
-    whereBetween(column: SelectableColumn$1<string>, min: BaseValues$1, max: BaseValues$1): this;
+    whereBetween(column: SelectableColumn$1<string>, min: BaseValues$2, max: BaseValues$2): this;
     /**
      * @description Adds an AND WHERE BETWEEN condition to the query.
      */
-    andWhereBetween(column: SelectableColumn$1<string>, min: BaseValues$1, max: BaseValues$1): this;
+    andWhereBetween(column: SelectableColumn$1<string>, min: BaseValues$2, max: BaseValues$2): this;
     /**
      * @description Adds an OR WHERE BETWEEN condition to the query.
      */
-    orWhereBetween(column: SelectableColumn$1<string>, min: BaseValues$1, max: BaseValues$1): this;
+    orWhereBetween(column: SelectableColumn$1<string>, min: BaseValues$2, max: BaseValues$2): this;
     /**
      * @description Adds a WHERE NOT BETWEEN condition to the query.
      */
-    whereNotBetween(column: SelectableColumn$1<string>, min: BaseValues$1, max: BaseValues$1): this;
+    whereNotBetween(column: SelectableColumn$1<string>, min: BaseValues$2, max: BaseValues$2): this;
     /**
      * @description Adds an AND WHERE NOT BETWEEN condition to the query.
      */
-    andWhereNotBetween(column: SelectableColumn$1<string>, min: BaseValues$1, max: BaseValues$1): this;
+    andWhereNotBetween(column: SelectableColumn$1<string>, min: BaseValues$2, max: BaseValues$2): this;
     /**
      * @description Adds an OR WHERE NOT BETWEEN condition to the query.
      */
-    orWhereNotBetween(column: SelectableColumn$1<string>, min: BaseValues$1, max: BaseValues$1): this;
+    orWhereNotBetween(column: SelectableColumn$1<string>, min: BaseValues$2, max: BaseValues$2): this;
     /**
      * @description Adds a WHERE LIKE condition to the query.
      */
@@ -4482,27 +4635,27 @@ declare class JoinOnQueryBuilder {
     /**
      * @description Adds a WHERE IN condition to the query.
      */
-    whereIn(column: SelectableColumn$1<string>, values: BaseValues$1[]): this;
+    whereIn(column: SelectableColumn$1<string>, values: BaseValues$2[]): this;
     /**
      * @description Adds an AND WHERE IN condition to the query.
      */
-    andWhereIn(column: SelectableColumn$1<string>, values: BaseValues$1[]): this;
+    andWhereIn(column: SelectableColumn$1<string>, values: BaseValues$2[]): this;
     /**
      * @description Adds an OR WHERE IN condition to the query.
      */
-    orWhereIn(column: SelectableColumn$1<string>, values: BaseValues$1[]): this;
+    orWhereIn(column: SelectableColumn$1<string>, values: BaseValues$2[]): this;
     /**
      * @description Adds a WHERE NOT IN condition to the query.
      */
-    whereNotIn(column: SelectableColumn$1<string>, values: BaseValues$1[]): this;
+    whereNotIn(column: SelectableColumn$1<string>, values: BaseValues$2[]): this;
     /**
      * @description Adds an AND WHERE NOT IN condition to the query.
      */
-    andWhereNotIn(column: SelectableColumn$1<string>, values: BaseValues$1[]): this;
+    andWhereNotIn(column: SelectableColumn$1<string>, values: BaseValues$2[]): this;
     /**
      * @description Adds an OR WHERE NOT IN condition to the query.
      */
-    orWhereNotIn(column: SelectableColumn$1<string>, values: BaseValues$1[]): this;
+    orWhereNotIn(column: SelectableColumn$1<string>, values: BaseValues$2[]): this;
     /**
      * @description Adds a WHERE NULL condition to the query.
      */
@@ -4566,15 +4719,15 @@ declare class JoinOnQueryBuilder {
     /**
      * @description Adds a raw WHERE condition to the query.
      */
-    whereRaw(sql: string, bindings?: BaseValues$1[]): this;
+    whereRaw(sql: string, bindings?: BaseValues$2[]): this;
     /**
      * @description Adds an AND raw WHERE condition to the query.
      */
-    andWhereRaw(sql: string, bindings?: BaseValues$1[]): this;
+    andWhereRaw(sql: string, bindings?: BaseValues$2[]): this;
     /**
      * @description Adds an OR raw WHERE condition to the query.
      */
-    orWhereRaw(sql: string, bindings?: BaseValues$1[]): this;
+    orWhereRaw(sql: string, bindings?: BaseValues$2[]): this;
 }
 
 /**
@@ -4608,6 +4761,17 @@ declare abstract class JoinQueryBuilder<T extends Model, S extends Record<string
      * @description Join a table with the current model, join clause is not necessary and will be added automatically
      */
     crossJoinRaw(query: string): this;
+    /**
+     * @description Performs a CROSS JOIN against a table (non-raw).
+     */
+    crossJoin(relationTable: string, alias?: string): this;
+    crossJoin<R extends AnyModelConstructor>(relationModel: R): this;
+    /**
+     * @description Replaces the ON condition of the most recently added join with a
+     * `USING (columns)` clause, e.g. `join("orders").using("user_id")`.
+     * @postgres/mysql/mariadb/cockroachdb/sqlite only
+     */
+    using(...columns: (JoinableColumn | ModelKey<T>)[]): this;
     /**
      * @description Join a table with the current model, join clause is not necessary and will be added automatically
      */
@@ -4619,13 +4783,14 @@ declare abstract class JoinQueryBuilder<T extends Model, S extends Record<string
      * @param primaryColumn - The primary column of the current model, default is caller model primary key if using a Model, if using a Raw Query Builder you must provide the key for the primary table, must be in the format of `table.column`
      * @param operator - The comparison operator to use in the ON clause (default: "=")
      */
-    innerJoin(relationTable: string, referencingColumn: JoinableColumn, primaryColumn: JoinableColumn, operator?: BinaryOperatorType$1): this;
-    innerJoin(relationTable: string, referencingColumn: JoinableColumn, primaryColumn?: JoinableColumn, operator?: BinaryOperatorType$1): this;
-    innerJoin<R extends AnyModelConstructor>(relationModel: R, referencingColumn: ModelKey<InstanceType<R>>, primaryColumn: ModelKey<T>, operator?: BinaryOperatorType$1): this;
-    innerJoin<R extends AnyModelConstructor>(relationModel: R, referencingColumn: ModelKey<InstanceType<R>>, primaryColumn?: ModelKey<T>, operator?: BinaryOperatorType$1): this;
-    innerJoin(relationTable: string, referencingColumn: JoinableColumn, primaryColumn: JoinableColumn, operator: BinaryOperatorType$1, callback: JoinOnCallback): this;
+    innerJoin(relationTable: string): this;
+    innerJoin(relationTable: string, referencingColumn: JoinableColumn, primaryColumn: JoinableColumn, operator?: BinaryOperatorType$2): this;
+    innerJoin(relationTable: string, referencingColumn: JoinableColumn, primaryColumn?: JoinableColumn, operator?: BinaryOperatorType$2): this;
+    innerJoin<R extends AnyModelConstructor>(relationModel: R, referencingColumn: ModelKey<InstanceType<R>>, primaryColumn: ModelKey<T>, operator?: BinaryOperatorType$2): this;
+    innerJoin<R extends AnyModelConstructor>(relationModel: R, referencingColumn: ModelKey<InstanceType<R>>, primaryColumn?: ModelKey<T>, operator?: BinaryOperatorType$2): this;
+    innerJoin(relationTable: string, referencingColumn: JoinableColumn, primaryColumn: JoinableColumn, operator: BinaryOperatorType$2, callback: JoinOnCallback): this;
     innerJoin(relationTable: string, referencingColumn: JoinableColumn, primaryColumn: JoinableColumn, callback: JoinOnCallback): this;
-    innerJoin<R extends AnyModelConstructor>(relationModel: R, referencingColumn: ModelKey<InstanceType<R>>, primaryColumn: ModelKey<T>, operator: BinaryOperatorType$1, callback: JoinOnCallback): this;
+    innerJoin<R extends AnyModelConstructor>(relationModel: R, referencingColumn: ModelKey<InstanceType<R>>, primaryColumn: ModelKey<T>, operator: BinaryOperatorType$2, callback: JoinOnCallback): this;
     innerJoin<R extends AnyModelConstructor>(relationModel: R, referencingColumn: ModelKey<InstanceType<R>>, primaryColumn: ModelKey<T>, callback: JoinOnCallback): this;
     /**
      * @description Join a table with the current model
@@ -4634,13 +4799,14 @@ declare abstract class JoinQueryBuilder<T extends Model, S extends Record<string
      * @param primaryColumn - The primary column of the current model, default is caller model primary key if using a Model, if using a Raw Query Builder you must provide the key for the primary table, must be in the format of `table.column`
      * @param operator - The comparison operator to use in the ON clause (default: "=")
      */
-    join(relationTable: string, referencingColumn: JoinableColumn, primaryColumn: JoinableColumn, operator?: BinaryOperatorType$1): this;
-    join(relationTable: string, referencingColumn: JoinableColumn, primaryColumn?: JoinableColumn, operator?: BinaryOperatorType$1): this;
-    join<R extends AnyModelConstructor>(relationModel: R, referencingColumn: ModelKey<InstanceType<R>>, primaryColumn: ModelKey<T>, operator?: BinaryOperatorType$1): this;
-    join<R extends AnyModelConstructor>(relationModel: R, referencingColumn: ModelKey<InstanceType<R>>, primaryColumn?: ModelKey<T>, operator?: BinaryOperatorType$1): this;
-    join(relationTable: string, referencingColumn: JoinableColumn, primaryColumn: JoinableColumn, operator: BinaryOperatorType$1, callback: JoinOnCallback): this;
+    join(relationTable: string): this;
+    join(relationTable: string, referencingColumn: JoinableColumn, primaryColumn: JoinableColumn, operator?: BinaryOperatorType$2): this;
+    join(relationTable: string, referencingColumn: JoinableColumn, primaryColumn?: JoinableColumn, operator?: BinaryOperatorType$2): this;
+    join<R extends AnyModelConstructor>(relationModel: R, referencingColumn: ModelKey<InstanceType<R>>, primaryColumn: ModelKey<T>, operator?: BinaryOperatorType$2): this;
+    join<R extends AnyModelConstructor>(relationModel: R, referencingColumn: ModelKey<InstanceType<R>>, primaryColumn?: ModelKey<T>, operator?: BinaryOperatorType$2): this;
+    join(relationTable: string, referencingColumn: JoinableColumn, primaryColumn: JoinableColumn, operator: BinaryOperatorType$2, callback: JoinOnCallback): this;
     join(relationTable: string, referencingColumn: JoinableColumn, primaryColumn: JoinableColumn, callback: JoinOnCallback): this;
-    join<R extends AnyModelConstructor>(relationModel: R, referencingColumn: ModelKey<InstanceType<R>>, primaryColumn: ModelKey<T>, operator: BinaryOperatorType$1, callback: JoinOnCallback): this;
+    join<R extends AnyModelConstructor>(relationModel: R, referencingColumn: ModelKey<InstanceType<R>>, primaryColumn: ModelKey<T>, operator: BinaryOperatorType$2, callback: JoinOnCallback): this;
     join<R extends AnyModelConstructor>(relationModel: R, referencingColumn: ModelKey<InstanceType<R>>, primaryColumn: ModelKey<T>, callback: JoinOnCallback): this;
     /**
      * @description Join a table with the current model
@@ -4649,13 +4815,14 @@ declare abstract class JoinQueryBuilder<T extends Model, S extends Record<string
      * @param primaryColumn - The primary column of the current model, default is caller model primary key if using a Model, if using a Raw Query Builder you must provide the key for the primary table, must be in the format of `table.column`
      * @param operator - The comparison operator to use in the ON clause (default: "=")
      */
-    leftJoin(relationTable: string, referencingColumn: JoinableColumn, primaryColumn: JoinableColumn, operator?: BinaryOperatorType$1): this;
-    leftJoin(relationTable: string, referencingColumn: JoinableColumn, primaryColumn?: JoinableColumn, operator?: BinaryOperatorType$1): this;
-    leftJoin<R extends AnyModelConstructor>(relationModel: R, referencingColumn: ModelKey<InstanceType<R>>, primaryColumn: ModelKey<T>, operator?: BinaryOperatorType$1): this;
-    leftJoin<R extends AnyModelConstructor>(relationModel: R, referencingColumn: ModelKey<InstanceType<R>>, primaryColumn?: ModelKey<T>, operator?: BinaryOperatorType$1): this;
-    leftJoin(relationTable: string, referencingColumn: JoinableColumn, primaryColumn: JoinableColumn, operator: BinaryOperatorType$1, callback: JoinOnCallback): this;
+    leftJoin(relationTable: string): this;
+    leftJoin(relationTable: string, referencingColumn: JoinableColumn, primaryColumn: JoinableColumn, operator?: BinaryOperatorType$2): this;
+    leftJoin(relationTable: string, referencingColumn: JoinableColumn, primaryColumn?: JoinableColumn, operator?: BinaryOperatorType$2): this;
+    leftJoin<R extends AnyModelConstructor>(relationModel: R, referencingColumn: ModelKey<InstanceType<R>>, primaryColumn: ModelKey<T>, operator?: BinaryOperatorType$2): this;
+    leftJoin<R extends AnyModelConstructor>(relationModel: R, referencingColumn: ModelKey<InstanceType<R>>, primaryColumn?: ModelKey<T>, operator?: BinaryOperatorType$2): this;
+    leftJoin(relationTable: string, referencingColumn: JoinableColumn, primaryColumn: JoinableColumn, operator: BinaryOperatorType$2, callback: JoinOnCallback): this;
     leftJoin(relationTable: string, referencingColumn: JoinableColumn, primaryColumn: JoinableColumn, callback: JoinOnCallback): this;
-    leftJoin<R extends AnyModelConstructor>(relationModel: R, referencingColumn: ModelKey<InstanceType<R>>, primaryColumn: ModelKey<T>, operator: BinaryOperatorType$1, callback: JoinOnCallback): this;
+    leftJoin<R extends AnyModelConstructor>(relationModel: R, referencingColumn: ModelKey<InstanceType<R>>, primaryColumn: ModelKey<T>, operator: BinaryOperatorType$2, callback: JoinOnCallback): this;
     leftJoin<R extends AnyModelConstructor>(relationModel: R, referencingColumn: ModelKey<InstanceType<R>>, primaryColumn: ModelKey<T>, callback: JoinOnCallback): this;
     /**
      * @description Join a table with the current model
@@ -4664,10 +4831,11 @@ declare abstract class JoinQueryBuilder<T extends Model, S extends Record<string
      * @param primaryColumn - The primary column of the current model, default is caller model primary key if using A Model, if using a Raw Query Builder you must provide the key for the primary table
      * @param operator - The comparison operator to use in the ON clause (default: "=")
      */
-    rightJoin(relationTable: string, referencingColumnOrPrimaryColumn: JoinableColumn, primaryColumn: JoinableColumn, operator?: BinaryOperatorType$1): this;
-    rightJoin(relationTable: string, referencingColumnOrPrimaryColumn: JoinableColumn, primaryColumn?: JoinableColumn, operator?: BinaryOperatorType$1): this;
-    rightJoin<R extends AnyModelConstructor>(relationTable: string | R, referencingColumnOrPrimaryColumn: ModelKey<InstanceType<R>> | JoinableColumn | ModelKey<T>, primaryColumn?: JoinableColumn | ModelKey<T>, operator?: BinaryOperatorType$1): this;
-    rightJoin(relationTable: string, referencingColumnOrPrimaryColumn: JoinableColumn, primaryColumn: JoinableColumn, operator: BinaryOperatorType$1, callback: JoinOnCallback): this;
+    rightJoin(relationTable: string): this;
+    rightJoin(relationTable: string, referencingColumnOrPrimaryColumn: JoinableColumn, primaryColumn: JoinableColumn, operator?: BinaryOperatorType$2): this;
+    rightJoin(relationTable: string, referencingColumnOrPrimaryColumn: JoinableColumn, primaryColumn?: JoinableColumn, operator?: BinaryOperatorType$2): this;
+    rightJoin<R extends AnyModelConstructor>(relationTable: string | R, referencingColumnOrPrimaryColumn: ModelKey<InstanceType<R>> | JoinableColumn | ModelKey<T>, primaryColumn?: JoinableColumn | ModelKey<T>, operator?: BinaryOperatorType$2): this;
+    rightJoin(relationTable: string, referencingColumnOrPrimaryColumn: JoinableColumn, primaryColumn: JoinableColumn, operator: BinaryOperatorType$2, callback: JoinOnCallback): this;
     rightJoin(relationTable: string, referencingColumnOrPrimaryColumn: JoinableColumn, primaryColumn: JoinableColumn, callback: JoinOnCallback): this;
     /**
      * @description Perform a FULL OUTER JOIN with another table
@@ -4676,10 +4844,10 @@ declare abstract class JoinQueryBuilder<T extends Model, S extends Record<string
      * @param primaryColumn - The primary column of the current model
      * @param operator - The comparison operator to use in the ON clause (default: "=")
      */
-    fullJoin(relationTable: string, referencingColumnOrPrimaryColumn: JoinableColumn, primaryColumn: JoinableColumn, operator?: BinaryOperatorType$1): this;
-    fullJoin(relationTable: string, referencingColumnOrPrimaryColumn: JoinableColumn, primaryColumn?: JoinableColumn, operator?: BinaryOperatorType$1): this;
-    fullJoin<R extends AnyModelConstructor>(relationTable: string | R, referencingColumnOrPrimaryColumn: ModelKey<InstanceType<R>> | JoinableColumn | ModelKey<T>, primaryColumn?: JoinableColumn | ModelKey<T>, operator?: BinaryOperatorType$1): this;
-    fullJoin(relationTable: string, referencingColumnOrPrimaryColumn: JoinableColumn, primaryColumn: JoinableColumn, operator: BinaryOperatorType$1, callback: JoinOnCallback): this;
+    fullJoin(relationTable: string, referencingColumnOrPrimaryColumn: JoinableColumn, primaryColumn: JoinableColumn, operator?: BinaryOperatorType$2): this;
+    fullJoin(relationTable: string, referencingColumnOrPrimaryColumn: JoinableColumn, primaryColumn?: JoinableColumn, operator?: BinaryOperatorType$2): this;
+    fullJoin<R extends AnyModelConstructor>(relationTable: string | R, referencingColumnOrPrimaryColumn: ModelKey<InstanceType<R>> | JoinableColumn | ModelKey<T>, primaryColumn?: JoinableColumn | ModelKey<T>, operator?: BinaryOperatorType$2): this;
+    fullJoin(relationTable: string, referencingColumnOrPrimaryColumn: JoinableColumn, primaryColumn: JoinableColumn, operator: BinaryOperatorType$2, callback: JoinOnCallback): this;
     fullJoin(relationTable: string, referencingColumnOrPrimaryColumn: JoinableColumn, primaryColumn: JoinableColumn, callback: JoinOnCallback): this;
 }
 
@@ -4719,6 +4887,33 @@ declare class SelectQueryBuilder<T extends Model, S extends Record<string, any>
      * .selectFunc("custom_fn", "column", "result")
      */
     selectFunc<A extends string>(sqlFunc: SqlFunction, column: string, alias: A): this;
+    /**
+     * @description Adds `count(DISTINCT column)` to the SELECT list.
+     * @example .countDistinct("status", "statuses").many()
+     */
+    countDistinct(column: string, alias?: string): this;
+    /**
+     * @description Adds `sum(DISTINCT column)` to the SELECT list.
+     */
+    sumDistinct(column: string, alias?: string): this;
+    /**
+     * @description Adds `avg(DISTINCT column)` to the SELECT list.
+     */
+    avgDistinct(column: string, alias?: string): this;
+    /**
+     * @description Adds `rank() OVER (...)` to the SELECT list.
+     * @example .rank("r", { partitionBy: "teamId", orderBy: { column: "score", order: "desc" } })
+     */
+    rank(alias?: string, options?: WindowOptions): this;
+    /**
+     * @description Adds `dense_rank() OVER (...)` to the SELECT list.
+     */
+    denseRank(alias?: string, options?: WindowOptions): this;
+    /**
+     * @description Adds `row_number() OVER (...)` to the SELECT list.
+     */
+    rowNumber(alias?: string, options?: WindowOptions): this;
+    private pushWindow;
     /**
      * @description Clears the SELECT clause
      */
@@ -4834,9 +5029,9 @@ declare abstract class WhereQueryBuilder<T extends Model, S extends Record<strin
     where(cb: (queryBuilder: WhereOnlyQueryBuilder<T>) => void): this;
     where(column: string, subQuery: QueryBuilder<T> | ((subQuery: QueryBuilder<T>) => void | SubQueryable)): this;
     where(column: string, operator: SubqueryOperatorType, subQuery: QueryBuilder<T> | ((subQuery: QueryBuilder<T>) => void | SubQueryable)): this;
-    where<K extends ModelKey<T>>(column: K, operator: BinaryOperatorType$1, value: WhereColumnValue<T, K>): this;
+    where<K extends ModelKey<T>>(column: K, operator: BinaryOperatorType$2, value: WhereColumnValue<T, K>): this;
     where<K extends ModelKey<T>>(column: K, value: WhereColumnValue<T, K>): this;
-    where<K extends `${string}.${string}`>(column: K, operator: BinaryOperatorType$1, value: ResolveWhereValue<T, K>): this;
+    where<K extends `${string}.${string}`>(column: K, operator: BinaryOperatorType$2, value: ResolveWhereValue<T, K>): this;
     where<K extends `${string}.${string}`>(column: K, value: ResolveWhereValue<T, K>): this;
     /**
      * @description Adds an AND WHERE condition to the query.
@@ -4844,9 +5039,9 @@ declare abstract class WhereQueryBuilder<T extends Model, S extends Record<strin
     andWhere(cb: (queryBuilder: WhereOnlyQueryBuilder<T>) => void): this;
     andWhere(column: string, subQuery: QueryBuilder<T> | ((subQuery: QueryBuilder<T>) => void | SubQueryable)): this;
     andWhere(column: string, operator: SubqueryOperatorType, subQuery: QueryBuilder<T> | ((subQuery: QueryBuilder<T>) => void | SubQueryable)): this;
-    andWhere<K extends ModelKey<T>>(column: K, operator: BinaryOperatorType$1, value: WhereColumnValue<T, K>): this;
+    andWhere<K extends ModelKey<T>>(column: K, operator: BinaryOperatorType$2, value: WhereColumnValue<T, K>): this;
     andWhere<K extends ModelKey<T>>(column: K, value: WhereColumnValue<T, K>): this;
-    andWhere<K extends `${string}.${string}`>(column: K, operator: BinaryOperatorType$1, value: ResolveWhereValue<T, K>): this;
+    andWhere<K extends `${string}.${string}`>(column: K, operator: BinaryOperatorType$2, value: ResolveWhereValue<T, K>): this;
     andWhere<K extends `${string}.${string}`>(column: K, value: ResolveWhereValue<T, K>): this;
     /**
      * @description Adds an OR WHERE condition to the query.
@@ -4854,57 +5049,80 @@ declare abstract class WhereQueryBuilder<T extends Model, S extends Record<strin
     orWhere(cb: (queryBuilder: WhereOnlyQueryBuilder<T>) => void): this;
     orWhere(column: string, subQuery: QueryBuilder<T> | ((subQuery: QueryBuilder<T>) => void | SubQueryable)): this;
     orWhere(column: string, operator: SubqueryOperatorType, subQuery: QueryBuilder<T> | ((subQuery: QueryBuilder<T>) => void | SubQueryable)): this;
-    orWhere<K extends ModelKey<T>>(column: K, operator: BinaryOperatorType$1, value: WhereColumnValue<T, K>): this;
+    orWhere<K extends ModelKey<T>>(column: K, operator: BinaryOperatorType$2, value: WhereColumnValue<T, K>): this;
     orWhere<K extends ModelKey<T>>(column: K, value: WhereColumnValue<T, K>): this;
-    orWhere<K extends `${string}.${string}`>(column: K, operator: BinaryOperatorType$1, value: ResolveWhereValue<T, K>): this;
+    orWhere<K extends `${string}.${string}`>(column: K, operator: BinaryOperatorType$2, value: ResolveWhereValue<T, K>): this;
     orWhere<K extends `${string}.${string}`>(column: K, value: ResolveWhereValue<T, K>): this;
     /**
      * @description Adds a WHERE condition comparing two columns.
      */
     whereColumn<K extends ModelKey<T>>(column: K, referenceColumn: ModelKey<T>): this;
-    whereColumn<K extends ModelKey<T>>(column: K, operator: BinaryOperatorType$1, referenceColumn: ModelKey<T>): this;
+    whereColumn<K extends ModelKey<T>>(column: K, operator: BinaryOperatorType$2, referenceColumn: ModelKey<T>): this;
     whereColumn(column: `${string}.${string}`, referenceColumn: `${string}.${string}`): this;
-    whereColumn(column: `${string}.${string}`, operator: BinaryOperatorType$1, referenceColumn: `${string}.${string}`): this;
+    whereColumn(column: `${string}.${string}`, operator: BinaryOperatorType$2, referenceColumn: `${string}.${string}`): this;
     /**
      * @description Adds an AND WHERE condition comparing two columns.
      */
     andWhereColumn<K extends ModelKey<T>>(column: K, referenceColumn: ModelKey<T>): this;
-    andWhereColumn<K extends ModelKey<T>>(column: K, operator: BinaryOperatorType$1, referenceColumn: ModelKey<T>): this;
+    andWhereColumn<K extends ModelKey<T>>(column: K, operator: BinaryOperatorType$2, referenceColumn: ModelKey<T>): this;
     andWhereColumn(column: `${string}.${string}`, referenceColumn: `${string}.${string}`): this;
-    andWhereColumn(column: `${string}.${string}`, operator: BinaryOperatorType$1, referenceColumn: `${string}.${string}`): this;
+    andWhereColumn(column: `${string}.${string}`, operator: BinaryOperatorType$2, referenceColumn: `${string}.${string}`): this;
     /**
      * @description Adds an OR WHERE condition comparing two columns.
      */
     orWhereColumn<K extends ModelKey<T>>(column: K, referenceColumn: ModelKey<T>): this;
-    orWhereColumn<K extends ModelKey<T>>(column: K, operator: BinaryOperatorType$1, referenceColumn: ModelKey<T>): this;
+    orWhereColumn<K extends ModelKey<T>>(column: K, operator: BinaryOperatorType$2, referenceColumn: ModelKey<T>): this;
     orWhereColumn(column: `${string}.${string}`, referenceColumn: `${string}.${string}`): this;
-    orWhereColumn(column: `${string}.${string}`, operator: BinaryOperatorType$1, referenceColumn: `${string}.${string}`): this;
+    orWhereColumn(column: `${string}.${string}`, operator: BinaryOperatorType$2, referenceColumn: `${string}.${string}`): this;
+    /**
+     * @description Adds a WHERE condition comparing two columns with a negated
+     * comparison, i.e. `column != referenceColumn` (or `NOT (column op referenceColumn)`).
+     */
+    whereNotColumn<K extends ModelKey<T>>(column: K, referenceColumn: ModelKey<T>): this;
+    whereNotColumn<K extends ModelKey<T>>(column: K, operator: BinaryOperatorType$2, referenceColumn: ModelKey<T>): this;
+    whereNotColumn(column: `${string}.${string}`, referenceColumn: `${string}.${string}`): this;
+    whereNotColumn(column: `${string}.${string}`, operator: BinaryOperatorType$2, referenceColumn: `${string}.${string}`): this;
+    /**
+     * @description Adds an AND WHERE condition comparing two columns with a negated comparison.
+     */
+    andWhereNotColumn<K extends ModelKey<T>>(column: K, referenceColumn: ModelKey<T>): this;
+    andWhereNotColumn<K extends ModelKey<T>>(column: K, operator: BinaryOperatorType$2, referenceColumn: ModelKey<T>): this;
+    andWhereNotColumn(column: `${string}.${string}`, referenceColumn: `${string}.${string}`): this;
+    andWhereNotColumn(column: `${string}.${string}`, operator: BinaryOperatorType$2, referenceColumn: `${string}.${string}`): this;
+    /**
+     * @description Adds an OR WHERE condition comparing two columns with a negated comparison.
+     */
+    orWhereNotColumn<K extends ModelKey<T>>(column: K, referenceColumn: ModelKey<T>): this;
+    orWhereNotColumn<K extends ModelKey<T>>(column: K, operator: BinaryOperatorType$2, referenceColumn: ModelKey<T>): this;
+    orWhereNotColumn(column: `${string}.${string}`, referenceColumn: `${string}.${string}`): this;
+    orWhereNotColumn(column: `${string}.${string}`, operator: BinaryOperatorType$2, referenceColumn: `${string}.${string}`): this;
+    private pushNotColumnWhere;
     /**
      * @description Adds a negated WHERE condition to the query.
      */
     whereNot(column: string, subQuery: QueryBuilder<T> | ((subQuery: QueryBuilder<T>) => void | SubQueryable)): this;
     whereNot(column: string, operator: SubqueryOperatorType, subQuery: QueryBuilder<T> | ((subQuery: QueryBuilder<T>) => void | SubQueryable)): this;
-    whereNot<K extends ModelKey<T>>(column: K, operator: BinaryOperatorType$1, value: WhereColumnValue<T, K>): this;
+    whereNot<K extends ModelKey<T>>(column: K, operator: BinaryOperatorType$2, value: WhereColumnValue<T, K>): this;
     whereNot<K extends ModelKey<T>>(column: K, value: WhereColumnValue<T, K>): this;
-    whereNot<K extends `${string}.${string}`>(column: K, operator: BinaryOperatorType$1, value: ResolveWhereValue<T, K>): this;
+    whereNot<K extends `${string}.${string}`>(column: K, operator: BinaryOperatorType$2, value: ResolveWhereValue<T, K>): this;
     whereNot<K extends `${string}.${string}`>(column: K, value: ResolveWhereValue<T, K>): this;
     /**
      * @description Adds a negated AND WHERE condition to the query.
      */
     andWhereNot(column: string, subQuery: QueryBuilder<T> | ((subQuery: QueryBuilder<T>) => void | SubQueryable)): this;
     andWhereNot(column: string, operator: SubqueryOperatorType, subQuery: QueryBuilder<T> | ((subQuery: QueryBuilder<T>) => void | SubQueryable)): this;
-    andWhereNot<K extends ModelKey<T>>(column: K, operator: BinaryOperatorType$1, value: WhereColumnValue<T, K>): this;
+    andWhereNot<K extends ModelKey<T>>(column: K, operator: BinaryOperatorType$2, value: WhereColumnValue<T, K>): this;
     andWhereNot<K extends ModelKey<T>>(column: K, value: WhereColumnValue<T, K>): this;
-    andWhereNot<K extends `${string}.${string}`>(column: K, operator: BinaryOperatorType$1, value: ResolveWhereValue<T, K>): this;
+    andWhereNot<K extends `${string}.${string}`>(column: K, operator: BinaryOperatorType$2, value: ResolveWhereValue<T, K>): this;
     andWhereNot<K extends `${string}.${string}`>(column: K, value: ResolveWhereValue<T, K>): this;
     /**
      * @description Adds a negated OR WHERE condition to the query.
      */
     orWhereNot(column: string, subQuery: QueryBuilder<T> | ((subQuery: QueryBuilder<T>) => void | SubQueryable)): this;
     orWhereNot(column: string, operator: SubqueryOperatorType, subQuery: QueryBuilder<T> | ((subQuery: QueryBuilder<T>) => void | SubQueryable)): this;
-    orWhereNot<K extends ModelKey<T>>(column: K, operator: BinaryOperatorType$1, value: WhereColumnValue<T, K>): this;
+    orWhereNot<K extends ModelKey<T>>(column: K, operator: BinaryOperatorType$2, value: WhereColumnValue<T, K>): this;
     orWhereNot<K extends ModelKey<T>>(column: K, value: WhereColumnValue<T, K>): this;
-    orWhereNot<K extends `${string}.${string}`>(column: K, operator: BinaryOperatorType$1, value: ResolveWhereValue<T, K>): this;
+    orWhereNot<K extends `${string}.${string}`>(column: K, operator: BinaryOperatorType$2, value: ResolveWhereValue<T, K>): this;
     orWhereNot<K extends `${string}.${string}`>(column: K, value: ResolveWhereValue<T, K>): this;
     /**
      * @description Adds a WHERE BETWEEN condition to the query.
@@ -5150,24 +5368,24 @@ declare abstract class WhereQueryBuilder<T extends Model, S extends Record<strin
      * @description Adds a HAVING condition to the query.
      */
     having<K extends ModelKey<T>>(column: K, value: WhereColumnValue<T, K>): this;
-    having<K extends ModelKey<T>>(column: K, operator: BinaryOperatorType$1, value: WhereColumnValue<T, K>): this;
+    having<K extends ModelKey<T>>(column: K, operator: BinaryOperatorType$2, value: WhereColumnValue<T, K>): this;
     having<K extends `${string}.${string}`>(column: K, value: ResolveWhereValue<T, K>): this;
-    having<K extends `${string}.${string}`>(column: K, operator: BinaryOperatorType$1, value: ResolveWhereValue<T, K>): this;
+    having<K extends `${string}.${string}`>(column: K, operator: BinaryOperatorType$2, value: ResolveWhereValue<T, K>): this;
     /**
      * @description Adds an AND HAVING condition to the query.
      */
     andHaving<K extends ModelKey<T>>(column: K, value: WhereColumnValue<T, K>): this;
-    andHaving<K extends ModelKey<T>>(column: K, operator: BinaryOperatorType$1, value: WhereColumnValue<T, K>): this;
+    andHaving<K extends ModelKey<T>>(column: K, operator: BinaryOperatorType$2, value: WhereColumnValue<T, K>): this;
     andHaving<K extends `${string}.${string}`>(column: K, value: ResolveWhereValue<T, K>): this;
-    andHaving<K extends `${string}.${string}`>(column: K, operator: BinaryOperatorType$1, value: ResolveWhereValue<T, K>): this;
-    andHaving(column: ModelKey<T>, operator: BinaryOperatorType$1, value: any): this;
+    andHaving<K extends `${string}.${string}`>(column: K, operator: BinaryOperatorType$2, value: ResolveWhereValue<T, K>): this;
+    andHaving(column: ModelKey<T>, operator: BinaryOperatorType$2, value: any): this;
     /**
      * @description Adds an OR HAVING condition to the query.
      */
     orHaving<K extends ModelKey<T>>(column: K, value: WhereColumnValue<T, K>): this;
-    orHaving<K extends ModelKey<T>>(column: K, operator: BinaryOperatorType$1, value: WhereColumnValue<T, K>): this;
+    orHaving<K extends ModelKey<T>>(column: K, operator: BinaryOperatorType$2, value: WhereColumnValue<T, K>): this;
     orHaving(column: `${string}.${string}`, value: any): this;
-    orHaving(column: `${string}.${string}`, operator: BinaryOperatorType$1, value: any): this;
+    orHaving(column: `${string}.${string}`, operator: BinaryOperatorType$2, value: any): this;
     /**
      * @description Adds a raw HAVING condition to the query.
      */
@@ -5180,6 +5398,63 @@ declare abstract class WhereQueryBuilder<T extends Model, S extends Record<strin
      * @description Adds a raw OR HAVING condition to the query.
      */
     orHavingRaw(query: string): this;
+    /**
+     * @description Adds a HAVING IS NULL condition.
+     */
+    havingNull(column: ModelKey<T> | SelectableColumn$1<string>): this;
+    andHavingNull(column: ModelKey<T> | SelectableColumn$1<string>): this;
+    orHavingNull(column: ModelKey<T> | SelectableColumn$1<string>): this;
+    /**
+     * @description Adds a HAVING IS NOT NULL condition.
+     */
+    havingNotNull(column: ModelKey<T> | SelectableColumn$1<string>): this;
+    andHavingNotNull(column: ModelKey<T> | SelectableColumn$1<string>): this;
+    orHavingNotNull(column: ModelKey<T> | SelectableColumn$1<string>): this;
+    /**
+     * @description Adds a HAVING IN condition; accepts values or a subquery.
+     */
+    havingIn(column: ModelKey<T> | SelectableColumn$1<string>, values: BaseValues$2[] | QueryBuilder<T> | ((subQuery: QueryBuilder<T>) => void | SubQueryable)): this;
+    andHavingIn(column: ModelKey<T> | SelectableColumn$1<string>, values: BaseValues$2[] | QueryBuilder<T> | ((subQuery: QueryBuilder<T>) => void | SubQueryable)): this;
+    orHavingIn(column: ModelKey<T> | SelectableColumn$1<string>, values: BaseValues$2[] | QueryBuilder<T> | ((subQuery: QueryBuilder<T>) => void | SubQueryable)): this;
+    /**
+     * @description Adds a HAVING NOT IN condition; accepts values or a subquery.
+     */
+    havingNotIn(column: ModelKey<T> | SelectableColumn$1<string>, values: BaseValues$2[] | QueryBuilder<T> | ((subQuery: QueryBuilder<T>) => void | SubQueryable)): this;
+    andHavingNotIn(column: ModelKey<T> | SelectableColumn$1<string>, values: BaseValues$2[] | QueryBuilder<T> | ((subQuery: QueryBuilder<T>) => void | SubQueryable)): this;
+    orHavingNotIn(column: ModelKey<T> | SelectableColumn$1<string>, values: BaseValues$2[] | QueryBuilder<T> | ((subQuery: QueryBuilder<T>) => void | SubQueryable)): this;
+    /**
+     * @description Adds a HAVING BETWEEN condition.
+     */
+    havingBetween(column: ModelKey<T> | SelectableColumn$1<string>, range: [BaseValues$2, BaseValues$2]): this;
+    andHavingBetween(column: ModelKey<T> | SelectableColumn$1<string>, range: [BaseValues$2, BaseValues$2]): this;
+    orHavingBetween(column: ModelKey<T> | SelectableColumn$1<string>, range: [BaseValues$2, BaseValues$2]): this;
+    /**
+     * @description Adds a HAVING NOT BETWEEN condition.
+     */
+    havingNotBetween(column: ModelKey<T> | SelectableColumn$1<string>, range: [BaseValues$2, BaseValues$2]): this;
+    andHavingNotBetween(column: ModelKey<T> | SelectableColumn$1<string>, range: [BaseValues$2, BaseValues$2]): this;
+    orHavingNotBetween(column: ModelKey<T> | SelectableColumn$1<string>, range: [BaseValues$2, BaseValues$2]): this;
+    /**
+     * @description Adds a HAVING EXISTS condition (subquery).
+     */
+    havingExists(cbOrQueryBuilder: (queryBuilder: QueryBuilder<T>) => void | QueryBuilder<T>): this;
+    andHavingExists(cbOrQueryBuilder: (queryBuilder: QueryBuilder<T>) => void | QueryBuilder<T>): this;
+    orHavingExists(cbOrQueryBuilder: (queryBuilder: QueryBuilder<T>) => void | QueryBuilder<T>): this;
+    /**
+     * @description Adds a HAVING NOT EXISTS condition (subquery).
+     */
+    havingNotExists(cbOrQueryBuilder: (queryBuilder: QueryBuilder<T>) => void | QueryBuilder<T>): this;
+    andHavingNotExists(cbOrQueryBuilder: (queryBuilder: QueryBuilder<T>) => void | QueryBuilder<T>): this;
+    orHavingNotExists(cbOrQueryBuilder: (queryBuilder: QueryBuilder<T>) => void | QueryBuilder<T>): this;
+    /**
+     * @description Wraps a group of HAVING conditions in parentheses.
+     */
+    havingWrapped(cb: (queryBuilder: WhereQueryBuilder<T>) => void): this;
+    andHavingWrapped(cb: (queryBuilder: WhereQueryBuilder<T>) => void): this;
+    orHavingWrapped(cb: (queryBuilder: WhereQueryBuilder<T>) => void): this;
+    private pushHavingIn;
+    private pushHavingExists;
+    private pushHavingGroup;
     private buildSubQuery;
     private andWhereSubQuery;
     private orWhereSubQuery;
@@ -5264,6 +5539,77 @@ declare class JsonQueryBuilder<T extends Model, S extends Record<string, any> =
      * @description Add a raw JSON filter expression (OR).
      */
     orWhereJsonRaw(raw: string, params?: any[]): this;
+    /**
+     * @description Filters records where the JSON column equals an exact JSON object value.
+     */
+    whereJsonObject<K extends string>(column: K, value: JsonValueForColumn<T, K>): this;
+    /**
+     * @description Filters records where the JSON column equals an exact JSON object value (AND).
+     */
+    andWhereJsonObject<K extends string>(column: K, value: JsonValueForColumn<T, K>): this;
+    /**
+     * @description Filters records where the JSON column equals an exact JSON object value (OR).
+     */
+    orWhereJsonObject<K extends string>(column: K, value: JsonValueForColumn<T, K>): this;
+    /**
+     * @description Filters records where the JSON column does NOT equal an exact JSON object value.
+     */
+    whereNotJsonObject<K extends string>(column: K, value: JsonValueForColumn<T, K>): this;
+    /**
+     * @description Filters records where the JSON column does NOT equal an exact JSON object value (AND).
+     */
+    andWhereNotJsonObject<K extends string>(column: K, value: JsonValueForColumn<T, K>): this;
+    /**
+     * @description Filters records where the JSON column does NOT equal an exact JSON object value (OR).
+     */
+    orWhereNotJsonObject<K extends string>(column: K, value: JsonValueForColumn<T, K>): this;
+    /**
+     * @description Compares the value at a JSON path using the given operator.
+     * @example whereJsonPath("meta", "address.city", "=", "Rome")
+     */
+    whereJsonPath<K extends string>(column: K, path: JsonPathInput, operator: BinaryOperatorType$2, value: any): this;
+    /**
+     * @description Compares the value at a JSON path (AND).
+     */
+    andWhereJsonPath<K extends string>(column: K, path: JsonPathInput, operator: BinaryOperatorType$2, value: any): this;
+    /**
+     * @description Compares the value at a JSON path (OR).
+     */
+    orWhereJsonPath<K extends string>(column: K, path: JsonPathInput, operator: BinaryOperatorType$2, value: any): this;
+    /**
+     * @description Filters records where the JSON column is a superset of the value (contains it).
+     */
+    whereJsonSupersetOf<K extends string>(column: K, value: JsonValueForColumn<T, K>): this;
+    andWhereJsonSupersetOf<K extends string>(column: K, value: JsonValueForColumn<T, K>): this;
+    orWhereJsonSupersetOf<K extends string>(column: K, value: JsonValueForColumn<T, K>): this;
+    /**
+     * @description Filters records where the JSON column is NOT a superset of the value.
+     */
+    whereJsonNotSupersetOf<K extends string>(column: K, value: JsonValueForColumn<T, K>): this;
+    andWhereJsonNotSupersetOf<K extends string>(column: K, value: JsonValueForColumn<T, K>): this;
+    orWhereJsonNotSupersetOf<K extends string>(column: K, value: JsonValueForColumn<T, K>): this;
+    /**
+     * @description Filters records where the JSON column is a subset of the value.
+     * @postgres/cockroachdb/mysql/mariadb only
+     */
+    whereJsonSubsetOf<K extends string>(column: K, value: JsonValueForColumn<T, K>): this;
+    andWhereJsonSubsetOf<K extends string>(column: K, value: JsonValueForColumn<T, K>): this;
+    orWhereJsonSubsetOf<K extends string>(column: K, value: JsonValueForColumn<T, K>): this;
+    /**
+     * @description Filters records where the JSON column is NOT a subset of the value.
+     * @postgres/cockroachdb/mysql/mariadb only
+     */
+    whereJsonNotSubsetOf<K extends string>(column: K, value: JsonValueForColumn<T, K>): this;
+    andWhereJsonNotSubsetOf<K extends string>(column: K, value: JsonValueForColumn<T, K>): this;
+    orWhereJsonNotSubsetOf<K extends string>(column: K, value: JsonValueForColumn<T, K>): this;
+    /**
+     * @description Filters records where the JSON column has none of the given keys.
+     * @postgres/cockroachdb only
+     */
+    whereJsonHasNone<K extends string>(column: K, keys: string[]): this;
+    andWhereJsonHasNone<K extends string>(column: K, keys: string[]): this;
+    orWhereJsonHasNone<K extends string>(column: K, keys: string[]): this;
+    private pushJsonPath;
 }
 
 type PluckReturnType<T extends Model, K extends RawModelKey<T>> = T[StripTablePrefix<K & string> & keyof T] extends infer U ? U[] : never;
@@ -5484,6 +5830,8 @@ interface ExecuteOptions<D extends SqlDataSourceType, M extends Model> {
     sqlLiteOptions?: SqlLiteOptions<M>;
     /** Reserved connection when inside a transaction; pool otherwise */
     connection?: GetConnectionReturnType<D>;
+    /** Aborted when a `timeout(..., { cancel: true })` fires */
+    signal?: AbortSignal;
 }
 /** rawQuery keeps transaction-level SQL flowing through the datasource (observers/logs) */
 type TransactionRawQuery<D extends SqlDataSourceType> = (query: string, params?: unknown[]) => Promise<RawQueryResponseType<D>>;
@@ -6045,7 +6393,7 @@ type WhereColumnValue<T extends Model, K extends ModelKey<T>> = T[StripTablePref
  * For model columns (ModelKey<T>), returns the specific column type.
  * For arbitrary columns (joins, aliases), falls back to BaseValues.
  */
-type ResolveWhereValue<T extends Model, K extends string> = K extends ModelKey<T> ? T[StripTablePrefix<K> & keyof T] | null | SqlFuncNode : BaseValues$1;
+type ResolveWhereValue<T extends Model, K extends string> = K extends ModelKey<T> ? T[StripTablePrefix<K> & keyof T] | null | SqlFuncNode : BaseValues$2;
 type ModelRelation<T extends Model> = OnlyRelations<T>;
 type OrderByChoices = "asc" | "desc";
 type OrderByType<T extends Model> = {
@@ -7003,37 +7351,37 @@ declare class ModelQueryBuilder<T extends Model, S extends Record<string, any> =
      * @warning All select statements are ignored, since we're only checking if the relation exists, a "select 1" will be added to the Query
      */
     havingRelated<RelationKey extends ModelRelation<T>>(relation: RelationKey, cb?: (queryBuilder: ModelQueryBuilder<RelatedInstance<T, RelationKey>>) => void): this;
-    havingRelated<RelationKey extends ModelRelation<T>>(relation: RelationKey, operatorOrValue?: BinaryOperatorType$1 | BaseValues$1, maybeValue?: BaseValues$1): this;
+    havingRelated<RelationKey extends ModelRelation<T>>(relation: RelationKey, operatorOrValue?: BinaryOperatorType$2 | BaseValues$2, maybeValue?: BaseValues$2): this;
     /**
      * @description Checks if the relation exists in the models and has the given filters, if no callback is provided, it only check if there is at least one record for the relation
      * @warning All select statements are ignored, since we're only checking if the relation exists, a "select 1" will be added to the Query
      */
     andHavingRelated<RelationKey extends ModelRelation<T>>(relation: RelationKey, cb?: (queryBuilder: ModelQueryBuilder<RelatedInstance<T, RelationKey>>) => void): this;
-    andHavingRelated<RelationKey extends ModelRelation<T>>(relation: RelationKey, operatorOrValue?: BinaryOperatorType$1 | BaseValues$1, maybeValue?: BaseValues$1): this;
+    andHavingRelated<RelationKey extends ModelRelation<T>>(relation: RelationKey, operatorOrValue?: BinaryOperatorType$2 | BaseValues$2, maybeValue?: BaseValues$2): this;
     /**
      * @description Checks if the relation exists in the models and has the given filters, if no callback is provided, it only check if there is at least one record for the relation,
      * @warning All select statements are ignored, since we're only checking if the relation exists, a "select 1" will be added to the Query
      */
     orHavingRelated<RelationKey extends ModelRelation<T>>(relation: RelationKey, cb?: (queryBuilder: ModelQueryBuilder<RelatedInstance<T, RelationKey>>) => void): this;
-    orHavingRelated<RelationKey extends ModelRelation<T>>(relation: RelationKey, operatorOrValue?: BinaryOperatorType$1 | BaseValues$1, maybeValue?: BaseValues$1): this;
+    orHavingRelated<RelationKey extends ModelRelation<T>>(relation: RelationKey, operatorOrValue?: BinaryOperatorType$2 | BaseValues$2, maybeValue?: BaseValues$2): this;
     /**
      * @description Checks if the relation does not exist in the models and has the given filters, if no callback is provided, it only check if there is no record for the Relation
      * @warning All select statements are ignored, since we're only checking if the relation exists, a "select 1" will be added to the Query
      */
     notHavingRelated<RelationKey extends ModelRelation<T>>(relation: RelationKey, cb?: (queryBuilder: ModelQueryBuilder<RelatedInstance<T, RelationKey>>) => void): this;
-    notHavingRelated<RelationKey extends ModelRelation<T>>(relation: RelationKey, operatorOrValue?: BinaryOperatorType$1 | BaseValues$1, maybeValue?: BaseValues$1): this;
+    notHavingRelated<RelationKey extends ModelRelation<T>>(relation: RelationKey, operatorOrValue?: BinaryOperatorType$2 | BaseValues$2, maybeValue?: BaseValues$2): this;
     /**
      * @description Checks if the relation does not exist in the models and has the given filters, if no callback is provided, it only check if there is no record for the relation
      * @warning All select statements are ignored, since we're only checking if the relation exists, a "select 1" will be added to the Query
      */
     andNotHavingRelated<RelationKey extends ModelRelation<T>>(relation: RelationKey, cb?: (queryBuilder: ModelQueryBuilder<RelatedInstance<T, RelationKey>>) => void): this;
-    andNotHavingRelated<RelationKey extends ModelRelation<T>>(relation: RelationKey, operatorOrValue?: BinaryOperatorType$1 | BaseValues$1, maybeValue?: BaseValues$1): this;
+    andNotHavingRelated<RelationKey extends ModelRelation<T>>(relation: RelationKey, operatorOrValue?: BinaryOperatorType$2 | BaseValues$2, maybeValue?: BaseValues$2): this;
     /**
      * @description Checks if the relation does not exist in the models and has the given filters, if no callback is provided, it only check if there is no record for the Relation
      * @warning All select statements are ignored, since we're only checking if the relation exists, a "select 1" will be added to the Query
      */
     orNotHavingRelated<RelationKey extends ModelRelation<T>>(relation: RelationKey, cb?: (queryBuilder: ModelQueryBuilder<RelatedInstance<T, RelationKey>>) => void): this;
-    orNotHavingRelated<RelationKey extends ModelRelation<T>>(relation: RelationKey, operatorOrValue?: BinaryOperatorType$1 | BaseValues$1, maybeValue?: BaseValues$1): this;
+    orNotHavingRelated<RelationKey extends ModelRelation<T>>(relation: RelationKey, operatorOrValue?: BinaryOperatorType$2 | BaseValues$2, maybeValue?: BaseValues$2): this;
     /**
      * @description Returns a copy of the query builder instance.
      */
@@ -7085,7 +7433,7 @@ declare class ModelQueryBuilder<T extends Model, S extends Record<string, any> =
     protected getRelatedModelsForRelation(relationQueryBuilder: ModelQueryBuilder<any>, relation: Relation, models: T[]): Promise<SelectedModel<T, ModelWithoutRelations<T>, R>[]>;
     protected getRelatedModelsQueryForRelation(relationQueryBuilder: ModelQueryBuilder<any>, relation: Relation, models: T[]): ModelQueryBuilder<any, any, any, D>;
     protected getFilterValuesFromModelsForRelation(relation: Relation, models: T[]): any[];
-    protected applyHavingRelatedFilter(relationQueryBuilder: ModelQueryBuilder<any>, relation: Relation, operator?: BinaryOperatorType$1, value?: BaseValues$1): void;
+    protected applyHavingRelatedFilter(relationQueryBuilder: ModelQueryBuilder<any>, relation: Relation, operator?: BinaryOperatorType$2, value?: BaseValues$2): void;
 }
 
 /**
@@ -8769,7 +9117,7 @@ declare abstract class BaseSeeder {
     abstract run(): Promise<void>;
 }
 
-type HysteriaErrorCode = "VALIDATION_ERROR" | "CONNECTION_ALREADY_ESTABLISHED" | `UNSUPPORTED_ISOLATION_LEVEL_${string}` | "ROW_NOT_FOUND" | `UNSUPPORTED_DATABASE_TYPE_${string}` | `RELATION_TYPE_NOT_SUPPORTED_${string}` | `NOT_SUPPORTED_IN_${string}` | `RELATION_NOT_FOUND_IN_MODEL_${string}` | `UNKNOWN_RELATION_TYPE_${string}` | `DISTINCT_ON_NOT_SUPPORTED_IN_${string}` | `CONFLICT_COLUMNS_NOT_PRESENT_IN_DATA` | `CONFLICT_COLUMNS_NOT_PRESENT_IN_DATA_${string}` | `FOREIGN_KEY_VALUES_MISSING_FOR_HAS_ONE_RELATION_${string}` | `FOREIGN_KEY_VALUES_MISSING_FOR_BELONGS_TO_RELATION_${string}` | `PRIMARY_KEY_VALUES_MISSING_FOR_HAS_MANY_RELATION_${string}` | `MANY_TO_MANY_RELATION_NOT_FOUND_FOR_RELATED_MODEL_${string}` | `PRIMARY_KEY_VALUES_MISSING_FOR_MANY_TO_MANY_RELATION_${string}` | `RELATED_MODEL_DOES_NOT_HAVE_A_PRIMARY_KEY_${string}` | `FOR_SHARE_NOT_SUPPORTED_IN_${string}` | `SKIP_LOCKED_NOT_SUPPORTED_IN_${string}` | `LOCK_FOR_UPDATE_NOT_SUPPORTED_${string}` | `KEY_${string}_HAS_NO_HANDLER_IN_CACHE_KEYS_CONFIG` | `CACHE_ADAPTER_NOT_CONFIGURED` | `SQLITE_NOT_SUPPORTED` | `COCKROACHDB_NOT_SUPPORTED` | `RELATION_NOT_FOUND` | `POSTGRES_TABLE_REQUIRED` | `MODEL_HAS_NO_PRIMARY_KEY_VALUE` | `RELATION_NOT_MANY_TO_MANY` | "MATERIALIZED_CTE_NOT_SUPPORTED" | "DUPLICATE_MODEL_KEYS_WHILE_INSTANTIATING_MODELS" | "INVALID_ONE_PARAMETER_WHERE_CONDITION" | "INVALID_PAGINATION_PARAMETERS" | "MISSING_ALIAS_FOR_SUBQUERY" | "MODEL_HAS_NO_PRIMARY_KEY" | "PRIMARY_KEY_NOT_FOUND" | "ORDER_BY_REQUIRED" | "ORDER_BY_RAW_NOT_SUPPORTED" | "INVALID_SQL_COMMENT" | "SQLITE_ONLY_SUPPORTS_SERIALIZABLE_ISOLATION_LEVEL" | "MUST_CALL_BUILD_CTE_AT_LEAST_ONCE" | "REGEXP_NOT_SUPPORTED_IN_SQLITE" | "MANY_TO_MANY_RELATION_MUST_HAVE_A_THROUGH_MODEL" | "INSERT_FAILED" | "MULTIPLE_PRIMARY_KEYS_NOT_ALLOWED" | "FILE_NOT_A_SQL_OR_TXT_FILE" | "CONNECTION_NOT_ESTABLISHED" | "TRANSACTION_NOT_ACTIVE" | "DEVELOPMENT_ERROR" | "MIGRATION_MODULE_NOT_FOUND" | "DRIVER_NOT_FOUND" | "FILE_NOT_FOUND_OR_NOT_ACCESSIBLE" | "ENV_NOT_SET" | "REQUIRED_VALUE_NOT_SET" | "SET_FAILED" | "GET_FAILED" | "REFERENCES_OPTION_REQUIRED" | "DELETE_FAILED" | "INVALID_DEFAULT_VALUE" | "DISCONNECT_FAILED" | "FLUSH_FAILED" | "LEFT_COLUMN_NOT_PROVIDED_FOR_JOIN" | "RIGHT_COLUMN_NOT_PROVIDED_FOR_JOIN" | "MODEL_HAS_NO_PRIMARY_KEY" | "GLOBAL_TRANSACTION_ALREADY_STARTED" | "GLOBAL_TRANSACTION_NOT_STARTED" | "MYSQL_REQUIRES_TABLE_NAME_FOR_INDEX_DROP" | "INVALID_DATE_OBJECT" | "INVALID_DATE_STRING" | "FAILED_TO_PARSE_DATE" | "MIGRATION_MODULE_REQUIRES_TS_NODE" | "FAILED_TO_ENCRYPT_SYMMETRICALLY" | "FAILED_TO_DECRYPT_SYMMETRICALLY" | "FAILED_TO_ENCRYPT_ASYMMETRICALLY" | "FAILED_TO_DECRYPT_ASYMMETRICALLY" | "UNSUPPORTED_RELATION_TYPE" | "LPUSH_FAILED" | "RPUSH_FAILED" | "LPOP_FAILED" | "RPOP_FAILED" | "LRANGE_FAILED" | "LLEN_FAILED" | "HSET_FAILED" | "HMSET_FAILED" | "HGET_FAILED" | "HGETALL_FAILED" | "HMGET_FAILED" | "HDEL_FAILED" | "HEXISTS_FAILED" | "HKEYS_FAILED" | "HLEN_FAILED" | "SADD_FAILED" | "SMEMBERS_FAILED" | "SREM_FAILED" | "SISMEMBER_FAILED" | "SCARD_FAILED" | "SINTER_FAILED" | "SUNION_FAILED" | "SDIFF_FAILED" | "ZADD_FAILED" | "ZRANGE_FAILED" | "ZREVRANGE_FAILED" | "ZREM_FAILED" | "ZSCORE_FAILED" | "ZCARD_FAILED" | "SUBSCRIBE_FAILED" | "UNSUBSCRIBE_FAILED" | "PUBLISH_FAILED" | "PSUBSCRIBE_FAILED" | "PUNSUBSCRIBE_FAILED" | "EXISTS_FAILED" | "EXPIRE_FAILED" | "EXPIREAT_FAILED" | "PEXPIRE_FAILED" | "TTL_FAILED" | "PTTL_FAILED" | "PERSIST_FAILED" | "KEYS_FAILED" | "RENAME_FAILED" | "TYPE_FAILED" | "SCAN_FAILED" | "ADMINJS_NOT_ENABLED" | "ADMINJS_INITIALIZATION_FAILED" | "ADMINJS_NO_MODELS_PROVIDED" | `BETTER_AUTH_MISSING_ID_${string}` | `BETTER_AUTH_INVALID_INCREMENT_${string}` | "ZOD_ENGINE_NOT_LOADED" | "ATOMIC_DATASOURCE_RESOLUTION_FAILED" | "ATOMIC_INVALID_METHOD" | "ATOMIC_CLS_DISABLED" | `SCOPE_NOT_FOUND_${string}`;
+type HysteriaErrorCode = "VALIDATION_ERROR" | "CONNECTION_ALREADY_ESTABLISHED" | `UNSUPPORTED_ISOLATION_LEVEL_${string}` | "ROW_NOT_FOUND" | `UNSUPPORTED_DATABASE_TYPE_${string}` | `RELATION_TYPE_NOT_SUPPORTED_${string}` | `NOT_SUPPORTED_IN_${string}` | `RELATION_NOT_FOUND_IN_MODEL_${string}` | `UNKNOWN_RELATION_TYPE_${string}` | `DISTINCT_ON_NOT_SUPPORTED_IN_${string}` | `CONFLICT_COLUMNS_NOT_PRESENT_IN_DATA` | `CONFLICT_COLUMNS_NOT_PRESENT_IN_DATA_${string}` | `FOREIGN_KEY_VALUES_MISSING_FOR_HAS_ONE_RELATION_${string}` | `FOREIGN_KEY_VALUES_MISSING_FOR_BELONGS_TO_RELATION_${string}` | `PRIMARY_KEY_VALUES_MISSING_FOR_HAS_MANY_RELATION_${string}` | `MANY_TO_MANY_RELATION_NOT_FOUND_FOR_RELATED_MODEL_${string}` | `PRIMARY_KEY_VALUES_MISSING_FOR_MANY_TO_MANY_RELATION_${string}` | `RELATED_MODEL_DOES_NOT_HAVE_A_PRIMARY_KEY_${string}` | `FOR_SHARE_NOT_SUPPORTED_IN_${string}` | `SKIP_LOCKED_NOT_SUPPORTED_IN_${string}` | `LOCK_STRENGTH_NOT_SUPPORTED_IN_${string}` | "QUERY_TIMEOUT" | `LOCK_FOR_UPDATE_NOT_SUPPORTED_${string}` | `KEY_${string}_HAS_NO_HANDLER_IN_CACHE_KEYS_CONFIG` | `CACHE_ADAPTER_NOT_CONFIGURED` | `SQLITE_NOT_SUPPORTED` | `COCKROACHDB_NOT_SUPPORTED` | `RELATION_NOT_FOUND` | `POSTGRES_TABLE_REQUIRED` | `MODEL_HAS_NO_PRIMARY_KEY_VALUE` | `RELATION_NOT_MANY_TO_MANY` | "MATERIALIZED_CTE_NOT_SUPPORTED" | "NOT_MATERIALIZED_CTE_NOT_SUPPORTED" | "USING_REQUIRES_JOIN" | "USING_NOT_SUPPORTED_IN_MSSQL" | "DUPLICATE_MODEL_KEYS_WHILE_INSTANTIATING_MODELS" | "INVALID_ONE_PARAMETER_WHERE_CONDITION" | "INVALID_PAGINATION_PARAMETERS" | "MISSING_ALIAS_FOR_SUBQUERY" | "MODEL_HAS_NO_PRIMARY_KEY" | "PRIMARY_KEY_NOT_FOUND" | "ORDER_BY_REQUIRED" | "ORDER_BY_RAW_NOT_SUPPORTED" | "INVALID_SQL_COMMENT" | "SQLITE_ONLY_SUPPORTS_SERIALIZABLE_ISOLATION_LEVEL" | "MUST_CALL_BUILD_CTE_AT_LEAST_ONCE" | "REGEXP_NOT_SUPPORTED_IN_SQLITE" | "MANY_TO_MANY_RELATION_MUST_HAVE_A_THROUGH_MODEL" | "INSERT_FAILED" | "MULTIPLE_PRIMARY_KEYS_NOT_ALLOWED" | "FILE_NOT_A_SQL_OR_TXT_FILE" | "CONNECTION_NOT_ESTABLISHED" | "TRANSACTION_NOT_ACTIVE" | "DEVELOPMENT_ERROR" | "MIGRATION_MODULE_NOT_FOUND" | "DRIVER_NOT_FOUND" | "FILE_NOT_FOUND_OR_NOT_ACCESSIBLE" | "ENV_NOT_SET" | "REQUIRED_VALUE_NOT_SET" | "SET_FAILED" | "GET_FAILED" | "REFERENCES_OPTION_REQUIRED" | "DELETE_FAILED" | "INVALID_DEFAULT_VALUE" | "DISCONNECT_FAILED" | "FLUSH_FAILED" | "LEFT_COLUMN_NOT_PROVIDED_FOR_JOIN" | "RIGHT_COLUMN_NOT_PROVIDED_FOR_JOIN" | "MODEL_HAS_NO_PRIMARY_KEY" | "GLOBAL_TRANSACTION_ALREADY_STARTED" | "GLOBAL_TRANSACTION_NOT_STARTED" | "MYSQL_REQUIRES_TABLE_NAME_FOR_INDEX_DROP" | "INVALID_DATE_OBJECT" | "INVALID_DATE_STRING" | "FAILED_TO_PARSE_DATE" | "MIGRATION_MODULE_REQUIRES_TS_NODE" | "FAILED_TO_ENCRYPT_SYMMETRICALLY" | "FAILED_TO_DECRYPT_SYMMETRICALLY" | "FAILED_TO_ENCRYPT_ASYMMETRICALLY" | "FAILED_TO_DECRYPT_ASYMMETRICALLY" | "UNSUPPORTED_RELATION_TYPE" | "LPUSH_FAILED" | "RPUSH_FAILED" | "LPOP_FAILED" | "RPOP_FAILED" | "LRANGE_FAILED" | "LLEN_FAILED" | "HSET_FAILED" | "HMSET_FAILED" | "HGET_FAILED" | "HGETALL_FAILED" | "HMGET_FAILED" | "HDEL_FAILED" | "HEXISTS_FAILED" | "HKEYS_FAILED" | "HLEN_FAILED" | "SADD_FAILED" | "SMEMBERS_FAILED" | "SREM_FAILED" | "SISMEMBER_FAILED" | "SCARD_FAILED" | "SINTER_FAILED" | "SUNION_FAILED" | "SDIFF_FAILED" | "ZADD_FAILED" | "ZRANGE_FAILED" | "ZREVRANGE_FAILED" | "ZREM_FAILED" | "ZSCORE_FAILED" | "ZCARD_FAILED" | "SUBSCRIBE_FAILED" | "UNSUBSCRIBE_FAILED" | "PUBLISH_FAILED" | "PSUBSCRIBE_FAILED" | "PUNSUBSCRIBE_FAILED" | "EXISTS_FAILED" | "EXPIRE_FAILED" | "EXPIREAT_FAILED" | "PEXPIRE_FAILED" | "TTL_FAILED" | "PTTL_FAILED" | "PERSIST_FAILED" | "KEYS_FAILED" | "RENAME_FAILED" | "TYPE_FAILED" | "SCAN_FAILED" | "ADMINJS_NOT_ENABLED" | "ADMINJS_INITIALIZATION_FAILED" | "ADMINJS_NO_MODELS_PROVIDED" | `BETTER_AUTH_MISSING_ID_${string}` | `BETTER_AUTH_INVALID_INCREMENT_${string}` | "ZOD_ENGINE_NOT_LOADED" | "ATOMIC_DATASOURCE_RESOLUTION_FAILED" | "ATOMIC_INVALID_METHOD" | "ATOMIC_CLS_DISABLED" | `SCOPE_NOT_FOUND_${string}`;
 
 declare class HysteriaError extends Error {
     code: HysteriaErrorCode;