pqb 0.11.8 → 0.11.10

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import * as orchid_core from 'orchid-core';
-import { Sql, EmptyObject, RawExpression, ColumnTypeBase, MaybeArray, QueryResultRow, AdapterBase, QueryInput, ColumnsShapeBase, StringKey, ColumnOutput, NullableColumn, QueryInternal, QueryMetaBase, EmptyTuple, ColumnTypesBase, DbBase, ThenResult, ColumnShapeOutput, DefaultSelectColumns, SetOptional, Spread, CoalesceString, QueryBaseCommon, QueryCommon, BaseNumberData, Code, numberTypeMethods, BaseStringData, PrimaryKeyColumn, DateColumnData, EncodeColumn, ParseColumn, dateTypeMethods, JSONTypeAny, record, ArrayMethodsData, arrayMethods, name, ColumnDataBase, BaseOperators, HiddenColumn, ValidationContext, MessageParam } from 'orchid-core';
+import { Sql, QueryBaseCommon, ColumnsShapeBase, QueryInternal, QueryMetaBase, EmptyObject, RawExpression, ColumnTypeBase, MaybeArray, QueryResultRow, AdapterBase, QueryInput, StringKey, ColumnOutput, NullableColumn, EmptyTuple, ColumnTypesBase, DbBase, ThenResult, ColumnShapeOutput, DefaultSelectColumns, SetOptional, Spread, CoalesceString, QueryCommon, BaseNumberData, Code, numberTypeMethods, BaseStringData, PrimaryKeyColumn, DateColumnData, EncodeColumn, ParseColumn, dateTypeMethods, JSONTypeAny, record, ArrayMethodsData, arrayMethods, name, ColumnDataBase, BaseOperators, HiddenColumn, ValidationContext, MessageParam } from 'orchid-core';
 import { PoolConfig, Pool, PoolClient } from 'pg';
 import { inspect } from 'util';
 import { AsyncLocalStorage } from 'node:async_hooks';
