pqb 0.42.1 → 0.42.2
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 +28 -30
- package/dist/index.js.map +1 -1
- package/dist/index.mjs.map +1 -1
- package/package.json +2 -2
package/dist/index.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { PoolConfig, Pool, PoolClient } from 'pg';
|
|
2
2
|
import * as orchid_core from 'orchid-core';
|
|
3
|
-
import { QueryResultRow, AdapterConfigBase, AdapterBase, QueryInput, SingleSqlItem, Sql, IsQuery, RecordUnknown, Expression, MaybeArray, TemplateLiteralArgs, EmptyObject, QueryColumns, QueryColumn, MaybePromise, FnUnknownToUnknown, QueryMetaBase, QueryReturnType, RecordString, ColumnsShapeBase, ColumnsParsers, PickQueryTable, BatchParsers, HookSelect, QueryLogObject, QueryLogger, QueryDataTransform, ExpressionChain, PickQueryShape, ColumnSchemaConfig, RawSQLBase, RawSQLValues, ExpressionTypeMethod, DynamicSQLArg, ExpressionData, StaticSQLArgs, SQLQueryArgs, PickQueryTableMetaResult, EmptyTuple, PickQueryMeta, PickQueryMetaResultReturnType, QueryColumnToNullable,
|
|
3
|
+
import { QueryResultRow, AdapterConfigBase, AdapterBase, QueryInput, SingleSqlItem, Sql, IsQuery, RecordUnknown, Expression, MaybeArray, TemplateLiteralArgs, EmptyObject, QueryColumns, QueryColumn, MaybePromise, FnUnknownToUnknown, QueryMetaBase, QueryReturnType, RecordString, ColumnsShapeBase, ColumnsParsers, PickQueryTable, BatchParsers, HookSelect, QueryLogObject, QueryLogger, QueryDataTransform, ExpressionChain, PickQueryShape, ColumnSchemaConfig, RawSQLBase, RawSQLValues, ExpressionTypeMethod, DynamicSQLArg, ExpressionData, StaticSQLArgs, SQLQueryArgs, PickQueryTableMetaResult, EmptyTuple, PickQueryMeta, PickQueryMetaResultReturnType, QueryColumnToNullable, QueryThenByQuery, SelectableBase, PickQueryMetaShape, PickQueryTableMetaResultShape, PickQueryMetaResultWindows, PickOutputTypeAndOperators, PickQueryResult, ValExpression, PickOutputType, QueryThen, DateColumnData, ColumnToCodeCtx, Code, TimeInterval, ColumnTypeSchemaArg, ColumnDataBase, ArrayMethodsData, ForeignKeyTable, ColumnNameOfTable, BaseNumberData, PickColumnBaseData, ColumnWithDefault, StringTypeData, PrimaryKeyColumn, ColumnTypeBase, ParseColumn, ParseNullColumn, EncodeColumn, QueryColumnsInit, QueryLogOptions, DefaultSelectColumns, DefaultSelectOutput, ColumnShapeInput, QueryThenShallowSimplifyArr, QueryCatch, TransactionState, QueryColumnOfDataType, PickQueryUniqueProperties, PickQueryMetaResult, PickQueryTableMetaResultInputType, getValueKey, QueryThenByReturnType, PickQueryReturnType, PickQueryResultUniqueColumns, QueryInternalBase, PickType, RecordKeyTrue, ColumnShapeOutput, QueryThenShallowSimplifyOptional, QueryThenShallowSimplify, OperatorsNullable, PickQueryMetaReturnType, UniqueColumn, TimestampHelpers, ShallowSimplify, Codes, ColumnDataCheckBase } from 'orchid-core';
|
|
4
4
|
import { inspect } from 'node:util';
|
|
5
5
|
import { AsyncLocalStorage } from 'node:async_hooks';
|
|
6
6
|
|
|
@@ -667,9 +667,9 @@ type JoinResult<T extends PickQueryMetaResultReturnType, JoinedSelectable, Requi
|
|
|
667
667
|
} & JoinedSelectable : T['meta'][K];
|
|
668
668
|
} : K extends 'result' ? {
|
|
669
669
|
[K in keyof T['result']]: QueryColumnToNullable<T['result'][K]>;
|
|
670
|
-
} : K extends 'then' ?
|
|
670
|
+
} : K extends 'then' ? QueryThenByQuery<T, {
|
|
671
671
|
[K in keyof T['result']]: QueryColumnToNullable<T['result'][K]>;
|
|
672
|
-
}
|
|
672
|
+
}> : T[K];
|
|
673
673
|
};
|
|
674
674
|
/**
|
|
675
675
|
* Calls {@link JoinResult} with either callback result, if join has a callback,
|
|
@@ -3322,7 +3322,7 @@ type DbTableOptionScopes<Table extends string | undefined, Shape extends QueryCo
|
|
|
3322
3322
|
};
|
|
3323
3323
|
type QueryDefaultReturnData<Shape extends QueryColumnsInit> = {
|
|
3324
3324
|
[K in DefaultSelectColumns<Shape>]: Shape[K]['outputType'];
|
|
3325
|
-
}
|
|
3325
|
+
};
|
|
3326
3326
|
interface TableMeta<Table extends string | undefined, Shape extends QueryColumnsInit, ShapeWithComputed extends QueryColumnsInit, Scopes extends RecordUnknown | undefined> extends QueryMetaBase<{
|
|
3327
3327
|
[K in keyof Scopes]: true;
|
|
3328
3328
|
}> {
|
|
@@ -3348,7 +3348,7 @@ declare class Db<Table extends string | undefined = undefined, Shape extends Que
|
|
|
3348
3348
|
inputType: ColumnShapeInput<Shape>;
|
|
3349
3349
|
result: Pick<Shape, DefaultSelectColumns<Shape>>;
|
|
3350
3350
|
returnType: undefined;
|
|
3351
|
-
then:
|
|
3351
|
+
then: QueryThenShallowSimplifyArr<QueryDefaultReturnData<Shape>>;
|
|
3352
3352
|
windows: EmptyObject;
|
|
3353
3353
|
relations: EmptyObject;
|
|
3354
3354
|
withData: EmptyObject;
|
|
@@ -4742,11 +4742,11 @@ type UnionToIntersection<U> = (U extends any ? (x: U) => void : never) extends (
|
|
|
4742
4742
|
type FromResult<T extends FromQuerySelf, Arg extends MaybeArray<FromArg<T>>> = Arg extends string ? T['withData'] extends WithDataItems ? {
|
|
4743
4743
|
[K in keyof T]: K extends 'meta' ? {
|
|
4744
4744
|
[K in keyof T['meta']]: K extends 'as' ? string | undefined : K extends 'selectable' ? SelectableFromShape<T['withData'][Arg]['shape'], Arg> : K extends 'kind' ? 'select' : T['meta'][K];
|
|
4745
|
-
} : K extends 'result' ? T['withData'][Arg]['shape'] : K extends 'then' ?
|
|
4745
|
+
} : K extends 'result' ? T['withData'][Arg]['shape'] : K extends 'then' ? QueryThenByQuery<T, T['withData'][Arg]['shape']> : T[K];
|
|
4746
4746
|
} : SetQueryTableAlias<T, Arg> : Arg extends PickQueryTableMetaResultInputType ? {
|
|
4747
4747
|
[K in keyof T]: K extends 'meta' ? {
|
|
4748
4748
|
[K in keyof T['meta']]: K extends 'as' ? AliasOrTable<Arg> : K extends 'selectable' ? SelectableFromShape<Arg['result'], AliasOrTable<Arg>> : K extends 'kind' ? 'select' : K extends 'defaultSelect' ? keyof Arg['result'] : T['meta'][K];
|
|
4749
|
-
} : K extends 'result' ? Arg['result'] : K extends 'shape' ? Arg['result'] : K extends 'inputType' ? Arg['inputType'] : K extends 'then' ?
|
|
4749
|
+
} : K extends 'result' ? Arg['result'] : K extends 'shape' ? Arg['result'] : K extends 'inputType' ? Arg['inputType'] : K extends 'then' ? QueryThenByQuery<T, Arg['result']> : T[K];
|
|
4750
4750
|
} : Arg extends (infer A)[] ? {
|
|
4751
4751
|
[K in keyof T]: K extends 'meta' ? {
|
|
4752
4752
|
[K in keyof T['meta']]: K extends 'selectable' ? UnionToIntersection<A extends string ? T['withData'] extends WithDataItems ? {
|
|
@@ -5312,7 +5312,7 @@ declare class QueryLog {
|
|
|
5312
5312
|
type MergeQuery<T extends PickQueryMetaResultReturnTypeWithDataWindows, Q extends PickQueryMetaResultReturnTypeWithDataWindows> = {
|
|
5313
5313
|
[K in keyof T]: K extends 'meta' ? {
|
|
5314
5314
|
[K in keyof T['meta'] | keyof Q['meta']]: K extends 'selectable' ? Q['meta']['selectable'] & Omit<T['meta']['selectable'], keyof Q['meta']['selectable']> : K extends 'hasWhere' | 'hasSelect' ? T['meta'][K] & Q['meta'][K] : K extends keyof Q['meta'] ? Q['meta'][K] : T['meta'][K];
|
|
5315
|
-
} : K extends 'result' ? MergeQueryResult<T, Q> : K extends 'returnType' ? Q['returnType'] extends undefined ? T['returnType'] : Q['returnType'] : K extends 'then' ?
|
|
5315
|
+
} : K extends 'result' ? MergeQueryResult<T, Q> : K extends 'returnType' ? Q['returnType'] extends undefined ? T['returnType'] : Q['returnType'] : K extends 'then' ? QueryThenByQuery<Q['returnType'] extends undefined ? T : Q, MergeQueryResult<T, Q>> : K extends 'windows' ? Q['windows'] & Omit<T['windows'], keyof Q['windows']> : K extends 'withData' ? Q['withData'] & Omit<T['withData'], keyof Q['withData']> : T[K];
|
|
5316
5316
|
};
|
|
5317
5317
|
type MergeQueryResult<T extends PickQueryMetaResult, Q extends PickQueryMetaResult> = T['meta']['hasSelect'] extends true ? Q['meta']['hasSelect'] extends true ? {
|
|
5318
5318
|
[K in keyof T['result'] | keyof Q['result']]: K extends keyof Q['result'] ? Q['result'][K] : T['result'][K];
|
|
@@ -5349,11 +5349,11 @@ type SelectResult<T extends SelectSelf, Columns extends PropertyKey[]> = {
|
|
|
5349
5349
|
[K in Columns[number] | T['meta']['defaultSelect'] as K extends '*' ? never : T['meta']['selectable'][K]['as']]: T['meta']['selectable'][K]['column'];
|
|
5350
5350
|
} : {
|
|
5351
5351
|
[K in Columns[number] as T['meta']['selectable'][K]['as']]: T['meta']['selectable'][K]['column'];
|
|
5352
|
-
}) & (T['meta']['hasSelect'] extends (T['returnType'] extends 'value' | 'valueOrThrow' ? never : true) ? Omit<T['result'], Columns[number]> : unknown) : K extends 'returnType' ? SelectReturnType<T> : K extends 'then' ?
|
|
5352
|
+
}) & (T['meta']['hasSelect'] extends (T['returnType'] extends 'value' | 'valueOrThrow' ? never : true) ? Omit<T['result'], Columns[number]> : unknown) : K extends 'returnType' ? SelectReturnType<T> : K extends 'then' ? QueryThenByReturnType<SelectReturnType<T>, ('*' extends Columns[number] ? {
|
|
5353
5353
|
[K in Exclude<Columns[number], '*'> | T['meta']['defaultSelect'] as T['meta']['selectable'][K]['as']]: T['meta']['selectable'][K]['column'];
|
|
5354
5354
|
} : {
|
|
5355
5355
|
[K in Columns[number] as T['meta']['selectable'][K]['as']]: T['meta']['selectable'][K]['column'];
|
|
5356
|
-
}) & (T['meta']['hasSelect'] extends (T['returnType'] extends 'value' | 'valueOrThrow' ? never : true) ? Omit<T['result'], Columns[number]> : unknown)
|
|
5356
|
+
}) & (T['meta']['hasSelect'] extends (T['returnType'] extends 'value' | 'valueOrThrow' ? never : true) ? Omit<T['result'], Columns[number]> : unknown)> : T[K];
|
|
5357
5357
|
} & QueryMetaHasSelect;
|
|
5358
5358
|
type SelectResultObj<T extends SelectSelf, Obj> = Obj extends SelectAsCheckReturnTypes ? {
|
|
5359
5359
|
[K in keyof T]: K extends 'meta' ? T['meta'] & {
|
|
@@ -5361,9 +5361,9 @@ type SelectResultObj<T extends SelectSelf, Obj> = Obj extends SelectAsCheckRetur
|
|
|
5361
5361
|
selectable: SelectAsSelectable<Obj>;
|
|
5362
5362
|
} : K extends 'result' ? {
|
|
5363
5363
|
[K in T['meta']['hasSelect'] extends (T['returnType'] extends 'value' | 'valueOrThrow' ? never : true) ? keyof Obj | keyof T['result'] : keyof Obj]: K extends keyof Obj ? SelectAsValueResult<T, Obj[K]> : K extends keyof T['result'] ? T['result'][K] : never;
|
|
5364
|
-
} : K extends 'returnType' ? SelectReturnType<T> : K extends 'then' ?
|
|
5364
|
+
} : K extends 'returnType' ? SelectReturnType<T> : K extends 'then' ? QueryThenByReturnType<SelectReturnType<T>, {
|
|
5365
5365
|
[K in T['meta']['hasSelect'] extends (T['returnType'] extends 'value' | 'valueOrThrow' ? never : true) ? keyof Obj | keyof T['result'] : keyof Obj]: K extends keyof Obj ? SelectAsValueResult<T, Obj[K]> : K extends keyof T['result'] ? T['result'][K] : never;
|
|
5366
|
-
}
|
|
5366
|
+
}> : T[K];
|
|
5367
5367
|
} : `Invalid return type of ${{
|
|
5368
5368
|
[K in keyof Obj]: Obj[K] extends (...args: any[]) => any ? ReturnType<Obj[K]> extends SelectAsFnReturnType ? never : K : never;
|
|
5369
5369
|
}[keyof Obj] & string}`;
|
|
@@ -5374,9 +5374,9 @@ type SelectResultColumnsAndObj<T extends SelectSelf, Columns extends PropertyKey
|
|
|
5374
5374
|
} : K extends 'result' ? // Combine previously selected items, all columns if * was provided,
|
|
5375
5375
|
{
|
|
5376
5376
|
[K in ('*' extends Columns[number] ? Exclude<Columns[number], '*'> | T['meta']['defaultSelect'] : Columns[number]) | keyof Obj as K extends Columns[number] ? T['meta']['selectable'][K]['as'] : K]: K extends keyof Obj ? SelectAsValueResult<T, Obj[K]> : T['meta']['selectable'][K]['column'];
|
|
5377
|
-
} & (T['meta']['hasSelect'] extends (T['returnType'] extends 'value' | 'valueOrThrow' ? never : true) ? Omit<T['result'], Columns[number]> : unknown) : K extends 'returnType' ? SelectReturnType<T> : K extends 'then' ?
|
|
5377
|
+
} & (T['meta']['hasSelect'] extends (T['returnType'] extends 'value' | 'valueOrThrow' ? never : true) ? Omit<T['result'], Columns[number]> : unknown) : K extends 'returnType' ? SelectReturnType<T> : K extends 'then' ? QueryThenByReturnType<SelectReturnType<T>, {
|
|
5378
5378
|
[K in ('*' extends Columns[number] ? Exclude<Columns[number], '*'> | T['meta']['defaultSelect'] : Columns[number]) | keyof Obj as K extends Columns[number] ? T['meta']['selectable'][K]['as'] : K]: K extends keyof Obj ? SelectAsValueResult<T, Obj[K]> : T['meta']['selectable'][K]['column'];
|
|
5379
|
-
} & (T['meta']['hasSelect'] extends (T['returnType'] extends 'value' | 'valueOrThrow' ? never : true) ? Omit<T['result'], Columns[number]> : unknown)
|
|
5379
|
+
} & (T['meta']['hasSelect'] extends (T['returnType'] extends 'value' | 'valueOrThrow' ? never : true) ? Omit<T['result'], Columns[number]> : unknown)> : T[K];
|
|
5380
5380
|
};
|
|
5381
5381
|
type SelectAsSelectable<Arg> = {
|
|
5382
5382
|
[K in keyof Arg]: Arg[K] extends (q: never) => {
|
|
@@ -7511,7 +7511,7 @@ declare class QueryMethods<ColumnTypes> {
|
|
|
7511
7511
|
* ```
|
|
7512
7512
|
*/
|
|
7513
7513
|
narrowType<T extends PickQueryMetaResultReturnType>(this: T): <Narrow>() => {
|
|
7514
|
-
[K in keyof T]: K extends 'result' ? NarrowTypeResult<T, Narrow> : K extends 'then' ?
|
|
7514
|
+
[K in keyof T]: K extends 'result' ? NarrowTypeResult<T, Narrow> : K extends 'then' ? QueryThenByQuery<T, NarrowTypeResult<T, Narrow>> : T[K];
|
|
7515
7515
|
};
|
|
7516
7516
|
queryRelated<T extends PickQueryRelations, RelName extends keyof T['relations']>(this: T, relName: RelName, params: T['relations'][RelName]['relationConfig']['params']): T['relations'][RelName]['relationConfig']['maybeSingle'];
|
|
7517
7517
|
chain<T extends PickQueryMetaRelations, RelName extends keyof T['relations']>(this: T, relName: RelName): T['meta']['subQuery'] extends true ? T['relations'][RelName]['relationConfig']['maybeSingle'] : T['relations'][RelName]['relationConfig']['query'];
|
|
@@ -7682,41 +7682,39 @@ type SelectableOfType<T extends PickQueryMeta, Type> = {
|
|
|
7682
7682
|
type SelectableOrExpressionOfType<T extends PickQueryMeta, C extends PickType> = SelectableOfType<T, C['type']> | Expression<QueryColumn<C['type'] | null>>;
|
|
7683
7683
|
declare const queryTypeWithLimitOne: RecordKeyTrue;
|
|
7684
7684
|
declare const isQueryReturnsAll: (q: Query) => boolean;
|
|
7685
|
-
type GetQueryResult<T extends PickQueryReturnType, Result extends QueryColumns> = T['returnType'] extends undefined | 'all' ? ColumnShapeOutput<Result>[] : T['returnType'] extends 'one' ? ColumnShapeOutput<Result> | undefined : T['returnType'] extends 'oneOrThrow' ? ColumnShapeOutput<Result> : T['returnType'] extends 'value' ? Result['value']['outputType'] | undefined : T['returnType'] extends 'valueOrThrow' ? Result['value']['outputType'] : T['returnType'] extends 'rows' ? ColumnShapeOutput<Result>[keyof Result][][] : T['returnType'] extends 'pluck' ? Result['pluck']['outputType'][] : void;
|
|
7686
|
-
type QueryResultByReturnType<ReturnType extends QueryReturnType, Result extends QueryColumns> = ReturnType extends undefined | 'all' ? ColumnShapeOutput<Result>[] : ReturnType extends 'one' ? ColumnShapeOutput<Result> | undefined : ReturnType extends 'oneOrThrow' ? ColumnShapeOutput<Result> : ReturnType extends 'value' ? Result['value']['outputType'] | undefined : ReturnType extends 'valueOrThrow' ? Result['value']['outputType'] : ReturnType extends 'rows' ? ColumnShapeOutput<Result>[keyof Result][][] : ReturnType extends 'pluck' ? Result['pluck']['outputType'][] : void;
|
|
7687
7685
|
interface QueryMetaHasSelect {
|
|
7688
7686
|
meta: {
|
|
7689
7687
|
hasSelect: true;
|
|
7690
7688
|
};
|
|
7691
7689
|
}
|
|
7692
7690
|
type SetQueryReturnsAll<T extends PickQueryResult> = {
|
|
7693
|
-
[K in keyof T]: K extends 'returnType' ? 'all' : K extends 'then' ?
|
|
7691
|
+
[K in keyof T]: K extends 'returnType' ? 'all' : K extends 'then' ? QueryThenShallowSimplifyArr<ColumnShapeOutput<T['result']>> : T[K];
|
|
7694
7692
|
} & QueryMetaHasWhere;
|
|
7695
7693
|
type SetQueryReturnsAllKind<T extends PickQueryMetaResult, Kind extends string> = {
|
|
7696
7694
|
[K in keyof T]: K extends 'meta' ? {
|
|
7697
7695
|
[K in keyof T['meta']]: K extends 'kind' ? Kind : T['meta'][K];
|
|
7698
|
-
} : K extends 'returnType' ? 'all' : K extends 'then' ?
|
|
7696
|
+
} : K extends 'returnType' ? 'all' : K extends 'then' ? QueryThenShallowSimplifyArr<ColumnShapeOutput<T['result']>> : T[K];
|
|
7699
7697
|
} & QueryMetaHasWhere;
|
|
7700
7698
|
type SetQueryReturnsAllKindResult<T extends PickQueryMetaResult, Kind extends string, Result extends QueryColumns> = {
|
|
7701
7699
|
[K in keyof T]: K extends 'meta' ? {
|
|
7702
7700
|
[K in keyof T['meta']]: K extends 'kind' ? Kind : T['meta'][K];
|
|
7703
|
-
} : K extends 'returnType' ? 'all' : K extends 'result' ? Result : K extends 'then' ?
|
|
7701
|
+
} : K extends 'returnType' ? 'all' : K extends 'result' ? Result : K extends 'then' ? QueryThenShallowSimplifyArr<T['result']> : T[K];
|
|
7704
7702
|
} & QueryMetaHasWhere;
|
|
7705
7703
|
type SetQueryReturnsOneOptional<T extends PickQueryResult> = {
|
|
7706
|
-
[K in keyof T]: K extends 'returnType' ? 'one' : K extends 'then' ?
|
|
7704
|
+
[K in keyof T]: K extends 'returnType' ? 'one' : K extends 'then' ? QueryThenShallowSimplifyOptional<ColumnShapeOutput<T['result']>> : T[K];
|
|
7707
7705
|
};
|
|
7708
7706
|
type SetQueryReturnsOne<T extends PickQueryResult> = {
|
|
7709
|
-
[K in keyof T]: K extends 'returnType' ? 'oneOrThrow' : K extends 'then' ?
|
|
7707
|
+
[K in keyof T]: K extends 'returnType' ? 'oneOrThrow' : K extends 'then' ? QueryThenShallowSimplify<ColumnShapeOutput<T['result']>> : T[K];
|
|
7710
7708
|
};
|
|
7711
7709
|
type SetQueryReturnsOneKind<T extends PickQueryMetaResult, Kind extends string> = {
|
|
7712
7710
|
[K in keyof T]: K extends 'meta' ? {
|
|
7713
7711
|
[K in keyof T['meta']]: K extends 'kind' ? Kind : T['meta'][K];
|
|
7714
|
-
} : K extends 'returnType' ? 'oneOrThrow' : K extends 'then' ?
|
|
7712
|
+
} : K extends 'returnType' ? 'oneOrThrow' : K extends 'then' ? QueryThenShallowSimplify<ColumnShapeOutput<T['result']>> : T[K];
|
|
7715
7713
|
};
|
|
7716
7714
|
type SetQueryReturnsOneKindResult<T extends PickQueryMetaResult, Kind extends string, Result extends QueryColumns> = {
|
|
7717
7715
|
[K in keyof T]: K extends 'meta' ? {
|
|
7718
7716
|
[K in keyof T['meta']]: K extends 'kind' ? Kind : T['meta'][K];
|
|
7719
|
-
} : K extends 'returnType' ? 'oneOrThrow' : K extends 'result' ? Result : K extends 'then' ?
|
|
7717
|
+
} : K extends 'returnType' ? 'oneOrThrow' : K extends 'result' ? Result : K extends 'then' ? QueryThenShallowSimplify<ColumnShapeOutput<Result>> : T[K];
|
|
7720
7718
|
};
|
|
7721
7719
|
type SetQueryReturnsRows<T extends PickQueryResult> = {
|
|
7722
7720
|
[K in keyof T]: K extends 'returnType' ? 'rows' : K extends 'then' ? QueryThen<ColumnShapeOutput<T['result']>[keyof T['result']][][]> : T[K];
|
|
@@ -7799,7 +7797,7 @@ type SetQueryKind<T extends PickQueryMeta, Kind extends string> = {
|
|
|
7799
7797
|
type SetQueryKindResult<T extends PickQueryMetaReturnType, Kind extends string, Result extends QueryColumns> = {
|
|
7800
7798
|
[K in keyof T]: K extends 'meta' ? {
|
|
7801
7799
|
[K in keyof T['meta']]: K extends 'kind' ? Kind : T['meta'][K];
|
|
7802
|
-
} : K extends 'result' ? Result : K extends 'then' ?
|
|
7800
|
+
} : K extends 'result' ? Result : K extends 'then' ? QueryThenByQuery<T, Result> : T[K];
|
|
7803
7801
|
};
|
|
7804
7802
|
type SetQueryTableAlias<T extends PickQueryMetaTableShape, As extends string> = {
|
|
7805
7803
|
[K in keyof T]: K extends 'meta' ? {
|
|
@@ -8241,14 +8239,14 @@ interface ColumnsShape {
|
|
|
8241
8239
|
interface ColumnsShapeToObject<Shape extends QueryColumns> {
|
|
8242
8240
|
dataType: 'object';
|
|
8243
8241
|
type: ObjectType<Shape>;
|
|
8244
|
-
outputType: ObjectOutput<Shape
|
|
8242
|
+
outputType: ShallowSimplify<ObjectOutput<Shape>>;
|
|
8245
8243
|
queryType: ObjectQuery<Shape>;
|
|
8246
8244
|
operators: OperatorsAny;
|
|
8247
8245
|
}
|
|
8248
8246
|
interface ColumnsShapeToNullableObject<Shape extends QueryColumns> {
|
|
8249
8247
|
dataType: 'object';
|
|
8250
8248
|
type: ObjectType<Shape>;
|
|
8251
|
-
outputType: ObjectOutput<Shape
|
|
8249
|
+
outputType: ShallowSimplify<ObjectOutput<Shape>> | undefined;
|
|
8252
8250
|
queryType: ObjectQuery<Shape> | null;
|
|
8253
8251
|
operators: OperatorsAny;
|
|
8254
8252
|
}
|
|
@@ -8271,7 +8269,7 @@ interface ColumnsShapeToPluck<Shape extends QueryColumns> {
|
|
|
8271
8269
|
interface ColumnsShapeToObjectArray<Shape extends QueryColumns> {
|
|
8272
8270
|
dataType: 'array';
|
|
8273
8271
|
type: ObjectType<Shape>[];
|
|
8274
|
-
outputType: ObjectOutput<Shape
|
|
8272
|
+
outputType: ShallowSimplify<ObjectOutput<Shape>>[];
|
|
8275
8273
|
queryType: ObjectQuery<Shape>[];
|
|
8276
8274
|
operators: OperatorsAny;
|
|
8277
8275
|
}
|
|
@@ -8422,7 +8420,7 @@ type SetQueryReturnsColumnInfo<T extends PickQueryMetaShape, Column extends keyo
|
|
|
8422
8420
|
value: QueryColumn<Result>;
|
|
8423
8421
|
};
|
|
8424
8422
|
returnType: 'value';
|
|
8425
|
-
then:
|
|
8423
|
+
then: QueryThenShallowSimplify<Result>;
|
|
8426
8424
|
};
|
|
8427
8425
|
type GetColumnInfo = {
|
|
8428
8426
|
defaultValue: unknown;
|
|
@@ -8506,4 +8504,4 @@ type CopyResult<T extends PickQueryMeta> = SetQueryKind<T, 'copy'>;
|
|
|
8506
8504
|
*/
|
|
8507
8505
|
declare function copyTableData<T extends PickQueryMetaShape>(query: T, arg: CopyArg<T>): CopyResult<T>;
|
|
8508
8506
|
|
|
8509
|
-
export { Adapter, AdapterConfig, AdapterOptions, AddQueryDefaults, AfterCommitError, AfterCommitErrorFulfilledResult, AfterCommitErrorRejectedResult, AfterCommitErrorResult, AfterHook, AggregateArgTypes, AggregateMethods, AggregateOptions, AliasOrTable, ArrayColumn, ArrayColumnValue, ArrayData, AsMethods, AsQueryArg, BigIntColumn, BigSerialColumn, BitColumn, BitVaryingColumn, BooleanColumn, BooleanQueryColumn, BoxColumn, ByteaColumn, ChangeCountArg, CidrColumn, CircleColumn, CitextColumn, Clear, ClearStatement, ColumnData, ColumnFromDbParams, ColumnInfoQueryData, ColumnRefExpression, ColumnType, ColumnsByType, ColumnsShape, ColumnsShapeToNullableObject, ColumnsShapeToObject, ColumnsShapeToObjectArray, ColumnsShapeToPluck, CommonQueryData, ComputedColumn, ComputedColumns, ComputedColumnsFromOptions, ComputedMethods, ComputedOptionsFactory, CopyOptions, CopyQueryData, Create, CreateBelongsToData, CreateColumn, CreateCtx, CreateData, CreateKind, CreateMethodsNames, CreateRelationsData, CreateRelationsDataOmittingFKeys, CreateResult, CreateSelf, CustomTypeColumn, DateBaseColumn, DateColumn, DateColumnInput, DateTimeBaseClass, DateTimeTzBaseClass, Db, DbDomainArg, DbDomainArgRecord, DbExtension, DbOptions, DbResult, DbSharedOptions, DbTableConstructor, DbTableOptionScopes, DbTableOptions, DecimalColumn, DecimalColumnData, DefaultColumnTypes, DefaultSchemaConfig, Delete, DeleteArgs, DeleteMethodsNames, DeleteQueryData, DeleteResult, DomainColumn, DoublePrecisionColumn, DynamicRawSQL, EnumColumn, ExpressionMethods, ExpressionOutput, FnExpression, FnExpressionArgs, FnExpressionArgsPairs, FnExpressionArgsValue, For, FromArg, FromMethods, FromQuerySelf, FromResult, GeneratorIgnore, GetArg, GetColumnInfo,
|
|
8507
|
+
export { Adapter, AdapterConfig, AdapterOptions, AddQueryDefaults, AfterCommitError, AfterCommitErrorFulfilledResult, AfterCommitErrorRejectedResult, AfterCommitErrorResult, AfterHook, AggregateArgTypes, AggregateMethods, AggregateOptions, AliasOrTable, ArrayColumn, ArrayColumnValue, ArrayData, AsMethods, AsQueryArg, BigIntColumn, BigSerialColumn, BitColumn, BitVaryingColumn, BooleanColumn, BooleanQueryColumn, BoxColumn, ByteaColumn, ChangeCountArg, CidrColumn, CircleColumn, CitextColumn, Clear, ClearStatement, ColumnData, ColumnFromDbParams, ColumnInfoQueryData, ColumnRefExpression, ColumnType, ColumnsByType, ColumnsShape, ColumnsShapeToNullableObject, ColumnsShapeToObject, ColumnsShapeToObjectArray, ColumnsShapeToPluck, CommonQueryData, ComputedColumn, ComputedColumns, ComputedColumnsFromOptions, ComputedMethods, ComputedOptionsFactory, CopyOptions, CopyQueryData, Create, CreateBelongsToData, CreateColumn, CreateCtx, CreateData, CreateKind, CreateMethodsNames, CreateRelationsData, CreateRelationsDataOmittingFKeys, CreateResult, CreateSelf, CustomTypeColumn, DateBaseColumn, DateColumn, DateColumnInput, DateTimeBaseClass, DateTimeTzBaseClass, Db, DbDomainArg, DbDomainArgRecord, DbExtension, DbOptions, DbResult, DbSharedOptions, DbTableConstructor, DbTableOptionScopes, DbTableOptions, DecimalColumn, DecimalColumnData, DefaultColumnTypes, DefaultSchemaConfig, Delete, DeleteArgs, DeleteMethodsNames, DeleteQueryData, DeleteResult, DomainColumn, DoublePrecisionColumn, DynamicRawSQL, EnumColumn, ExpressionMethods, ExpressionOutput, FnExpression, FnExpressionArgs, FnExpressionArgsPairs, FnExpressionArgsValue, For, FromArg, FromMethods, FromQuerySelf, FromResult, GeneratorIgnore, GetArg, GetColumnInfo, GetResult, GetResultOptional, GetStringArg, GroupArgs, HandleResult, Having, HavingItem, HookAction, HookSelectArg, IdentityColumn, InetColumn, InsertQueryData, IntegerBaseColumn, IntegerColumn, IntervalColumn, IsolationLevel, JSONColumn, JSONTextColumn, Join, JoinArgToQuery, JoinArgs, JoinCallback, JoinFirstArg, JoinItem, JoinItemArgs, JoinLateralItem, JoinLateralResult, JoinQueryBuilder, JoinQueryMethod, JoinResult, JoinedParsers, JoinedShapes, JsonMethods, LimitedTextBaseColumn, LineColumn, LsegColumn, MacAddr8Column, MacAddrColumn, MapTableScopesOption, MergeQuery, MergeQueryMethods, MoneyColumn, MoreThanOneRowError, NoPrimaryKeyOption, NonUniqDataItem, NotFoundError, NumberAsStringBaseColumn, NumberBaseColumn, NumberColumnData, NumericColumns, OnConflictMerge, OnConflictQueryBuilder, OnConflictSet, OnConflictTarget, OnMethods, Operator, Operators, OperatorsAny, OperatorsArray, OperatorsBoolean, OperatorsDate, OperatorsJson, OperatorsNumber, OperatorsText, OperatorsTime, OrCreateArg, OrExpression, OrchidOrmError, OrchidOrmInternalError, OrderArg, OrderArgSelf, OrderArgs, OrderItem, OrderTsQueryConfig, Over, PathColumn, PickColumnData, PickQueryBaseQuery, PickQueryColumnTypes, PickQueryDataShapeAndJoinedShapes, PickQueryInternal, PickQueryMetaRelations, PickQueryMetaRelationsResult, PickQueryMetaResultRelations, PickQueryMetaResultRelationsWindows, PickQueryMetaResultRelationsWindowsColumnTypes, PickQueryMetaResultRelationsWithDataReturnType, PickQueryMetaResultRelationsWithDataReturnTypeShape, PickQueryMetaResultReturnTypeWithDataWindows, PickQueryMetaResultReturnTypeWithDataWindowsTable, PickQueryMetaShapeRelationsWithData, PickQueryMetaTable, PickQueryMetaTableShape, PickQueryMetaTableShapeReturnTypeWithData, PickQueryMetaWithData, PickQueryMetaWithDataColumnTypes, PickQueryQ, PickQueryQAndBaseQuery, PickQueryQAndInternal, PickQueryRelations, PickQueryRelationsWithData, PickQueryResultColumnTypes, PickQueryShapeResultSinglePrimaryKey, PickQueryShapeSinglePrimaryKey, PickQuerySinglePrimaryKey, PickQueryWindows, PickQueryWithData, PickQueryWithDataColumnTypes, PointColumn, PolygonColumn, PostgisGeographyPointColumn, PostgisPoint, Query, QueryAfterHook, QueryArraysResult, QueryBatchResult, QueryBeforeHook, QueryComputedArg, QueryData, QueryDataFromItem, QueryDataJoinTo, QueryDefaultReturnData, QueryError, QueryErrorName, QueryGet, QueryGetSelf, QueryHelperResult, QueryHooks, QueryInternal, QueryLog, QueryMetaHasSelect, QueryMetaHasWhere, QueryMethods, QueryOrExpression, QueryOrExpressionBooleanOrNullResult, QueryResult, QueryScopeData, QueryScopes, QuerySourceItem, QueryUpsertOrCreate, RawSQL, RealColumn, RecordOfColumnsShapeBase, RefExpression, RelationConfigBase, RelationConfigDataForCreate, RelationJoinQuery, RelationQueryBase, RelationsBase, RuntimeComputedQueryColumn, SearchArg, SearchMethods, SearchWeight, SearchWeightRecord, Select, SelectArg, SelectArgs, SelectAs, SelectAsValue, SelectItem, SelectQueryData, SelectSubQueryResult, SelectableFromShape, SelectableOfType, SelectableOrExpression, SelectableOrExpressionOfType, SelectableOrExpressions, SerialColumn, SerialColumnData, SetQueryKind, SetQueryKindResult, SetQueryReturnsAll, SetQueryReturnsAllKind, SetQueryReturnsAllKindResult, SetQueryReturnsColumnInfo, SetQueryReturnsColumnKind, SetQueryReturnsColumnKindResult, SetQueryReturnsColumnOptional, SetQueryReturnsColumnOrThrow, SetQueryReturnsOne, SetQueryReturnsOneKind, SetQueryReturnsOneKindResult, SetQueryReturnsOneOptional, SetQueryReturnsPluck, SetQueryReturnsPluckColumn, SetQueryReturnsPluckColumnKind, SetQueryReturnsPluckColumnKindResult, SetQueryReturnsRowCount, SetQueryReturnsRowCountMany, SetQueryReturnsRows, SetQueryReturnsValueOptional, SetQueryReturnsValueOrThrow, SetQueryReturnsVoid, SetQueryReturnsVoidKind, SetQueryTableAlias, ShapeColumnPrimaryKeys, ShapeUniqueColumns, SimpleJoinItem, SimpleJoinItemNonSubQueryArgs, SmallIntColumn, SmallSerialColumn, SortDir, SqlFn, SqlMethod, StringColumn$1 as StringColumn, TableData, TableDataFn, TableDataInput, TableDataItem, TableDataItemsUniqueColumnTuples, TableDataItemsUniqueColumns, TableDataItemsUniqueConstraints, TableDataMethods, TextBaseColumn, TextColumn, TextColumnData, Then, TimeColumn, TimestampColumn, TimestampTZColumn, ToSQLCtx, ToSQLOptions, ToSQLQuery, Transaction, TransactionAdapter, TransactionOptions, TransformMethods, TruncateQueryData, TsQueryColumn, TsVectorColumn, TypeParsers, UUIDColumn, UnhandledTypeError, Union, UnionArgs, UnionItem, UnionKind, UnionSet, UniqueConstraints, UniqueQueryTypeOrExpression, UniqueTableDataItem, UnknownColumn, Update, UpdateArg, UpdateCtx, UpdateCtxCollect, UpdateData, UpdateQueryData, UpdateQueryDataItem, UpdateQueryDataObject, UpdateSelf, UpdatedAtDataInjector, UpsertResult, UpsertThis, VarCharColumn, VirtualColumn, Where, WhereArg, WhereArgs, WhereInArg, WhereInColumn, WhereInItem, WhereInValues, WhereItem, WhereJsonPathEqualsItem, WhereNotArgs, WhereOnItem, WhereOnJoinItem, WhereQueryBuilder, WhereResult, WhereSearchItem, WhereSearchResult, WindowArg, WindowArgDeclaration, WindowDeclaration, WindowItem, WithArgsOptions, WithConfigs, WithDataItem, WithDataItems, WithItem, WithMethods, WithOptions, WithQueryBuilder, WithRecursiveOptions, WithResult, WithSqlResult, WrapQueryArg, XMLColumn, _afterCommitError, _clone, _getSelectableColumn, _initQueryBuilder, _queryAfterSaveCommit, _queryAll, _queryAs, _queryChangeCounter, _queryCreate, _queryCreateFrom, _queryCreateMany, _queryCreateManyFrom, _queryCreateManyRaw, _queryCreateRaw, _queryDefaults, _queryDelete, _queryExec, _queryFindBy, _queryFindByOptional, _queryGet, _queryGetOptional, _queryHookAfterCreate, _queryHookAfterCreateCommit, _queryHookAfterDelete, _queryHookAfterDeleteCommit, _queryHookAfterQuery, _queryHookAfterSave, _queryHookAfterUpdate, _queryHookAfterUpdateCommit, _queryHookBeforeCreate, _queryHookBeforeDelete, _queryHookBeforeQuery, _queryHookBeforeSave, _queryHookBeforeUpdate, _queryInsert, _queryInsertFrom, _queryInsertMany, _queryInsertManyFrom, _queryInsertManyRaw, _queryInsertRaw, _queryJoinOn, _queryJoinOnJsonPathEquals, _queryJoinOrOn, _queryOr, _queryOrNot, _queryResolveAlias, _queryRows, _querySelect, _queryTake, _queryTakeOptional, _queryUnion, _queryUpdate, _queryUpdateOrThrow, _queryUpdateRaw, _queryWhere, _queryWhereExists, _queryWhereIn, _queryWhereNot, _queryWhereNotOneOf, _queryWhereNotSql, _queryWhereOneOf, _queryWhereSql, addColumnParserToQuery, addParserForRawExpression, addParserForSelectItem, addQueryOn, anyShape, applyComputedColumns, checkIfASimpleQuery, cloneQuery, cloneQueryBaseUnscoped, columnCheckToCode, columnCode, columnForeignKeysToCode, columnIndexesToCode, columnsShapeToCode, commitSql, constraintInnerToCode, constraintToCode, copyTableData, countSelect, createDb, defaultSchemaConfig, escapeForLog, escapeForMigration, escapeString, extendQuery, filterResult, foreignKeyArgumentToCode, getClonedQueryData, getColumnInfo, getColumnTypes, getPrimaryKeys, getQueryAs, getShapeFromSelect, getSqlText, handleResult, identityToCode, indexInnerToCode, indexToCode, instantiateColumn, isDefaultTimeStamp, isQueryReturnsAll, isSelectingCount, joinSubQuery, logParamToLogObject, makeColumnTypes, makeColumnsByType, makeFnExpression, makeRegexToFindInSql, makeSQL, parseRecord, parseTableData, parseTableDataInput, postgisTypmodToSql, primaryKeyInnerToCode, processComputedBatches, processComputedResult, processSelectArg, pushLimitSQL, pushQueryArray, pushQueryOn, pushQueryOnForOuter, pushQueryOrOn, pushQueryValue, pushTableDataCode, queryFrom, queryFromSql, queryJson, queryMethodByReturnType, queryTypeWithLimitOne, queryWrap, raw, referencesArgsToCode, resolveSubQueryCallback, rollbackSql, saveSearchAlias, setColumnDefaultParse, setColumnEncode, setColumnParse, setColumnParseNull, setParserForSelectedString, setQueryObjectValue, setQueryOperators, simplifyColumnDefault, sqlFn, sqlQueryArgsToExpression, tableDataMethods, templateLiteralToSQL, testTransaction, throwIfJoinLateral, throwIfNoWhere, toSQL, toSQLCacheKey };
|