pqb 0.9.21 → 0.9.22

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/index.d.ts CHANGED
@@ -79,8 +79,10 @@ declare type RelationQueryBase = Query & {
79
79
  [relationQueryKey]: RelationQueryData;
80
80
  [isRequiredRelationKey]: boolean;
81
81
  };
82
- declare type PrepareRelationQuery<T extends Query, RelationName extends PropertyKey, Required extends boolean, Populate extends string> = Omit<T, 'tableAlias'> & {
83
- tableAlias: RelationName extends string ? RelationName : never;
82
+ declare type PrepareRelationQuery<T extends Query, RelationName extends PropertyKey, Required extends boolean, Populate extends string> = Omit<T, 'meta'> & {
83
+ meta: Omit<T['meta'], 'as'> & {
84
+ as: RelationName extends string ? RelationName : never;
85
+ };
84
86
  [isRequiredRelationKey]: Required;
85
87
  [relationQueryKey]: RelationQueryData;
86
88
  } & {
@@ -145,6 +147,43 @@ declare class TransactionAdapter implements Adapter {
145
147
 
146
148
  declare type Code = string | Code[];
147
149
 
150
+ declare type StringKey<K extends PropertyKey> = Exclude<K, symbol | number>;
151
+ declare type SomeIsTrue<T extends unknown[]> = T extends [
152
+ infer Head,
153
+ ...infer Tail
154
+ ] ? Head extends true ? true : SomeIsTrue<Tail> : false;
155
+ declare type MaybeArray<T> = T | T[];
156
+ declare type SetOptional<T, K extends PropertyKey> = Omit<T, K> & {
157
+ [P in K]?: P extends keyof T ? T[P] : never;
158
+ };
159
+ declare type OptionalPropertyNames<T> = {
160
+ [K in keyof T]-?: {} extends {
161
+ [P in K]: T[K];
162
+ } ? K : never;
163
+ }[keyof T];
164
+ declare type SpreadProperties<L, R, K extends keyof L & keyof R> = {
165
+ [P in K]: L[P] | Exclude<R[P], undefined>;
166
+ };
167
+ declare type Id<T> = T extends infer U ? {
168
+ [K in keyof U]: U[K];
169
+ } : never;
170
+ declare type SpreadTwo<L, R> = Id<Pick<L, Exclude<keyof L, keyof R>> & Pick<R, Exclude<keyof R, OptionalPropertyNames<R>>> & Pick<R, Exclude<OptionalPropertyNames<R>, keyof L>> & SpreadProperties<L, R, OptionalPropertyNames<R> & keyof L>>;
171
+ declare type Spread<A extends readonly [...any]> = A extends [
172
+ infer L,
173
+ ...infer R
174
+ ] ? SpreadTwo<L, Spread<R>> : unknown;
175
+ declare type SimpleSpread<A extends readonly [...any]> = A extends [
176
+ infer L,
177
+ ...infer R
178
+ ] ? L & SimpleSpread<R> : {};
179
+ declare type FilterTuple<T extends readonly any[], E> = T extends [
180
+ infer F,
181
+ ...infer R
182
+ ] ? [F] extends [E] ? [F, ...FilterTuple<R, E>] : FilterTuple<R, E> : [];
183
+ declare type CoalesceString<Left extends string | undefined, Right extends string> = Left extends undefined ? Right : Left;
184
+ declare function applyMixins(derivedCtor: any, constructors: any[]): void;
185
+ declare const joinTruthy: (...strings: (string | false | undefined)[]) => string;
186
+
148
187
  declare type ColumnOutput<T extends ColumnTypeBase> = T['type'];
149
188
  declare type ColumnInput<T extends ColumnTypeBase> = T['inputType'];
150
189
  declare type ColumnsShapeBase = Record<string, ColumnTypeBase>;
@@ -177,10 +216,29 @@ declare type HiddenColumn<T extends ColumnTypeBase> = Omit<T, 'data'> & {
177
216
  isHidden: true;
178
217
  };
179
218
  };
219
+ declare type OptionalColumnsForInput<Shape extends ColumnsShapeBase> = {
220
+ [K in keyof Shape]: SomeIsTrue<[
221
+ Shape[K]['data']['isNullable'],
222
+ undefined extends Shape[K]['data']['default'] ? false : true
223
+ ]> extends true ? K : never;
224
+ }[keyof Shape];
225
+ declare type ColumnShapeInput<Shape extends ColumnsShapeBase> = SetOptional<{
226
+ [K in keyof Shape]: ColumnInput<Shape[K]>;
227
+ }, OptionalColumnsForInput<Shape>>;
180
228
  declare type AnyColumnType = ColumnTypeBase<any, Record<string, Operator<any>>>;
181
229
  declare type AnyColumnTypeCreator = (...args: any[]) => AnyColumnType | {};
182
230
  declare type ColumnTypesBase = Record<string, AnyColumnTypeCreator>;
183
231
  declare type ValidationContext = any;
232
+ declare type SinglePrimaryKey<Shape extends ColumnsShapeBase> = StringKey<{
233
+ [K in keyof Shape]: Shape[K]['data']['isPrimaryKey'] extends true ? [
234
+ {
235
+ [S in keyof Shape]: Shape[S]['data']['isPrimaryKey'] extends true ? S extends K ? never : S : never;
236
+ }[keyof Shape]
237
+ ] extends [never] ? K : never : never;
238
+ }[keyof Shape]>;
239
+ declare type DefaultSelectColumns<S extends ColumnsShapeBase> = {
240
+ [K in keyof S]: S[K]['data']['isHidden'] extends true ? never : K;
241
+ }[StringKey<keyof S>][];
184
242
  declare const setColumnData: <T extends ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>, K extends keyof T["data"]>(q: T, key: K, value: T["data"][K]) => T;
185
243
  declare const pushColumnData: <T extends ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>, K extends keyof T["data"]>(q: T, key: K, value: unknown) => T;
186
244
  declare type ColumnDataBase = {
@@ -503,42 +561,6 @@ declare type ToSqlOptions = {
503
561
  declare const toSql: (table: Query, options?: ToSqlOptions) => Sql;
504
562
  declare const makeSql: (table: Query, { values }?: ToSqlOptions) => Sql;
505
563
 
506
- declare function applyMixins(derivedCtor: any, constructors: any[]): void;
507
- declare const joinTruthy: (...strings: (string | false | undefined)[]) => string;
508
-
509
- declare type SomeIsTrue<T extends unknown[]> = T extends [
510
- infer Head,
511
- ...infer Tail
512
- ] ? Head extends true ? true : SomeIsTrue<Tail> : false;
513
- declare type MaybeArray<T> = T | T[];
514
- declare type SetOptional<T, K extends PropertyKey> = Omit<T, K> & {
515
- [P in K]?: P extends keyof T ? T[P] : never;
516
- };
517
- declare type OptionalPropertyNames<T> = {
518
- [K in keyof T]-?: {} extends {
519
- [P in K]: T[K];
520
- } ? K : never;
521
- }[keyof T];
522
- declare type SpreadProperties<L, R, K extends keyof L & keyof R> = {
523
- [P in K]: L[P] | Exclude<R[P], undefined>;
524
- };
525
- declare type Id<T> = T extends infer U ? {
526
- [K in keyof U]: U[K];
527
- } : never;
528
- declare type SpreadTwo<L, R> = Id<Pick<L, Exclude<keyof L, keyof R>> & Pick<R, Exclude<keyof R, OptionalPropertyNames<R>>> & Pick<R, Exclude<OptionalPropertyNames<R>, keyof L>> & SpreadProperties<L, R, OptionalPropertyNames<R> & keyof L>>;
529
- declare type Spread<A extends readonly [...any]> = A extends [
530
- infer L,
531
- ...infer R
532
- ] ? SpreadTwo<L, Spread<R>> : unknown;
533
- declare type SimpleSpread<A extends readonly [...any]> = A extends [
534
- infer L,
535
- ...infer R
536
- ] ? L & SimpleSpread<R> : {};
537
- declare type FilterTuple<T extends readonly any[], E> = T extends [
538
- infer F,
539
- ...infer R
540
- ] ? [F] extends [E] ? [F, ...FilterTuple<R, E>] : FilterTuple<R, E> : [];
541
- declare type CoalesceString<Left extends string | undefined, Right extends string> = Left extends undefined ? Right : Left;
542
564
  declare const getClonedQueryData: (query: QueryData) => QueryData;
543
565
  declare const getQueryAs: (q: {
544
566
  table?: string;
@@ -558,8 +580,7 @@ declare const singleQuoteArray: (arr: string[]) => string;
558
580
  declare const quoteObjectKey: (s: string) => string;
559
581
  declare const isObjectEmpty: (obj: object) => boolean;
560
582
  declare const EMPTY_OBJECT: {};
561
- declare type AliasOrTable<T extends Pick<Query, 'tableAlias' | 'table'>> = T['tableAlias'] extends string ? T['tableAlias'] : T['table'] extends string ? T['table'] : never;
562
- declare type StringKey<K extends PropertyKey> = Exclude<K, symbol | number>;
583
+ declare type AliasOrTable<T extends Pick<Query, 'table' | 'meta'>> = T['meta']['as'] extends string ? T['meta']['as'] : T['table'] extends string ? T['table'] : never;
563
584
  declare type Expression<T extends Query = Query, C extends ColumnTypeBase = ColumnTypeBase> = StringKey<keyof T['selectable']> | RawExpression<C>;
564
585
  declare type ExpressionOfType<T extends Query, C extends ColumnTypeBase, Type> = {
565
586
  [K in keyof T['selectable']]: ColumnOutput<T['selectable'][K]['column']> extends Type | null ? K : never;
@@ -569,7 +590,6 @@ declare type StringExpression<T extends Query, C extends ColumnType = ColumnType
569
590
  declare type BooleanExpression<T extends Query, C extends ColumnType = ColumnType> = ExpressionOfType<T, C, boolean>;
570
591
  declare type ExpressionOutput<T extends Query, Expr extends Expression<T>> = Expr extends keyof T['selectable'] ? T['selectable'][Expr]['column'] : Expr extends RawExpression<infer ColumnType> ? ColumnType : never;
571
592
 
572
- declare type ThenResult<Res> = (resolve?: (value: Res) => any, reject?: (error: any) => any) => Promise<Res | never>;
573
593
  declare const queryMethodByReturnType: Record<QueryReturnType, 'query' | 'arrays'>;
574
594
  declare type Resolve = (result: any) => any;
575
595
  declare type Reject = (error: any) => any;
@@ -640,6 +660,16 @@ declare class From {
640
660
  _from<T extends Query, Args extends FromArgs<T>>(this: T, ...args: Args): FromResult<T, Args>;
641
661
  }
642
662
 
663
+ declare type QueryMetaBase = {
664
+ as?: string;
665
+ hasSelect?: true;
666
+ hasWhere?: true;
667
+ };
668
+ declare type QueryBaseCommon = {
669
+ meta: QueryMetaBase;
670
+ };
671
+ declare type QueryCommon = QueryBaseCommon;
672
+
643
673
  declare type WhereArg<T extends QueryBase> = (Omit<{
644
674
  [K in keyof T['selectable']]?: T['selectable'][K]['column']['type'] | null | ColumnOperators<T['selectable'], K> | RawExpression;
645
675
  }, 'NOT' | 'OR' | 'IN' | 'EXISTS'> & {
@@ -660,7 +690,9 @@ declare type WhereInValues<T extends QueryBase, Column extends WhereInColumn<T>>
660
690
  } ? Column['length'] : never;
661
691
  })[] | Query | RawExpression;
662
692
  declare type WhereResult<T extends QueryBase> = T & {
663
- hasWhere: true;
693
+ meta: {
694
+ hasWhere: true;
695
+ };
664
696
  };
665
697
  declare type WhereInArg<T extends Pick<Query, 'selectable'>> = {
666
698
  [K in keyof T['selectable']]?: T['selectable'][K]['column']['type'][] | Query | RawExpression;
@@ -679,7 +711,7 @@ declare abstract class Where implements QueryBase {
679
711
  abstract baseQuery: Query;
680
712
  query: QueryData;
681
713
  table?: string;
682
- tableAlias?: string;
714
+ meta: QueryMetaBase;
683
715
  where<T extends Where>(this: T, ...args: WhereArg<T>[]): WhereResult<T>;
684
716
  _where<T extends Where>(this: T, ...args: WhereArg<T>[]): WhereResult<T>;
685
717
  whereNot<T extends Where>(this: T, ...args: WhereArg<T>[]): WhereResult<T>;
@@ -763,14 +795,13 @@ declare type JoinArgs<T extends QueryBase, Q extends Query = Query, R extends ke
763
795
  ];
764
796
  declare type JoinResult<T extends Query, Args extends JoinArgs<T>, A extends Query | keyof T['relations'] = Args[0]> = AddQueryJoinedTable<T, A extends Query ? A : T['relations'] extends Record<string, Relation> ? A extends keyof T['relations'] ? T['relations'][A]['table'] : A extends keyof T['withData'] ? T['withData'][A] extends WithDataItem ? {
765
797
  table: T['withData'][A]['table'];
766
- tableAlias: undefined;
767
798
  result: T['withData'][A]['shape'];
799
+ meta: EmptyObject;
768
800
  } : never : never : never>;
769
801
  declare type JoinCallbackArg<T extends QueryBase> = Query | keyof T['withData'] | keyof T['relations'];
770
802
  declare type JoinCallback<T extends QueryBase, Arg extends JoinCallbackArg<T>> = (q: OnQueryBuilder<T, Arg extends keyof T['withData'] ? T['withData'][Arg] extends WithDataItem ? {
771
803
  query: QueryData;
772
804
  table: T['withData'][Arg]['table'];
773
- tableAlias: undefined;
774
805
  clone(): QueryBase;
775
806
  selectable: {
776
807
  [K in keyof T['withData'][Arg]['shape'] as `${T['withData'][Arg]['table']}.${StringKey<K>}`]: {
@@ -782,11 +813,12 @@ declare type JoinCallback<T extends QueryBase, Arg extends JoinCallbackArg<T>> =
782
813
  baseQuery: Query;
783
814
  relations: RelationsBase;
784
815
  withData: WithDataBase;
816
+ meta: EmptyObject;
785
817
  } : never : Arg extends Query ? Arg : T['relations'] extends Record<string, Relation> ? Arg extends keyof T['relations'] ? T['relations'][Arg]['table'] : never : never>) => OnQueryBuilder;
786
818
  declare type JoinCallbackResult<T extends Query, Arg extends JoinCallbackArg<T>> = AddQueryJoinedTable<T, 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 ? {
787
819
  table: T['withData'][Arg]['table'];
788
- tableAlias: undefined;
789
820
  result: T['withData'][Arg]['shape'];
821
+ meta: EmptyObject;
790
822
  } : never : never : never>;
791
823
  declare class Join {
792
824
  join<T extends Query, Args extends JoinArgs<T>>(this: T, ...args: Args): JoinResult<T, Args>;
@@ -892,10 +924,16 @@ declare class UnhandledTypeError extends PormInternalError {
892
924
  constructor(value: never);
893
925
  }
894
926
 
895
- declare type DbBase<Adapter extends AdapterBase, Table extends string | undefined, Shape extends ColumnsShapeBase = Record<string, never>> = {
927
+ declare type DbBase<Adapter extends AdapterBase, Table extends string | undefined, Shape extends ColumnsShapeBase, CT extends ColumnTypesBase> = {
896
928
  adapter: Adapter;
897
929
  table: Table;
898
930
  columns: (keyof Shape)[];
931
+ columnTypes: CT;
932
+ shape: Shape;
933
+ singlePrimaryKey: SinglePrimaryKey<Shape>;
934
+ type: ColumnShapeOutput<Shape>;
935
+ inputType: ColumnShapeInput<Shape>;
936
+ result: Pick<Shape, DefaultSelectColumns<Shape>[number]>;
899
937
  };
900
938
 
901
939
  declare type NoPrimaryKeyOption = 'error' | 'warning' | 'ignore';
@@ -912,21 +950,13 @@ declare type DbTableOptions = {
912
950
  noPrimaryKey?: NoPrimaryKeyOption;
913
951
  } & QueryLogOptions;
914
952
  declare const anyShape: Record<string, ColumnType<unknown, BaseOperators, unknown>>;
915
- interface Db<Table extends string | undefined = undefined, Shape extends ColumnsShape = Record<string, never>, Relations extends Query['relations'] = Query['relations'], CT extends ColumnTypesBase = DefaultColumnTypes> extends DbBase<Adapter, Table, Shape>, QueryMethods {
953
+ interface Db<Table extends string | undefined = undefined, Shape extends ColumnsShape = Record<string, never>, Relations extends Query['relations'] = Query['relations'], CT extends ColumnTypesBase = DefaultColumnTypes> extends DbBase<Adapter, Table, Shape, CT>, QueryMethods {
916
954
  new (adapter: Adapter, queryBuilder: Db<Table, Shape, Relations, CT>, table?: Table, shape?: Shape, options?: DbTableOptions): this;
917
955
  queryBuilder: Db;
918
- columnTypes: CT;
919
956
  whereQueryBuilder: Query['whereQueryBuilder'];
920
957
  onQueryBuilder: Query['onQueryBuilder'];
921
- shape: Shape;
922
- singlePrimaryKey: SinglePrimaryKey<Shape>;
923
958
  primaryKeys: Query['primaryKeys'];
924
- type: ColumnShapeOutput<Shape>;
925
- inputType: ColumnShapeInput<Shape>;
926
959
  query: QueryData;
927
- result: Pick<Shape, DefaultSelectColumns<Shape>[number]>;
928
- hasSelect: Query['hasSelect'];
929
- hasWhere: boolean;
930
960
  selectable: {
931
961
  [K in keyof Shape]: {
932
962
  as: K;
@@ -940,7 +970,6 @@ interface Db<Table extends string | undefined = undefined, Shape extends Columns
940
970
  };
941
971
  returnType: Query['returnType'];
942
972
  then: ThenResult<Pick<ColumnShapeOutput<Shape>, DefaultSelectColumns<Shape>[number]>[]>;
943
- tableAlias: undefined;
944
973
  joinedTables: Query['joinedTables'];
945
974
  windows: Query['windows'];
946
975
  defaultSelectColumns: DefaultSelectColumns<Shape>;
@@ -1223,9 +1252,9 @@ declare type UpdateHasAndBelongsToManyData<Rel extends HasAndBelongsToManyRelati
1223
1252
  };
1224
1253
  create?: CreateData<Rel['nestedCreateQuery']>[];
1225
1254
  };
1226
- declare type UpdateArg<T extends Query> = T['hasWhere'] extends true ? UpdateData<T> : never;
1227
- declare type UpdateRawArg<T extends Query> = T['hasWhere'] extends true ? RawExpression : never;
1228
- declare type UpdateResult<T extends Query> = T['hasSelect'] extends true ? T : SetQueryReturnsRowCount<T>;
1255
+ declare type UpdateArg<T extends Query> = T['meta']['hasWhere'] extends true ? UpdateData<T> : never;
1256
+ declare type UpdateRawArg<T extends Query> = T['meta']['hasWhere'] extends true ? RawExpression : never;
1257
+ declare type UpdateResult<T extends Query> = T['meta']['hasSelect'] extends true ? T : SetQueryReturnsRowCount<T>;
1229
1258
  declare type ChangeCountArg<T extends Query> = keyof T['shape'] | Partial<Record<keyof T['shape'], number>>;
1230
1259
  declare type UpdateCtx = {
1231
1260
  willSetKeys?: true;
@@ -1248,8 +1277,8 @@ declare class Update {
1248
1277
  }
1249
1278
 
1250
1279
  declare type DeleteMethodsNames = 'del' | '_del' | 'delete' | '_delete';
1251
- declare type DeleteArgs<T extends Query> = T['hasWhere'] extends true ? [] : [never];
1252
- declare type DeleteResult<T extends Query> = T['hasSelect'] extends true ? T : SetQueryReturnsRowCount<T>;
1280
+ declare type DeleteArgs<T extends Query> = T['meta']['hasWhere'] extends true ? [] : [never];
1281
+ declare type DeleteResult<T extends Query> = T['meta']['hasSelect'] extends true ? T : SetQueryReturnsRowCount<T>;
1253
1282
  declare class Delete {
1254
1283
  del<T extends Query>(this: T, ..._args: DeleteArgs<T>): DeleteResult<T>;
1255
1284
  _del<T extends Query>(this: T, ..._args: DeleteArgs<T>): DeleteResult<T>;
@@ -1378,7 +1407,7 @@ declare type UpsertData<T extends Query> = {
1378
1407
  update: UpdateData<T>;
1379
1408
  create: CreateData<T>;
1380
1409
  };
1381
- declare type UpsertResult<T extends Query> = T['hasSelect'] extends true ? SetQueryReturnsOne<T> : SetQueryReturnsVoid<T>;
1410
+ declare type UpsertResult<T extends Query> = T['meta']['hasSelect'] extends true ? SetQueryReturnsOne<T> : SetQueryReturnsVoid<T>;
1382
1411
  declare type UpsertThis = WhereResult<Query> & {
1383
1412
  returnType: 'one' | 'oneOrThrow';
1384
1413
  };
@@ -1390,11 +1419,13 @@ declare class QueryUpsertOrCreate {
1390
1419
  }
1391
1420
 
1392
1421
  declare type MergeQuery<T extends Query, Q extends Query, ReturnType extends QueryReturnType = QueryReturnType extends Q['returnType'] ? T['returnType'] : Q['returnType']> = Omit<T, 'result' | 'returnType' | 'then'> & {
1393
- hasSelect: Q['hasSelect'] extends true ? true : T['hasSelect'];
1394
- hasWhere: Q['hasWhere'] extends true ? true : T['hasWhere'];
1395
- result: T['hasSelect'] extends true ? Spread<[T['result'], Q['result']]> : Q['result'];
1422
+ meta: {
1423
+ hasSelect: Q['meta']['hasSelect'];
1424
+ hasWhere: Q['meta']['hasWhere'];
1425
+ };
1426
+ result: T['meta']['hasSelect'] extends true ? Spread<[T['result'], Q['result']]> : Q['result'];
1396
1427
  returnType: ReturnType;
1397
- then: T['hasSelect'] extends true ? QueryThen<ReturnType, Spread<[T['result'], Q['result']]>> : QueryThen<ReturnType, Q['result']>;
1428
+ then: T['meta']['hasSelect'] extends true ? QueryThen<ReturnType, Spread<[T['result'], Q['result']]>> : QueryThen<ReturnType, Q['result']>;
1398
1429
  selectable: T['selectable'] & Q['selectable'];
1399
1430
  joinedTables: T['joinedTables'] & Q['joinedTables'];
1400
1431
  windows: T['windows'] & Q['windows'];
@@ -1457,8 +1488,8 @@ declare class QueryMethods {
1457
1488
  _findBy<T extends Query>(this: T, ...args: WhereArg<T>[]): SetQueryReturnsOne<WhereResult<T>>;
1458
1489
  findByOptional<T extends Query>(this: T, ...args: WhereArg<T>[]): SetQueryReturnsOneOptional<WhereResult<T>>;
1459
1490
  _findByOptional<T extends Query>(this: T, ...args: WhereArg<T>[]): SetQueryReturnsOneOptional<WhereResult<T>>;
1460
- as<T extends Query, TableAlias extends string>(this: T, as: TableAlias): SetQueryTableAlias<T, TableAlias>;
1461
- _as<T extends Query, TableAlias extends string>(this: T, as: TableAlias): SetQueryTableAlias<T, TableAlias>;
1491
+ as<T extends Query, As extends string>(this: T, as: As): SetQueryTableAlias<T, As>;
1492
+ _as<T extends Query, As extends string>(this: T, as: As): SetQueryTableAlias<T, As>;
1462
1493
  withSchema<T extends Query>(this: T, schema: string): T;
1463
1494
  _withSchema<T extends Query>(this: T, schema: string): T;
1464
1495
  group<T extends Query>(this: T, ...columns: Expression<T>[]): T;
@@ -1619,6 +1650,8 @@ declare class Aggregate {
1619
1650
  _selectStringAgg<T extends Query, As extends string | undefined = undefined>(this: T, arg: StringExpression<T>, delimiter: string, options?: AggregateOptions<T, As>): SelectAgg<T, 'string_agg', As, NullableColumn<StringColumn>>;
1620
1651
  }
1621
1652
 
1653
+ declare type ThenResult<Res> = (resolve?: (value: Res) => any, reject?: (error: any) => any) => Promise<Res | never>;
1654
+
1622
1655
  declare type ColumnParser = (input: unknown) => unknown;
1623
1656
  declare type ColumnsParsers = Record<string | getValueKey, ColumnParser>;
1624
1657
  declare type SelectableBase = Record<PropertyKey, {
@@ -1630,10 +1663,9 @@ declare type WithDataItem = {
1630
1663
  shape: ColumnsShape;
1631
1664
  };
1632
1665
  declare type WithDataBase = Record<never, WithDataItem>;
1633
- declare type QueryBase = {
1666
+ declare type QueryBase = QueryBaseCommon & {
1634
1667
  query: QueryData;
1635
1668
  table?: string;
1636
- tableAlias?: string;
1637
1669
  clone(): QueryBase;
1638
1670
  selectable: SelectableBase;
1639
1671
  shape: ColumnsShapeBase;
@@ -1643,7 +1675,7 @@ declare type QueryBase = {
1643
1675
  };
1644
1676
  declare type defaultsKey = typeof defaultsKey;
1645
1677
  declare const defaultsKey: unique symbol;
1646
- declare type Query = QueryMethods & {
1678
+ declare type Query = QueryCommon & QueryMethods & {
1647
1679
  queryBuilder: Db;
1648
1680
  columnTypes: ColumnTypesBase;
1649
1681
  whereQueryBuilder: typeof WhereQueryBuilder;
@@ -1656,13 +1688,10 @@ declare type Query = QueryMethods & {
1656
1688
  inputType: Record<string, unknown>;
1657
1689
  query: QueryData;
1658
1690
  result: ColumnsShape;
1659
- hasSelect: boolean;
1660
- hasWhere: boolean;
1661
1691
  selectable: SelectableBase;
1662
1692
  returnType: QueryReturnType;
1663
1693
  then: ThenResult<unknown>;
1664
- tableAlias: string | undefined;
1665
- joinedTables: Record<string, Pick<Query, 'result' | 'tableAlias' | 'table'>>;
1694
+ joinedTables: Record<string, Pick<Query, 'result' | 'table' | 'meta'>>;
1666
1695
  windows: EmptyObject;
1667
1696
  defaultSelectColumns: string[];
1668
1697
  relations: RelationsBase;
@@ -1675,14 +1704,11 @@ declare type Selectable<T extends QueryBase> = StringKey<keyof T['selectable']>;
1675
1704
  declare type QueryWithTable = Query & {
1676
1705
  table: string;
1677
1706
  };
1678
- declare type DefaultSelectColumns<S extends ColumnsShape> = {
1679
- [K in keyof S]: S[K]['data']['isHidden'] extends true ? never : K;
1680
- }[StringKey<keyof S>][];
1681
1707
  declare type QueryReturnType = 'all' | 'one' | 'oneOrThrow' | 'rows' | 'pluck' | 'value' | 'valueOrThrow' | 'rowCount' | 'void';
1682
1708
  declare const queryTypeWithLimitOne: Record<QueryReturnType, true | undefined>;
1683
1709
  declare const isQueryReturnsAll: (q: Query) => boolean;
1684
1710
  declare const isQueryReturnsMultipleRows: (q: Query) => true | undefined;
1685
- declare type JoinedTablesBase = Record<string, Pick<Query, 'result' | 'tableAlias' | 'table'>>;
1711
+ declare type JoinedTablesBase = Record<string, Pick<Query, 'result' | 'table' | 'meta'>>;
1686
1712
  declare type QueryReturnsAll<T extends QueryReturnType> = (QueryReturnType extends T ? 'all' : T) extends 'all' ? true : false;
1687
1713
  declare type QueryThen<ReturnType extends QueryReturnType, Result extends ColumnsShapeBase> = QueryReturnsAll<ReturnType> extends true ? ThenResult<ColumnShapeOutput<Result>[]> : ReturnType extends 'one' ? ThenResult<ColumnShapeOutput<Result> | undefined> : ReturnType extends 'oneOrThrow' ? ThenResult<ColumnShapeOutput<Result>> : ReturnType extends 'value' ? Result extends {
1688
1714
  value: ColumnType;
@@ -1691,16 +1717,20 @@ declare type QueryThen<ReturnType extends QueryReturnType, Result extends Column
1691
1717
  } ? ThenResult<Result['value']['type']> : never : ReturnType extends 'rows' ? ThenResult<ColumnShapeOutput<Result>[keyof Result][][]> : ReturnType extends 'pluck' ? Result extends {
1692
1718
  pluck: ColumnType;
1693
1719
  } ? ThenResult<Result['pluck']['type'][]> : never : ReturnType extends 'rowCount' ? ThenResult<number> : ReturnType extends 'void' ? ThenResult<void> : never;
1694
- declare type AddQuerySelect<T extends Pick<Query, 'hasSelect' | 'result' | 'then' | 'returnType'>, Result extends ColumnsShapeBase> = T['hasSelect'] extends true ? Omit<T, 'result' | 'then'> & {
1720
+ declare type AddQuerySelect<T extends Pick<Query, 'result' | 'then' | 'returnType' | 'meta'>, Result extends ColumnsShapeBase> = T['meta']['hasSelect'] extends true ? Omit<T, 'result' | 'then'> & {
1695
1721
  result: Spread<[T['result'], Result]>;
1696
1722
  then: QueryThen<T['returnType'], Spread<[T['result'], Result]>>;
1697
1723
  } : Omit<T, 'result' | 'then'> & {
1698
- hasSelect: true;
1724
+ meta: {
1725
+ hasSelect: true;
1726
+ };
1699
1727
  result: Result;
1700
1728
  then: QueryThen<T['returnType'], Result>;
1701
1729
  };
1702
- declare type QuerySelectAll<T extends Query> = Omit<T, 'hasSelect' | 'result' | 'then'> & {
1703
- hasSelect: true;
1730
+ declare type QuerySelectAll<T extends Query> = Omit<T, 'result' | 'then'> & {
1731
+ meta: {
1732
+ hasSelect: true;
1733
+ };
1704
1734
  result: T['shape'];
1705
1735
  then: QueryThen<T['returnType'], T['shape']>;
1706
1736
  };
@@ -1712,24 +1742,30 @@ declare type SetQueryReturnsAll<T extends Query> = SetQueryReturns<T, 'all'>;
1712
1742
  declare type SetQueryReturnsOneOptional<T extends Query> = SetQueryReturns<T, 'one'>;
1713
1743
  declare type SetQueryReturnsOne<T extends Query> = SetQueryReturns<T, 'oneOrThrow'>;
1714
1744
  declare type SetQueryReturnsRows<T extends Query> = SetQueryReturns<T, 'rows'>;
1715
- declare type SetQueryReturnsPluck<T extends Query, S extends keyof T['selectable'] | RawExpression, C extends ColumnTypeBase = S extends keyof T['selectable'] ? T['selectable'][S]['column'] : S extends RawExpression ? S['__column'] : never> = Omit<T, 'hasSelect' | 'result' | 'returnType' | 'then'> & {
1716
- hasSelect: true;
1745
+ declare type SetQueryReturnsPluck<T extends Query, S extends keyof T['selectable'] | RawExpression, C extends ColumnTypeBase = S extends keyof T['selectable'] ? T['selectable'][S]['column'] : S extends RawExpression ? S['__column'] : never> = Omit<T, 'result' | 'returnType' | 'then'> & {
1746
+ meta: {
1747
+ hasSelect: true;
1748
+ };
1717
1749
  result: {
1718
1750
  pluck: C;
1719
1751
  };
1720
1752
  returnType: 'pluck';
1721
1753
  then: ThenResult<C['type'][]>;
1722
1754
  };
1723
- declare type SetQueryReturnsValueOptional<T extends Query, Arg extends Exclude<GetArg<T>, RawExpression> | ColumnTypeBase, Column extends ColumnTypeBase = Arg extends ColumnTypeBase ? Arg : Arg extends keyof T['selectable'] ? T['selectable'][Arg]['column'] : Arg extends RelationQueryBase ? Arg['result']['value'] : never> = Omit<T, 'hasSelect' | 'result' | 'returnType' | 'then'> & {
1724
- hasSelect: true;
1755
+ declare type SetQueryReturnsValueOptional<T extends Query, Arg extends Exclude<GetArg<T>, RawExpression> | ColumnTypeBase, Column extends ColumnTypeBase = Arg extends ColumnTypeBase ? Arg : Arg extends keyof T['selectable'] ? T['selectable'][Arg]['column'] : Arg extends RelationQueryBase ? Arg['result']['value'] : never> = Omit<T, 'result' | 'returnType' | 'then'> & {
1756
+ meta: {
1757
+ hasSelect: true;
1758
+ };
1725
1759
  result: {
1726
1760
  value: Column;
1727
1761
  };
1728
1762
  returnType: 'value';
1729
1763
  then: ThenResult<Column['type'] | undefined>;
1730
1764
  };
1731
- declare type SetQueryReturnsValue<T extends Query, Arg extends Exclude<GetArg<T>, RawExpression> | ColumnTypeBase, Column extends ColumnTypeBase = Arg extends ColumnTypeBase ? Arg : Arg extends keyof T['selectable'] ? T['selectable'][Arg]['column'] : Arg extends RelationQueryBase ? Arg['result']['value'] : never> = Omit<T, 'hasSelect' | 'result' | 'returnType' | 'then'> & {
1732
- hasSelect: true;
1765
+ declare type SetQueryReturnsValue<T extends Query, Arg extends Exclude<GetArg<T>, RawExpression> | ColumnTypeBase, Column extends ColumnTypeBase = Arg extends ColumnTypeBase ? Arg : Arg extends keyof T['selectable'] ? T['selectable'][Arg]['column'] : Arg extends RelationQueryBase ? Arg['result']['value'] : never> = Omit<T, 'result' | 'returnType' | 'then'> & {
1766
+ meta: {
1767
+ hasSelect: true;
1768
+ };
1733
1769
  result: {
1734
1770
  value: Column;
1735
1771
  };
@@ -1745,10 +1781,12 @@ declare type SetQueryReturnsColumnInfo<T extends Query, Column extends keyof T['
1745
1781
  returnType: 'value';
1746
1782
  then: ThenResult<Result>;
1747
1783
  };
1748
- declare type SetQueryTableAlias<T extends Query, TableAlias extends string> = Omit<T, 'tableAlias' | 'selectable'> & {
1749
- tableAlias: TableAlias;
1784
+ declare type SetQueryTableAlias<T extends Query, As extends string> = Omit<T, 'selectable' | 'meta'> & {
1785
+ meta: Omit<T['meta'], 'as'> & {
1786
+ as: As;
1787
+ };
1750
1788
  selectable: Omit<T['selectable'], `${AliasOrTable<T>}.${StringKey<keyof T['shape']>}`> & {
1751
- [K in keyof T['shape'] as `${TableAlias}.${StringKey<keyof T['shape']>}`]: {
1789
+ [K in keyof T['shape'] as `${As}.${StringKey<keyof T['shape']>}`]: {
1752
1790
  as: K;
1753
1791
  column: T['shape'][K];
1754
1792
  };
@@ -1761,7 +1799,7 @@ declare type SetQueryJoinedTables<T extends Query, Selectable extends Record<str
1761
1799
  selectable: Selectable;
1762
1800
  joinedTables: JoinedTables;
1763
1801
  };
1764
- declare type AddQueryJoinedTable<T extends Query, J extends Pick<Query, 'result' | 'tableAlias' | 'table'>> = SetQueryJoinedTables<T, T['selectable'] & {
1802
+ declare type AddQueryJoinedTable<T extends Query, J extends Pick<Query, 'result' | 'table' | 'meta'>> = SetQueryJoinedTables<T, T['selectable'] & {
1765
1803
  [K in keyof J['result'] as `${AliasOrTable<J>}.${StringKey<K>}`]: {
1766
1804
  as: K;
1767
1805
  column: J['result'][K];
@@ -1918,11 +1956,11 @@ declare const Operators: {
1918
1956
  not: ((key: string, value: string | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query, values: unknown[]) => string) & {
1919
1957
  type: string | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query;
1920
1958
  };
1921
- in: ((key: string, value: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query, values: unknown[]) => string) & {
1922
- type: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query;
1959
+ in: ((key: string, value: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query, values: unknown[]) => string) & {
1960
+ type: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query;
1923
1961
  };
1924
- notIn: ((key: string, value: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query, values: unknown[]) => string) & {
1925
- type: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query;
1962
+ notIn: ((key: string, value: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query, values: unknown[]) => string) & {
1963
+ type: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query;
1926
1964
  };
1927
1965
  };
1928
1966
  json: {
@@ -2695,11 +2733,11 @@ declare abstract class TextBaseColumn extends ColumnType<string, typeof Operator
2695
2733
  not: ((key: string, value: string | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query, values: unknown[]) => string) & {
2696
2734
  type: string | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query;
2697
2735
  };
2698
- in: ((key: string, value: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query, values: unknown[]) => string) & {
2699
- type: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query;
2736
+ in: ((key: string, value: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query, values: unknown[]) => string) & {
2737
+ type: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query;
2700
2738
  };
2701
- notIn: ((key: string, value: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query, values: unknown[]) => string) & {
2702
- type: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query;
2739
+ notIn: ((key: string, value: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query, values: unknown[]) => string) & {
2740
+ type: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query;
2703
2741
  };
2704
2742
  };
2705
2743
  }
@@ -2745,11 +2783,11 @@ declare class TextColumn extends TextBaseColumn {
2745
2783
  not: ((key: string, value: string | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query, values: unknown[]) => string) & {
2746
2784
  type: string | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query;
2747
2785
  };
2748
- in: ((key: string, value: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query, values: unknown[]) => string) & {
2749
- type: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query;
2786
+ in: ((key: string, value: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query, values: unknown[]) => string) & {
2787
+ type: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query;
2750
2788
  };
2751
- notIn: ((key: string, value: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query, values: unknown[]) => string) & {
2752
- type: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query;
2789
+ notIn: ((key: string, value: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query, values: unknown[]) => string) & {
2790
+ type: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query;
2753
2791
  };
2754
2792
  };
2755
2793
  data: ColumnDataBase & {
@@ -2812,11 +2850,11 @@ declare class ByteaColumn extends ColumnType<Buffer, typeof Operators.text> {
2812
2850
  not: ((key: string, value: string | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query, values: unknown[]) => string) & {
2813
2851
  type: string | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query;
2814
2852
  };
2815
- in: ((key: string, value: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query, values: unknown[]) => string) & {
2816
- type: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query;
2853
+ in: ((key: string, value: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query, values: unknown[]) => string) & {
2854
+ type: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query;
2817
2855
  };
2818
- notIn: ((key: string, value: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query, values: unknown[]) => string) & {
2819
- type: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query;
2856
+ notIn: ((key: string, value: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query, values: unknown[]) => string) & {
2857
+ type: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query;
2820
2858
  };
2821
2859
  };
2822
2860
  toCode(t: string): Code;
@@ -2848,11 +2886,11 @@ declare class PointColumn extends ColumnType<string, typeof Operators.text> {
2848
2886
  not: ((key: string, value: string | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query, values: unknown[]) => string) & {
2849
2887
  type: string | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query;
2850
2888
  };
2851
- in: ((key: string, value: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query, values: unknown[]) => string) & {
2852
- type: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query;
2889
+ in: ((key: string, value: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query, values: unknown[]) => string) & {
2890
+ type: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query;
2853
2891
  };
2854
- notIn: ((key: string, value: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query, values: unknown[]) => string) & {
2855
- type: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query;
2892
+ notIn: ((key: string, value: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query, values: unknown[]) => string) & {
2893
+ type: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query;
2856
2894
  };
2857
2895
  };
2858
2896
  toCode(t: string): Code;
@@ -2884,11 +2922,11 @@ declare class LineColumn extends ColumnType<string, typeof Operators.text> {
2884
2922
  not: ((key: string, value: string | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query, values: unknown[]) => string) & {
2885
2923
  type: string | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query;
2886
2924
  };
2887
- in: ((key: string, value: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query, values: unknown[]) => string) & {
2888
- type: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query;
2925
+ in: ((key: string, value: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query, values: unknown[]) => string) & {
2926
+ type: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query;
2889
2927
  };
2890
- notIn: ((key: string, value: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query, values: unknown[]) => string) & {
2891
- type: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query;
2928
+ notIn: ((key: string, value: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query, values: unknown[]) => string) & {
2929
+ type: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query;
2892
2930
  };
2893
2931
  };
2894
2932
  toCode(t: string): Code;
@@ -2920,11 +2958,11 @@ declare class LsegColumn extends ColumnType<string, typeof Operators.text> {
2920
2958
  not: ((key: string, value: string | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query, values: unknown[]) => string) & {
2921
2959
  type: string | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query;
2922
2960
  };
2923
- in: ((key: string, value: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query, values: unknown[]) => string) & {
2924
- type: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query;
2961
+ in: ((key: string, value: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query, values: unknown[]) => string) & {
2962
+ type: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query;
2925
2963
  };
2926
- notIn: ((key: string, value: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query, values: unknown[]) => string) & {
2927
- type: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query;
2964
+ notIn: ((key: string, value: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query, values: unknown[]) => string) & {
2965
+ type: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query;
2928
2966
  };
2929
2967
  };
2930
2968
  toCode(t: string): Code;
@@ -2956,11 +2994,11 @@ declare class BoxColumn extends ColumnType<string, typeof Operators.text> {
2956
2994
  not: ((key: string, value: string | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query, values: unknown[]) => string) & {
2957
2995
  type: string | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query;
2958
2996
  };
2959
- in: ((key: string, value: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query, values: unknown[]) => string) & {
2960
- type: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query;
2997
+ in: ((key: string, value: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query, values: unknown[]) => string) & {
2998
+ type: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query;
2961
2999
  };
2962
- notIn: ((key: string, value: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query, values: unknown[]) => string) & {
2963
- type: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query;
3000
+ notIn: ((key: string, value: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query, values: unknown[]) => string) & {
3001
+ type: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query;
2964
3002
  };
2965
3003
  };
2966
3004
  toCode(t: string): Code;
@@ -2992,11 +3030,11 @@ declare class PathColumn extends ColumnType<string, typeof Operators.text> {
2992
3030
  not: ((key: string, value: string | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query, values: unknown[]) => string) & {
2993
3031
  type: string | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query;
2994
3032
  };
2995
- in: ((key: string, value: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query, values: unknown[]) => string) & {
2996
- type: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query;
3033
+ in: ((key: string, value: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query, values: unknown[]) => string) & {
3034
+ type: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query;
2997
3035
  };
2998
- notIn: ((key: string, value: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query, values: unknown[]) => string) & {
2999
- type: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query;
3036
+ notIn: ((key: string, value: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query, values: unknown[]) => string) & {
3037
+ type: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query;
3000
3038
  };
3001
3039
  };
3002
3040
  toCode(t: string): Code;
@@ -3028,11 +3066,11 @@ declare class PolygonColumn extends ColumnType<string, typeof Operators.text> {
3028
3066
  not: ((key: string, value: string | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query, values: unknown[]) => string) & {
3029
3067
  type: string | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query;
3030
3068
  };
3031
- in: ((key: string, value: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query, values: unknown[]) => string) & {
3032
- type: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query;
3069
+ in: ((key: string, value: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query, values: unknown[]) => string) & {
3070
+ type: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query;
3033
3071
  };
3034
- notIn: ((key: string, value: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query, values: unknown[]) => string) & {
3035
- type: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query;
3072
+ notIn: ((key: string, value: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query, values: unknown[]) => string) & {
3073
+ type: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query;
3036
3074
  };
3037
3075
  };
3038
3076
  toCode(t: string): Code;
@@ -3064,11 +3102,11 @@ declare class CircleColumn extends ColumnType<string, typeof Operators.text> {
3064
3102
  not: ((key: string, value: string | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query, values: unknown[]) => string) & {
3065
3103
  type: string | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query;
3066
3104
  };
3067
- in: ((key: string, value: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query, values: unknown[]) => string) & {
3068
- type: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query;
3105
+ in: ((key: string, value: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query, values: unknown[]) => string) & {
3106
+ type: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query;
3069
3107
  };
3070
- notIn: ((key: string, value: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query, values: unknown[]) => string) & {
3071
- type: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query;
3108
+ notIn: ((key: string, value: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query, values: unknown[]) => string) & {
3109
+ type: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query;
3072
3110
  };
3073
3111
  };
3074
3112
  toCode(t: string): Code;
@@ -3107,11 +3145,11 @@ declare class CidrColumn extends ColumnType<string, typeof Operators.text> {
3107
3145
  not: ((key: string, value: string | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query, values: unknown[]) => string) & {
3108
3146
  type: string | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query;
3109
3147
  };
3110
- in: ((key: string, value: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query, values: unknown[]) => string) & {
3111
- type: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query;
3148
+ in: ((key: string, value: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query, values: unknown[]) => string) & {
3149
+ type: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query;
3112
3150
  };
3113
- notIn: ((key: string, value: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query, values: unknown[]) => string) & {
3114
- type: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query;
3151
+ notIn: ((key: string, value: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query, values: unknown[]) => string) & {
3152
+ type: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query;
3115
3153
  };
3116
3154
  };
3117
3155
  toCode(t: string): Code;
@@ -3143,11 +3181,11 @@ declare class InetColumn extends ColumnType<string, typeof Operators.text> {
3143
3181
  not: ((key: string, value: string | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query, values: unknown[]) => string) & {
3144
3182
  type: string | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query;
3145
3183
  };
3146
- in: ((key: string, value: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query, values: unknown[]) => string) & {
3147
- type: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query;
3184
+ in: ((key: string, value: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query, values: unknown[]) => string) & {
3185
+ type: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query;
3148
3186
  };
3149
- notIn: ((key: string, value: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query, values: unknown[]) => string) & {
3150
- type: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query;
3187
+ notIn: ((key: string, value: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query, values: unknown[]) => string) & {
3188
+ type: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query;
3151
3189
  };
3152
3190
  };
3153
3191
  toCode(t: string): Code;
@@ -3179,11 +3217,11 @@ declare class MacAddrColumn extends ColumnType<string, typeof Operators.text> {
3179
3217
  not: ((key: string, value: string | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query, values: unknown[]) => string) & {
3180
3218
  type: string | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query;
3181
3219
  };
3182
- in: ((key: string, value: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query, values: unknown[]) => string) & {
3183
- type: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query;
3220
+ in: ((key: string, value: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query, values: unknown[]) => string) & {
3221
+ type: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query;
3184
3222
  };
3185
- notIn: ((key: string, value: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query, values: unknown[]) => string) & {
3186
- type: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query;
3223
+ notIn: ((key: string, value: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query, values: unknown[]) => string) & {
3224
+ type: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query;
3187
3225
  };
3188
3226
  };
3189
3227
  toCode(t: string): Code;
@@ -3215,11 +3253,11 @@ declare class MacAddr8Column extends ColumnType<string, typeof Operators.text> {
3215
3253
  not: ((key: string, value: string | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query, values: unknown[]) => string) & {
3216
3254
  type: string | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query;
3217
3255
  };
3218
- in: ((key: string, value: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query, values: unknown[]) => string) & {
3219
- type: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query;
3256
+ in: ((key: string, value: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query, values: unknown[]) => string) & {
3257
+ type: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query;
3220
3258
  };
3221
- notIn: ((key: string, value: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query, values: unknown[]) => string) & {
3222
- type: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query;
3259
+ notIn: ((key: string, value: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query, values: unknown[]) => string) & {
3260
+ type: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query;
3223
3261
  };
3224
3262
  };
3225
3263
  toCode(t: string): Code;
@@ -3251,11 +3289,11 @@ declare class BitColumn<Length extends number> extends ColumnType<string, typeof
3251
3289
  not: ((key: string, value: string | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query, values: unknown[]) => string) & {
3252
3290
  type: string | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query;
3253
3291
  };
3254
- in: ((key: string, value: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query, values: unknown[]) => string) & {
3255
- type: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query;
3292
+ in: ((key: string, value: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query, values: unknown[]) => string) & {
3293
+ type: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query;
3256
3294
  };
3257
- notIn: ((key: string, value: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query, values: unknown[]) => string) & {
3258
- type: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query;
3295
+ notIn: ((key: string, value: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query, values: unknown[]) => string) & {
3296
+ type: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query;
3259
3297
  };
3260
3298
  };
3261
3299
  data: ColumnData & {
@@ -3292,11 +3330,11 @@ declare class BitVaryingColumn<Length extends number | undefined = undefined> ex
3292
3330
  not: ((key: string, value: string | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query, values: unknown[]) => string) & {
3293
3331
  type: string | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query;
3294
3332
  };
3295
- in: ((key: string, value: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query, values: unknown[]) => string) & {
3296
- type: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query;
3333
+ in: ((key: string, value: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query, values: unknown[]) => string) & {
3334
+ type: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query;
3297
3335
  };
3298
- notIn: ((key: string, value: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query, values: unknown[]) => string) & {
3299
- type: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query;
3336
+ notIn: ((key: string, value: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query, values: unknown[]) => string) & {
3337
+ type: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query;
3300
3338
  };
3301
3339
  };
3302
3340
  data: ColumnData & {
@@ -3333,11 +3371,11 @@ declare class TsVectorColumn extends ColumnType<string, typeof Operators.text> {
3333
3371
  not: ((key: string, value: string | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query, values: unknown[]) => string) & {
3334
3372
  type: string | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query;
3335
3373
  };
3336
- in: ((key: string, value: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query, values: unknown[]) => string) & {
3337
- type: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query;
3374
+ in: ((key: string, value: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query, values: unknown[]) => string) & {
3375
+ type: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query;
3338
3376
  };
3339
- notIn: ((key: string, value: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query, values: unknown[]) => string) & {
3340
- type: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query;
3377
+ notIn: ((key: string, value: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query, values: unknown[]) => string) & {
3378
+ type: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query;
3341
3379
  };
3342
3380
  };
3343
3381
  toCode(t: string): Code;
@@ -3369,11 +3407,11 @@ declare class TsQueryColumn extends ColumnType<string, typeof Operators.text> {
3369
3407
  not: ((key: string, value: string | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query, values: unknown[]) => string) & {
3370
3408
  type: string | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query;
3371
3409
  };
3372
- in: ((key: string, value: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query, values: unknown[]) => string) & {
3373
- type: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query;
3410
+ in: ((key: string, value: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query, values: unknown[]) => string) & {
3411
+ type: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query;
3374
3412
  };
3375
- notIn: ((key: string, value: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query, values: unknown[]) => string) & {
3376
- type: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query;
3413
+ notIn: ((key: string, value: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query, values: unknown[]) => string) & {
3414
+ type: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query;
3377
3415
  };
3378
3416
  };
3379
3417
  toCode(t: string): Code;
@@ -3405,11 +3443,11 @@ declare class UUIDColumn extends ColumnType<string, typeof Operators.text> {
3405
3443
  not: ((key: string, value: string | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query, values: unknown[]) => string) & {
3406
3444
  type: string | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query;
3407
3445
  };
3408
- in: ((key: string, value: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query, values: unknown[]) => string) & {
3409
- type: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query;
3446
+ in: ((key: string, value: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query, values: unknown[]) => string) & {
3447
+ type: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query;
3410
3448
  };
3411
- notIn: ((key: string, value: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query, values: unknown[]) => string) & {
3412
- type: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query;
3449
+ notIn: ((key: string, value: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query, values: unknown[]) => string) & {
3450
+ type: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query;
3413
3451
  };
3414
3452
  };
3415
3453
  toCode(t: string): Code;
@@ -3441,11 +3479,11 @@ declare class XMLColumn extends ColumnType<string, typeof Operators.text> {
3441
3479
  not: ((key: string, value: string | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query, values: unknown[]) => string) & {
3442
3480
  type: string | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query;
3443
3481
  };
3444
- in: ((key: string, value: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query, values: unknown[]) => string) & {
3445
- type: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query;
3482
+ in: ((key: string, value: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query, values: unknown[]) => string) & {
3483
+ type: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query;
3446
3484
  };
3447
- notIn: ((key: string, value: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query, values: unknown[]) => string) & {
3448
- type: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query;
3485
+ notIn: ((key: string, value: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query, values: unknown[]) => string) & {
3486
+ type: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query;
3449
3487
  };
3450
3488
  };
3451
3489
  toCode(t: string): Code;
@@ -4102,26 +4140,17 @@ declare class JSONTextColumn extends ColumnType<string, typeof Operators.text> {
4102
4140
  not: ((key: string, value: string | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query, values: unknown[]) => string) & {
4103
4141
  type: string | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query;
4104
4142
  };
4105
- in: ((key: string, value: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query, values: unknown[]) => string) & {
4106
- type: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query;
4143
+ in: ((key: string, value: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query, values: unknown[]) => string) & {
4144
+ type: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query;
4107
4145
  };
4108
- notIn: ((key: string, value: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query, values: unknown[]) => string) & {
4109
- type: RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | string[] | Query;
4146
+ notIn: ((key: string, value: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query, values: unknown[]) => string) & {
4147
+ type: string[] | RawExpression<ColumnTypeBase<unknown, BaseOperators, unknown, ColumnDataBase>> | Query;
4110
4148
  };
4111
4149
  };
4112
4150
  toCode(t: string): Code;
4113
4151
  }
4114
4152
 
4115
4153
  declare type ColumnsShape = Record<string, ColumnType>;
4116
- declare type OptionalColumnsForInput<Shape extends ColumnsShape> = {
4117
- [K in keyof Shape]: SomeIsTrue<[
4118
- Shape[K]['data']['isNullable'],
4119
- undefined extends Shape[K]['data']['default'] ? false : true
4120
- ]> extends true ? K : never;
4121
- }[keyof Shape];
4122
- declare type ColumnShapeInput<Shape extends ColumnsShape> = SetOptional<{
4123
- [K in keyof Shape]: ColumnInput<Shape[K]>;
4124
- }, OptionalColumnsForInput<Shape>>;
4125
4154
  declare abstract class ColumnsObject<Shape extends ColumnsShape> extends ColumnType<{
4126
4155
  [K in keyof Shape]: Shape[K]['type'];
4127
4156
  }, typeof Operators.any> {
@@ -4166,13 +4195,6 @@ declare abstract class ArrayOfColumnsObjects<Shape extends ColumnsShape> extends
4166
4195
  }
4167
4196
  declare abstract class PluckResultColumnType<C extends ColumnType> extends ColumnType<C['type'][], typeof Operators.any> {
4168
4197
  }
4169
- declare type SinglePrimaryKey<Shape extends ColumnsShape> = StringKey<{
4170
- [K in keyof Shape]: Shape[K]['data']['isPrimaryKey'] extends true ? [
4171
- {
4172
- [S in keyof Shape]: Shape[S]['data']['isPrimaryKey'] extends true ? S extends K ? never : S : never;
4173
- }[keyof Shape]
4174
- ] extends [never] ? K : never : never;
4175
- }[keyof Shape]>;
4176
4198
 
4177
4199
  declare type ColumnData = ColumnDataBase & {
4178
4200
  maxChars?: number;