@@ -19,6 +19,20 @@ type ToSqlOptions = {
 declare const toSql: (table: Query, options?: ToSqlOptions) => Sql;
 declare const makeSql: (table: Query, { values }?: ToSqlOptions) => Sql;
 
+declare abstract class QueryBase implements QueryBaseCommon {
+    clone<T extends QueryBase>(this: T): T;
+    abstract result: ColumnsShape;
+    query: QueryData;
+    table?: string;
+    selectable: SelectableBase;
+    shape: ColumnsShapeBase;
+    relations: RelationsBase;
+    withData: WithDataBase;
+    baseQuery: Query;
+    internal: QueryInternal;
+    meta: QueryMetaBase;
+}
+
 type BaseRelation = {
     type: string;
     key: string;
@@ -561,18 +575,7 @@ declare const addWhereNot: <T extends QueryBase>(q: T, args: WhereArg<T>[]) => W
 declare const addOr: <T extends QueryBase>(q: T, args: WhereArg<T>[]) => WhereResult<T>;
 declare const addOrNot: <T extends QueryBase>(q: T, args: WhereArg<T>[]) => WhereResult<T>;
 declare const addWhereIn: <T extends QueryBase>(q: T, and: boolean, arg: unknown, values: unknown[] | unknown[][] | Query | RawExpression | undefined, not?: boolean) => WhereResult<T>;
-declare abstract class Where implements QueryBase {
-    abstract clone<T extends this>(this: T): T;
-    abstract selectable: SelectableBase;
-    abstract shape: ColumnsShapeBase;
-    abstract relations: RelationsBase;
-    abstract withData: WithDataBase;
-    abstract baseQuery: Query;
-    abstract internal: QueryInternal;
-    query: QueryData;
-    table?: string;
-    meta: QueryMetaBase;
-    result: ColumnsShape;
+declare abstract class Where extends QueryBase {
     where<T extends Where>(this: T, ...args: WhereArg<T>[]): WhereResult<T>;
     _where<T extends Where>(this: T, ...args: WhereArg<T>[]): WhereResult<T>;
     whereNot<T extends Where>(this: T, ...args: WhereArg<T>[]): WhereResult<T>;
@@ -620,18 +623,17 @@ declare abstract class Where implements QueryBase {
 }
 declare class WhereQueryBuilder<Q extends QueryBase = QueryBase> extends Where implements QueryBase {
     selectable: Q['selectable'];
-    shape: Q['shape'];
     relations: Q['relations'];
+    result: Q['result'];
+    shape: Q['shape'];
     baseQuery: Query;
     withData: {};
     internal: Q['internal'];
-    result: Q['result'];
     constructor(q: QueryBase, { shape, joinedShapes }: Pick<QueryData, 'shape' | 'joinedShapes'>);
-    clone<T extends this>(this: T): T;
 }
 
 type WithSelectable<T extends QueryBase, W extends keyof T['withData']> = T['withData'][W] extends WithDataItem ? StringKey<keyof T['withData'][W]['shape']> | `${T['withData'][W]['table']}.${StringKey<keyof T['withData'][W]['shape']>}` : never;
-type JoinFirstArg<T extends QueryBase> = Query | keyof T['relations'] | keyof T['withData'];
+type JoinFirstArg<T extends QueryBase> = Query | keyof T['relations'] | keyof T['withData'] | ((q: Pick<T, keyof T['relations']>) => Query);
 type JoinArgs<T extends QueryBase, Arg extends JoinFirstArg<T>> = Arg extends Query ? JoinQueryArgs<T, Arg> : Arg extends keyof T['relations'] ? EmptyTuple : Arg extends keyof T['withData'] ? JoinWithArgs<T, Arg> : never;
 type JoinSelectable<Q extends Query> = keyof Q['result'] | `${AliasOrTable<Q>}.${StringKey<keyof Q['result']>}`;
 type JoinQueryArgs<T extends QueryBase, Q extends Query> = [
@@ -654,15 +656,31 @@ type JoinWithArgs<T extends QueryBase, W extends keyof T['withData']> = [
     op: string,
     rightColumn: Selectable<T> | RawExpression
 ];
-type JoinResult<T extends Query, Arg extends JoinFirstArg<T>, RequireJoined extends boolean, RequireMain extends boolean, J extends Pick<Query, 'result' | 'table' | 'meta'> = Arg extends Query ? Arg : T['relations'] extends Record<string, Relation> ? Arg extends keyof T['relations'] ? T['relations'][Arg]['table'] : Arg extends keyof T['withData'] ? T['withData'][Arg] extends WithDataItem ? {
+type JoinResult<T extends Query, Arg extends JoinFirstArg<T>, RequireJoined extends boolean, RequireMain extends boolean, Cb extends (q: never) => {
+    meta: {
+        as?: string;
+    };
+} = () => {
+    meta: EmptyObject;
+}, J extends Pick<Query, 'result' | 'table' | 'meta'> = Arg extends Query ? Arg : T['relations'] extends Record<string, Relation> ? Arg extends keyof T['relations'] ? T['relations'][Arg]['table'] : Arg extends (q: never) => Query ? ReturnType<Arg> : Arg extends keyof T['withData'] ? T['withData'][Arg] extends WithDataItem ? {
     table: T['withData'][Arg]['table'];
     result: T['withData'][Arg]['shape'];
     meta: EmptyObject;
-} : never : never : never, Selectable extends SelectableBase = JoinResultSelectable<J, RequireJoined>> = RequireMain extends true ? JoinAddSelectable<T, Selectable> : JoinOptionalMain<T, Selectable>;
-type JoinLateralResult<T extends Query, R extends QueryBase, RequireJoined extends boolean, RequireMain extends boolean, Selectable extends SelectableBase = JoinResultSelectable<R, RequireJoined>> = RequireMain extends true ? JoinAddSelectable<T, Selectable> : JoinOptionalMain<T, Selectable>;
-type JoinResultSelectable<J extends Pick<Query, 'result' | 'table' | 'meta'>, RequireJoined extends boolean, Result extends ColumnsShape = RequireJoined extends true ? J['result'] : {
+} : never : never : never, Selectable extends SelectableBase = JoinResultSelectable<J, RequireJoined, ReturnType<Cb>>> = RequireMain extends true ? JoinAddSelectable<T, Selectable> : JoinOptionalMain<T, Selectable>;
+type JoinLateralResult<T extends Query, R extends QueryBase, RequireJoined extends boolean, RequireMain extends boolean, Selectable extends SelectableBase = JoinResultSelectable<R, RequireJoined, {
+    meta: EmptyObject;
+}>> = RequireMain extends true ? JoinAddSelectable<T, Selectable> : JoinOptionalMain<T, Selectable>;
+type JoinResultSelectable<J extends Pick<Query, 'result' | 'table' | 'meta'>, RequireJoined extends boolean, CbResult extends {
+    meta: {
+        as?: string;
+    };
+}, Result extends ColumnsShape = RequireJoined extends true ? J['result'] : {
     [K in keyof J['result']]: NullableColumn<J['result'][K]>;
-}, As extends string = AliasOrTable<J>> = {
+}, As extends string = CbResult extends {
+    meta: {
+        as: string;
+    };
+} ? CbResult['meta']['as'] : AliasOrTable<J>> = {
     [K in keyof Result as `${As}.${StringKey<K>}`]: {
         as: K;
         column: Result[K];
@@ -694,7 +712,7 @@ type JoinWithArgToQuery<With extends WithDataItem, Selectable extends Selectable
 }> = {
     query: QueryData;
     table: With['table'];
-    clone(): QueryBase;
+    clone<T extends QueryBase>(this: T): T;
     selectable: Selectable & {
         [K in keyof Selectable as `${With['table']}.${StringKey<K>}`]: Selectable[K];
     };
@@ -711,21 +729,21 @@ type JoinCallback<T extends QueryBase, Arg extends JoinFirstArg<T>> = (q: OnQuer
 type JoinLateralCallback<T extends QueryBase, Arg extends JoinFirstArg<T>, R extends QueryBase, Q extends QueryBase = JoinArgToQuery<T, Arg>> = (q: Q & OnQueryBuilder<T, Q>) => R;
 declare class Join {
     join<T extends Query, Arg extends JoinFirstArg<T>, Args extends JoinArgs<T, Arg>>(this: T, arg: Arg, ...args: Args): JoinResult<T, Arg, true, true>;
-    join<T extends Query, Arg extends JoinFirstArg<T>>(this: T, arg: Arg, cb: JoinCallback<T, Arg>): JoinResult<T, Arg, true, true>;
+    join<T extends Query, Arg extends JoinFirstArg<T>, Cb extends JoinCallback<T, Arg>>(this: T, arg: Arg, cb: Cb): JoinResult<T, Arg, true, true, Cb>;
     _join<T extends Query, Arg extends JoinFirstArg<T>, Args extends JoinArgs<T, Arg>>(this: T, arg: Arg, ...args: Args): JoinResult<T, Arg, true, true>;
-    _join<T extends Query, Arg extends JoinFirstArg<T>>(this: T, arg: Arg, cb: JoinCallback<T, Arg>): JoinResult<T, Arg, true, true>;
+    _join<T extends Query, Arg extends JoinFirstArg<T>, Cb extends JoinCallback<T, Arg>>(this: T, arg: Arg, cb: Cb): JoinResult<T, Arg, true, true, Cb>;
     leftJoin<T extends Query, Arg extends JoinFirstArg<T>, Args extends JoinArgs<T, Arg>>(this: T, arg: Arg, ...args: Args): JoinResult<T, Arg, false, true>;
-    leftJoin<T extends Query, Arg extends JoinFirstArg<T>>(this: T, arg: Arg, cb: JoinCallback<T, Arg>): JoinResult<T, Arg, false, true>;
+    leftJoin<T extends Query, Arg extends JoinFirstArg<T>, Cb extends JoinCallback<T, Arg>>(this: T, arg: Arg, cb: Cb): JoinResult<T, Arg, false, true, Cb>;
     _leftJoin<T extends Query, Arg extends JoinFirstArg<T>, Args extends JoinArgs<T, Arg>>(this: T, arg: Arg, ...args: Args): JoinResult<T, Arg, false, true>;
-    _leftJoin<T extends Query, Arg extends JoinFirstArg<T>>(this: T, arg: Arg, cb: JoinCallback<T, Arg>): JoinResult<T, Arg, false, true>;
+    _leftJoin<T extends Query, Arg extends JoinFirstArg<T>, Cb extends JoinCallback<T, Arg>>(this: T, arg: Arg, cb: Cb): JoinResult<T, Arg, false, true, Cb>;
     rightJoin<T extends Query, Arg extends JoinFirstArg<T>, Args extends JoinArgs<T, Arg>>(this: T, arg: Arg, ...args: Args): JoinResult<T, Arg, true, false>;
-    rightJoin<T extends Query, Arg extends JoinFirstArg<T>>(this: T, arg: Arg, cb: JoinCallback<T, Arg>): JoinResult<T, Arg, true, false>;
+    rightJoin<T extends Query, Arg extends JoinFirstArg<T>, Cb extends JoinCallback<T, Arg>>(this: T, arg: Arg, cb: Cb): JoinResult<T, Arg, true, false, Cb>;
     _rightJoin<T extends Query, Arg extends JoinFirstArg<T>, Args extends JoinArgs<T, Arg>>(this: T, arg: Arg, ...args: Args): JoinResult<T, Arg, true, false>;
-    _rightJoin<T extends Query, Arg extends JoinFirstArg<T>>(this: T, arg: Arg, cb: JoinCallback<T, Arg>): JoinResult<T, Arg, true, false>;
+    _rightJoin<T extends Query, Arg extends JoinFirstArg<T>, Cb extends JoinCallback<T, Arg>>(this: T, arg: Arg, cb: Cb): JoinResult<T, Arg, true, false, Cb>;
     fullJoin<T extends Query, Arg extends JoinFirstArg<T>, Args extends JoinArgs<T, Arg>>(this: T, arg: Arg, ...args: Args): JoinResult<T, Arg, false, false>;
-    fullJoin<T extends Query, Arg extends JoinFirstArg<T>>(this: T, arg: Arg, cb: JoinCallback<T, Arg>): JoinResult<T, Arg, false, false>;
+    fullJoin<T extends Query, Arg extends JoinFirstArg<T>, Cb extends JoinCallback<T, Arg>>(this: T, arg: Arg, cb: Cb): JoinResult<T, Arg, false, false, Cb>;
     _fullJoin<T extends Query, Arg extends JoinFirstArg<T>, Args extends JoinArgs<T, Arg>>(this: T, arg: Arg, ...args: Args): JoinResult<T, Arg, false, false>;
-    _fullJoin<T extends Query, Arg extends JoinFirstArg<T>>(this: T, arg: Arg, cb: JoinCallback<T, Arg>): JoinResult<T, Arg, false, false>;
+    _fullJoin<T extends Query, Arg extends JoinFirstArg<T>, Cb extends JoinCallback<T, Arg>>(this: T, arg: Arg, cb: Cb): JoinResult<T, Arg, false, false, Cb>;
     joinLateral<T extends Query, Arg extends JoinFirstArg<T>, R extends QueryBase>(this: T, arg: Arg, cb: JoinLateralCallback<T, Arg, R>): JoinLateralResult<T, R, true, true>;
     _joinLateral<T extends Query, Arg extends JoinFirstArg<T>, R extends QueryBase>(this: T, arg: Arg, cb: JoinLateralCallback<T, Arg, R>): JoinLateralResult<T, R, true, true>;
     leftJoinLateral<T extends Query, Arg extends JoinFirstArg<T>, R extends QueryBase>(this: T, arg: Arg, cb: JoinLateralCallback<T, Arg, R>): JoinLateralResult<T, R, false, true>;
@@ -839,6 +857,7 @@ interface Db<Table extends string | undefined = undefined, Shape extends Columns
     windows: Query['windows'];
     defaultSelectColumns: DefaultSelectColumns<Shape>;
     relations: Relations;
+    relationsQueries: Record<string, Query>;
     withData: Query['withData'];
     error: new (message: string, length: number, name: QueryErrorName) => QueryError<this>;
     isSubQuery: false;
@@ -862,7 +881,7 @@ type DbResult<CT extends ColumnTypesBase> = Db<string, Record<string, never>, Qu
     adapter: Adapter;
     close: Adapter['close'];
 };
-declare const createDb: <CT extends ColumnTypesBase>({ log, logger, columnTypes: ctOrFn, snakeCase, ...options }: DbOptions<CT>) => DbResult<CT>;
+declare const createDb: <CT extends Record<string, orchid_core.AnyColumnTypeCreator>>({ log, logger, columnTypes: ctOrFn, snakeCase, ...options }: DbOptions<CT>) => DbResult<CT>;
 
 type WithArgsOptions = Omit<WithOptions, 'columns'> & {
     columns?: boolean | string[];
@@ -1341,6 +1360,11 @@ declare class CopyMethods {
     _copy<T extends Query>(this: T, arg: CopyArg<T>): T;
 }
 
+declare abstract class AsMethods extends QueryBase {
+    as<T extends AsMethods, As extends string>(this: T, as: As): SetQueryTableAlias<T, As>;
+    _as<T extends AsMethods, As extends string>(this: T, as: As): SetQueryTableAlias<T, As>;
+}
+
 type WindowArg<T extends Query> = Record<string, WindowArgDeclaration<T> | RawExpression>;
 type WindowArgDeclaration<T extends Query = Query> = {
     partitionBy?: Expression<T> | Expression<T>[];
@@ -1352,7 +1376,7 @@ type OrderArg<T extends Query, Key extends PropertyKey = keyof T['selectable'] |
 }[keyof T['result']]> = Key | {
     [K in Key]?: SortDir;
 } | RawExpression;
-interface QueryMethods extends Aggregate, Select, From, Join, With, Union, Json, Create, Update, Delete, Transaction, For, ColumnInfoMethods, Omit<Where, 'result'>, Clear, Having, Window, Then, QueryLog, QueryCallbacks, QueryUpsertOrCreate, QueryGet, MergeQueryMethods, RawMethods, CopyMethods {
+interface QueryMethods extends Omit<AsMethods, 'result'>, Aggregate, Select, From, Join, With, Union, Json, Create, Update, Delete, Transaction, For, ColumnInfoMethods, Omit<Where, 'result'>, Clear, Having, Window, Then, QueryLog, QueryCallbacks, QueryUpsertOrCreate, QueryGet, MergeQueryMethods, RawMethods, CopyMethods {
 }
 declare class QueryMethods {
     windows: EmptyObject;
@@ -1369,7 +1393,6 @@ declare class QueryMethods {
     _pluck<T extends Query, S extends Expression<T>>(this: T, select: S): SetQueryReturnsPluck<T, S>;
     exec<T extends Query>(this: T): SetQueryReturnsVoid<T>;
     _exec<T extends Query>(this: T): SetQueryReturnsVoid<T>;
-    clone<T extends QueryBase>(this: T): T;
     toSql(this: Query, options?: ToSqlOptions): Sql;
     distinct<T extends Query>(this: T, ...columns: Expression<T>[]): T;
     _distinct<T extends Query>(this: T, ...columns: Expression<T>[]): T;
@@ -1381,8 +1404,6 @@ declare class QueryMethods {
     _findBy<T extends Query>(this: T, ...args: WhereArg<T>[]): SetQueryReturnsOne<WhereResult<T>>;
     findByOptional<T extends Query>(this: T, ...args: WhereArg<T>[]): SetQueryReturnsOneOptional<WhereResult<T>>;
     _findByOptional<T extends Query>(this: T, ...args: WhereArg<T>[]): SetQueryReturnsOneOptional<WhereResult<T>>;
-    as<T extends Query, As extends string>(this: T, as: As): SetQueryTableAlias<T, As>;
-    _as<T extends Query, As extends string>(this: T, as: As): SetQueryTableAlias<T, As>;
     withSchema<T extends Query>(this: T, schema: string): T;
     _withSchema<T extends Query>(this: T, schema: string): T;
     group<T extends Query>(this: T, ...columns: Expression<T>[]): T;
@@ -1565,17 +1586,6 @@ type WithDataItem = {
     shape: ColumnsShape;
 };
 type WithDataBase = Record<never, WithDataItem>;
-type QueryBase = QueryBaseCommon & {
-    query: QueryData;
-    table?: string;
-    clone(): QueryBase;
-    selectable: SelectableBase;
-    shape: ColumnsShapeBase;
-    result: ColumnsShape;
-    baseQuery: Query;
-    relations: RelationsBase;
-    withData: WithDataBase;
-};
 type defaultsKey = typeof defaultsKey;
 declare const defaultsKey: unique symbol;
 type Query = QueryCommon & QueryMethods & {
@@ -1597,6 +1607,7 @@ type Query = QueryCommon & QueryMethods & {
     windows: EmptyObject;
     defaultSelectColumns: string[];
     relations: RelationsBase;
+    relationsQueries: Record<string, Query>;
     withData: WithDataBase;
     error: new (message: string, length: number, name: QueryErrorName) => QueryError;
     isSubQuery: boolean;
@@ -1674,7 +1685,9 @@ type SetQueryReturnsColumnInfo<T extends Query, Column extends keyof T['shape']
     returnType: 'value';
     then: ThenResult<Result>;
 };
-type SetQueryTableAlias<T extends Query, As extends string> = {
+type SetQueryTableAlias<T extends Pick<Query, 'selectable' | 'table' | 'meta'> & {
+    shape: ColumnsShapeBase;
+}, As extends string> = {
     [K in keyof T]: K extends 'selectable' ? Omit<T['selectable'], `${AliasOrTable<T>}.${StringKey<keyof T['shape']>}`> & {
         [K in keyof T['shape'] as `${As}.${StringKey<keyof T['shape']>}`]: {
             as: K;
@@ -1901,7 +1914,7 @@ declare abstract class ColumnsObject<Shape extends ColumnsShape> extends ColumnT
             type: any[] | orchid_core.RawExpression | Query;
         };
     };
-    constructor(types: ColumnTypesBase, shape: Shape);
+    constructor(shape: Shape);
 }
 declare abstract class ArrayOfColumnsObjects<Shape extends ColumnsShape> extends ColumnType<{
     [K in keyof Shape]: Shape[K]['type'];
@@ -1922,7 +1935,7 @@ declare abstract class ArrayOfColumnsObjects<Shape extends ColumnsShape> extends
             type: any[] | orchid_core.RawExpression | Query;
         };
     };
-    constructor(types: ColumnTypesBase, shape: Shape);
+    constructor(shape: Shape);
 }
 declare abstract class PluckResultColumnType<C extends ColumnType> extends ColumnType<C['type'][], typeof Operators.any> {
 }
@@ -1971,7 +1984,7 @@ declare abstract class NumberBaseColumn extends ColumnType<number, typeof Operat
 }
 declare abstract class IntegerBaseColumn extends NumberBaseColumn {
     data: NumberColumnData;
-    constructor(types: ColumnTypesBase);
+    constructor();
 }
 declare abstract class NumberAsStringBaseColumn extends ColumnType<string, typeof Operators.number> {
     operators: {
@@ -2040,7 +2053,7 @@ declare class DecimalBaseColumn<Precision extends number | undefined = undefined
         };
     };
     dataType: "decimal";
-    constructor(types: ColumnTypesBase, numericPrecision?: Precision, numericScale?: Scale);
+    constructor(numericPrecision?: Precision, numericScale?: Scale);
     toCode(t: string): Code;
     toSQL(): string;
 }
@@ -2076,7 +2089,7 @@ declare class SmallSerialColumn extends IntegerBaseColumn {
     dataType: "smallint";
     parseItem: typeof parseInt;
     data: SerialColumnData;
-    constructor(types: ColumnTypesBase);
+    constructor();
     toSQL(): string;
     toCode(t: string): Code;
 }
@@ -2084,7 +2097,7 @@ declare class SerialColumn extends IntegerBaseColumn {
     dataType: "integer";
     parseItem: typeof parseInt;
     data: SerialColumnData;
-    constructor(types: ColumnTypesBase);
+    constructor();
     toSQL(): string;
     toCode(t: string): Code;
 }
@@ -2336,7 +2349,7 @@ declare abstract class LimitedTextBaseColumn<Limit extends number | undefined =
     data: TextColumnData & {
         maxChars: Limit;
     };
-    constructor(types: ColumnTypesBase, limit?: Limit);
+    constructor(limit?: Limit);
     toSQL(): string;
 }
 declare class VarCharColumn<Limit extends number | undefined = undefined> extends LimitedTextBaseColumn<Limit> {
@@ -2353,7 +2366,7 @@ declare class TextColumn extends TextBaseColumn {
         minArg?: number;
         maxArg?: number;
     };
-    constructor(types: ColumnTypesBase, minArg?: number, maxArg?: number);
+    constructor(minArg?: number, maxArg?: number);
     toCode(t: string): Code;
 }
 declare class ByteaColumn extends ColumnType<Buffer, typeof Operators.text> {
@@ -2832,7 +2845,7 @@ declare class BitColumn<Length extends number> extends ColumnType<string, typeof
     data: ColumnData & {
         length: Length;
     };
-    constructor(types: ColumnTypesBase, length: Length);
+    constructor(length: Length);
     toCode(t: string): Code;
     toSQL(): string;
 }
@@ -2873,7 +2886,7 @@ declare class BitVaryingColumn<Length extends number | undefined = undefined> ex
     data: ColumnData & {
         length: Length;
     };
-    constructor(types: ColumnTypesBase, length?: Length);
+    constructor(length?: Length);
     toCode(t: string): Code;
     toSQL(): string;
 }
@@ -3028,7 +3041,7 @@ declare class CitextColumn extends TextBaseColumn {
         minArg?: number;
         maxArg?: number;
     };
-    constructor(types: ColumnTypesBase, minArg?: number, maxArg?: number);
+    constructor(minArg?: number, maxArg?: number);
     toCode(t: string): Code;
 }
 
@@ -3078,7 +3091,7 @@ declare abstract class DateTimeBaseClass<Precision extends number | undefined =
     data: DateColumnData & {
         dateTimePrecision: Precision;
     };
-    constructor(types: ColumnTypesBase, dateTimePrecision?: Precision);
+    constructor(dateTimePrecision?: Precision);
     toSQL(): string;
 }
 declare abstract class DateTimeTzBaseClass<Precision extends number | undefined = undefined> extends DateTimeBaseClass<Precision> {
@@ -3141,7 +3154,7 @@ declare class IntervalColumn<Fields extends string | undefined = undefined, Prec
             type: orchid_core.RawExpression | Query | Date[];
         };
     };
-    constructor(types: ColumnTypesBase, fields?: Fields, precision?: Precision);
+    constructor(fields?: Fields, precision?: Precision);
     toCode(t: string): Code;
     toSQL(): string;
 }
@@ -3184,7 +3197,7 @@ declare class EnumColumn<U extends string = string, T extends [U, ...U[]] = [U]>
         };
     };
     dataType: string;
-    constructor(types: ColumnTypesBase, enumName: string, options: T);
+    constructor(enumName: string, options: T);
     toCode(t: string, migration?: boolean): Code;
     toSQL(): string;
 }
@@ -3251,7 +3264,7 @@ declare class JSONColumn<Type extends JSONTypeAny = JSONTypeAny> extends ColumnT
     data: ColumnData & {
         schema: Type;
     };
-    constructor(types: ColumnTypesBase, schemaOrFn?: Type | ((j: JSONTypes) => Type));
+    constructor(schemaOrFn?: Type | ((j: JSONTypes) => Type));
     toCode(t: string): Code;
 }
 declare class JSONTextColumn extends ColumnType<string, typeof Operators.text> {
@@ -3314,7 +3327,7 @@ declare class ArrayColumn<Item extends ColumnType> extends ColumnType<Item['type
         };
     };
     data: ArrayData<Item>;
-    constructor(types: ColumnTypesBase, item: Item);
+    constructor(item: Item);
     toSQL(): string;
     toCode(this: ArrayColumn<Item>, t: string): Code;
     parseFn: ((input: unknown) => unknown[]) & {
@@ -3338,7 +3351,7 @@ declare class CustomTypeColumn extends ColumnType<unknown, typeof Operators.any>
             type: any[] | orchid_core.RawExpression | Query;
         };
     };
-    constructor(types: ColumnTypesBase, dataType: string);
+    constructor(dataType: string);
     toCode(t: string): Code;
 }
 declare class DomainColumn extends CustomTypeColumn {
@@ -3394,8 +3407,8 @@ declare const getConstraintKind: (it: TableData.Constraint) => 'constraint' | 'f
 declare const newTableData: () => TableData;
 declare const getTableData: () => TableData;
 declare const resetTableData: (data?: TableData) => void;
-declare const getColumnTypes: <CT extends ColumnTypesBase, Shape extends ColumnsShape>(types: CT, fn: (t: CT) => Shape, data?: TableData) => Shape;
-declare function text(this: ColumnTypesBase, min: number, max: number): TextColumn;
+declare const getColumnTypes: <CT extends Record<string, orchid_core.AnyColumnTypeCreator>, Shape extends ColumnsShape>(types: CT, fn: (t: CT) => Shape, data?: TableData) => Shape;
+declare function text(min: number, max: number): TextColumn;
 type DefaultColumnTypes = typeof columnTypes;
 declare const columnTypes: {
     timestamps: <T extends orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>>(this: {
@@ -3418,53 +3431,53 @@ declare const columnTypes: {
     };
     name: typeof name;
     raw: (sql: string, values?: false | Record<string, unknown> | undefined) => RawExpression<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>>;
-    smallint(this: ColumnTypesBase): SmallIntColumn;
-    integer(this: ColumnTypesBase): IntegerColumn;
-    bigint(this: ColumnTypesBase): BigIntColumn;
-    numeric<Precision extends number | undefined = undefined, Scale extends number | undefined = undefined>(this: ColumnTypesBase, precision?: Precision | undefined, scale?: Scale | undefined): DecimalColumn<Precision, Scale>;
-    decimal<Precision_1 extends number | undefined = undefined, Scale_1 extends number | undefined = undefined>(this: ColumnTypesBase, precision?: Precision_1 | undefined, scale?: Scale_1 | undefined): DecimalColumn<Precision_1, Scale_1>;
-    real(this: ColumnTypesBase): RealColumn;
-    doublePrecision(this: ColumnTypesBase): DoublePrecisionColumn;
-    identity(this: ColumnTypesBase, options?: TableData.Identity): IntegerColumn;
-    smallSerial(this: ColumnTypesBase): SmallSerialColumn;
-    serial(this: ColumnTypesBase): SerialColumn;
-    bigSerial(this: ColumnTypesBase): BigSerialColumn;
-    money(this: ColumnTypesBase): MoneyColumn;
-    varchar<Limit extends number | undefined = undefined>(this: ColumnTypesBase, limit?: Limit | undefined): VarCharColumn<Limit>;
-    char<Limit_1 extends number | undefined = undefined>(this: ColumnTypesBase, limit?: Limit_1 | undefined): CharColumn<Limit_1>;
+    smallint(): SmallIntColumn;
+    integer(): IntegerColumn;
+    bigint(): BigIntColumn;
+    numeric<Precision extends number | undefined = undefined, Scale extends number | undefined = undefined>(precision?: Precision | undefined, scale?: Scale | undefined): DecimalColumn<Precision, Scale>;
+    decimal<Precision_1 extends number | undefined = undefined, Scale_1 extends number | undefined = undefined>(precision?: Precision_1 | undefined, scale?: Scale_1 | undefined): DecimalColumn<Precision_1, Scale_1>;
+    real(): RealColumn;
+    doublePrecision(): DoublePrecisionColumn;
+    identity(options?: TableData.Identity): IntegerColumn;
+    smallSerial(): SmallSerialColumn;
+    serial(): SerialColumn;
+    bigSerial(): BigSerialColumn;
+    money(): MoneyColumn;
+    varchar<Limit extends number | undefined = undefined>(limit?: Limit | undefined): VarCharColumn<Limit>;
+    char<Limit_1 extends number | undefined = undefined>(limit?: Limit_1 | undefined): CharColumn<Limit_1>;
     text: typeof text;
     string: typeof text;
-    citext(this: ColumnTypesBase, min: number, max: number): CitextColumn;
-    bytea(this: ColumnTypesBase): ByteaColumn;
-    date(this: ColumnTypesBase): DateColumn;
-    timestampWithoutTimeZone<Precision_2 extends number>(this: ColumnTypesBase, precision?: Precision_2 | undefined): TimestampColumn<Precision_2>;
-    timestamp<Precision_3 extends number | undefined = undefined>(this: ColumnTypesBase, precision?: Precision_3 | undefined): TimestampTzColumn<number>;
-    time<Precision_4 extends number | undefined = undefined>(this: ColumnTypesBase, precision?: Precision_4 | undefined): TimeColumn<Precision_4>;
-    interval<Fields extends string | undefined = undefined, Precision_5 extends number | undefined = undefined>(this: ColumnTypesBase, fields?: Fields | undefined, precision?: Precision_5 | undefined): IntervalColumn<Fields, Precision_5>;
-    boolean(this: ColumnTypesBase): BooleanColumn;
-    enum<U extends string, T_2 extends [U, ...U[]]>(this: ColumnTypesBase, dataType: string, type: T_2): EnumColumn<U, T_2>;
-    point(this: ColumnTypesBase): PointColumn;
-    line(this: ColumnTypesBase): LineColumn;
-    lseg(this: ColumnTypesBase): LsegColumn;
-    box(this: ColumnTypesBase): BoxColumn;
-    path(this: ColumnTypesBase): PathColumn;
-    polygon(this: ColumnTypesBase): PolygonColumn;
-    circle(this: ColumnTypesBase): CircleColumn;
-    cidr(this: ColumnTypesBase): CidrColumn;
-    inet(this: ColumnTypesBase): InetColumn;
-    macaddr(this: ColumnTypesBase): MacAddrColumn;
-    macaddr8(this: ColumnTypesBase): MacAddr8Column;
-    bit<Length extends number>(this: ColumnTypesBase, length: Length): BitColumn<Length>;
-    bitVarying<Length_1 extends number | undefined = undefined>(this: ColumnTypesBase, length?: Length_1 | undefined): BitVaryingColumn<Length_1>;
-    tsvector(this: ColumnTypesBase): TsVectorColumn;
-    tsquery(this: ColumnTypesBase): TsQueryColumn;
-    uuid(this: ColumnTypesBase): UUIDColumn;
-    xml(this: ColumnTypesBase): XMLColumn;
-    json<Type extends JSONTypeAny>(this: ColumnTypesBase, schemaOrFn: Type | ((j: JSONTypes) => Type)): JSONColumn<Type>;
-    jsonText(this: ColumnTypesBase): JSONTextColumn;
-    array<Item extends ColumnType<unknown, orchid_core.BaseOperators, unknown>>(this: ColumnTypesBase, item: Item): ArrayColumn<Item>;
-    type(this: ColumnTypesBase, dataType: string): CustomTypeColumn;
-    domain(this: ColumnTypesBase, dataType: string): DomainColumn;
+    citext(min: number, max: number): CitextColumn;
+    bytea(): ByteaColumn;
+    date(): DateColumn;
+    timestampWithoutTimeZone<Precision_2 extends number>(precision?: Precision_2 | undefined): TimestampColumn<Precision_2>;
+    timestamp<Precision_3 extends number | undefined = undefined>(precision?: Precision_3 | undefined): TimestampTzColumn<number>;
+    time<Precision_4 extends number | undefined = undefined>(precision?: Precision_4 | undefined): TimeColumn<Precision_4>;
+    interval<Fields extends string | undefined = undefined, Precision_5 extends number | undefined = undefined>(fields?: Fields | undefined, precision?: Precision_5 | undefined): IntervalColumn<Fields, Precision_5>;
+    boolean(): BooleanColumn;
+    enum<U extends string, T_2 extends [U, ...U[]]>(dataType: string, type: T_2): EnumColumn<U, T_2>;
+    point(): PointColumn;
+    line(): LineColumn;
+    lseg(): LsegColumn;
+    box(): BoxColumn;
+    path(): PathColumn;
+    polygon(): PolygonColumn;
+    circle(): CircleColumn;
+    cidr(): CidrColumn;
+    inet(): InetColumn;
+    macaddr(): MacAddrColumn;
+    macaddr8(): MacAddr8Column;
+    bit<Length extends number>(length: Length): BitColumn<Length>;
+    bitVarying<Length_1 extends number | undefined = undefined>(length?: Length_1 | undefined): BitVaryingColumn<Length_1>;
+    tsvector(): TsVectorColumn;
+    tsquery(): TsQueryColumn;
+    uuid(): UUIDColumn;
+    xml(): XMLColumn;
+    json<Type extends JSONTypeAny>(schemaOrFn: Type | ((j: JSONTypes) => Type)): JSONColumn<Type>;
+    jsonText(): JSONTextColumn;
+    array<Item extends ColumnType<unknown, orchid_core.BaseOperators, unknown>>(item: Item): ArrayColumn<Item>;
+    type(dataType: string): CustomTypeColumn;
+    domain(dataType: string): DomainColumn;
     primaryKey(columns: string[], options?: {
         name?: string;
     }): {};