pqb 0.42.1 → 0.42.3
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 +29 -30
- package/dist/index.js +4 -0
- package/dist/index.js.map +1 -1
- package/dist/index.mjs +4 -0
- 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 ? {
|
|
@@ -5126,6 +5126,7 @@ declare class Transaction {
|
|
|
5126
5126
|
* ```
|
|
5127
5127
|
*/
|
|
5128
5128
|
ensureTransaction<Result>(this: PickQueryQAndInternal, cb: () => Promise<Result>): Promise<Result>;
|
|
5129
|
+
isInTransaction(): boolean;
|
|
5129
5130
|
}
|
|
5130
5131
|
|
|
5131
5132
|
type AfterHook<Select extends PropertyKey[], Shape extends QueryColumns> = QueryAfterHook<{
|
|
@@ -5312,7 +5313,7 @@ declare class QueryLog {
|
|
|
5312
5313
|
type MergeQuery<T extends PickQueryMetaResultReturnTypeWithDataWindows, Q extends PickQueryMetaResultReturnTypeWithDataWindows> = {
|
|
5313
5314
|
[K in keyof T]: K extends 'meta' ? {
|
|
5314
5315
|
[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' ?
|
|
5316
|
+
} : 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
5317
|
};
|
|
5317
5318
|
type MergeQueryResult<T extends PickQueryMetaResult, Q extends PickQueryMetaResult> = T['meta']['hasSelect'] extends true ? Q['meta']['hasSelect'] extends true ? {
|
|
5318
5319
|
[K in keyof T['result'] | keyof Q['result']]: K extends keyof Q['result'] ? Q['result'][K] : T['result'][K];
|
|
@@ -5349,11 +5350,11 @@ type SelectResult<T extends SelectSelf, Columns extends PropertyKey[]> = {
|
|
|
5349
5350
|
[K in Columns[number] | T['meta']['defaultSelect'] as K extends '*' ? never : T['meta']['selectable'][K]['as']]: T['meta']['selectable'][K]['column'];
|
|
5350
5351
|
} : {
|
|
5351
5352
|
[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' ?
|
|
5353
|
+
}) & (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
5354
|
[K in Exclude<Columns[number], '*'> | T['meta']['defaultSelect'] as T['meta']['selectable'][K]['as']]: T['meta']['selectable'][K]['column'];
|
|
5354
5355
|
} : {
|
|
5355
5356
|
[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)
|
|
5357
|
+
}) & (T['meta']['hasSelect'] extends (T['returnType'] extends 'value' | 'valueOrThrow' ? never : true) ? Omit<T['result'], Columns[number]> : unknown)> : T[K];
|
|
5357
5358
|
} & QueryMetaHasSelect;
|
|
5358
5359
|
type SelectResultObj<T extends SelectSelf, Obj> = Obj extends SelectAsCheckReturnTypes ? {
|
|
5359
5360
|
[K in keyof T]: K extends 'meta' ? T['meta'] & {
|
|
@@ -5361,9 +5362,9 @@ type SelectResultObj<T extends SelectSelf, Obj> = Obj extends SelectAsCheckRetur
|
|
|
5361
5362
|
selectable: SelectAsSelectable<Obj>;
|
|
5362
5363
|
} : K extends 'result' ? {
|
|
5363
5364
|
[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' ?
|
|
5365
|
+
} : K extends 'returnType' ? SelectReturnType<T> : K extends 'then' ? QueryThenByReturnType<SelectReturnType<T>, {
|
|
5365
5366
|
[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
|
-
}
|
|
5367
|
+
}> : T[K];
|
|
5367
5368
|
} : `Invalid return type of ${{
|
|
5368
5369
|
[K in keyof Obj]: Obj[K] extends (...args: any[]) => any ? ReturnType<Obj[K]> extends SelectAsFnReturnType ? never : K : never;
|
|
5369
5370
|
}[keyof Obj] & string}`;
|
|
@@ -5374,9 +5375,9 @@ type SelectResultColumnsAndObj<T extends SelectSelf, Columns extends PropertyKey
|
|
|
5374
5375
|
} : K extends 'result' ? // Combine previously selected items, all columns if * was provided,
|
|
5375
5376
|
{
|
|
5376
5377
|
[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' ?
|
|
5378
|
+
} & (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
5379
|
[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)
|
|
5380
|
+
} & (T['meta']['hasSelect'] extends (T['returnType'] extends 'value' | 'valueOrThrow' ? never : true) ? Omit<T['result'], Columns[number]> : unknown)> : T[K];
|
|
5380
5381
|
};
|
|
5381
5382
|
type SelectAsSelectable<Arg> = {
|
|
5382
5383
|
[K in keyof Arg]: Arg[K] extends (q: never) => {
|
|
@@ -7511,7 +7512,7 @@ declare class QueryMethods<ColumnTypes> {
|
|
|
7511
7512
|
* ```
|
|
7512
7513
|
*/
|
|
7513
7514
|
narrowType<T extends PickQueryMetaResultReturnType>(this: T): <Narrow>() => {
|
|
7514
|
-
[K in keyof T]: K extends 'result' ? NarrowTypeResult<T, Narrow> : K extends 'then' ?
|
|
7515
|
+
[K in keyof T]: K extends 'result' ? NarrowTypeResult<T, Narrow> : K extends 'then' ? QueryThenByQuery<T, NarrowTypeResult<T, Narrow>> : T[K];
|
|
7515
7516
|
};
|
|
7516
7517
|
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
7518
|
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 +7683,39 @@ type SelectableOfType<T extends PickQueryMeta, Type> = {
|
|
|
7682
7683
|
type SelectableOrExpressionOfType<T extends PickQueryMeta, C extends PickType> = SelectableOfType<T, C['type']> | Expression<QueryColumn<C['type'] | null>>;
|
|
7683
7684
|
declare const queryTypeWithLimitOne: RecordKeyTrue;
|
|
7684
7685
|
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
7686
|
interface QueryMetaHasSelect {
|
|
7688
7687
|
meta: {
|
|
7689
7688
|
hasSelect: true;
|
|
7690
7689
|
};
|
|
7691
7690
|
}
|
|
7692
7691
|
type SetQueryReturnsAll<T extends PickQueryResult> = {
|
|
7693
|
-
[K in keyof T]: K extends 'returnType' ? 'all' : K extends 'then' ?
|
|
7692
|
+
[K in keyof T]: K extends 'returnType' ? 'all' : K extends 'then' ? QueryThenShallowSimplifyArr<ColumnShapeOutput<T['result']>> : T[K];
|
|
7694
7693
|
} & QueryMetaHasWhere;
|
|
7695
7694
|
type SetQueryReturnsAllKind<T extends PickQueryMetaResult, Kind extends string> = {
|
|
7696
7695
|
[K in keyof T]: K extends 'meta' ? {
|
|
7697
7696
|
[K in keyof T['meta']]: K extends 'kind' ? Kind : T['meta'][K];
|
|
7698
|
-
} : K extends 'returnType' ? 'all' : K extends 'then' ?
|
|
7697
|
+
} : K extends 'returnType' ? 'all' : K extends 'then' ? QueryThenShallowSimplifyArr<ColumnShapeOutput<T['result']>> : T[K];
|
|
7699
7698
|
} & QueryMetaHasWhere;
|
|
7700
7699
|
type SetQueryReturnsAllKindResult<T extends PickQueryMetaResult, Kind extends string, Result extends QueryColumns> = {
|
|
7701
7700
|
[K in keyof T]: K extends 'meta' ? {
|
|
7702
7701
|
[K in keyof T['meta']]: K extends 'kind' ? Kind : T['meta'][K];
|
|
7703
|
-
} : K extends 'returnType' ? 'all' : K extends 'result' ? Result : K extends 'then' ?
|
|
7702
|
+
} : K extends 'returnType' ? 'all' : K extends 'result' ? Result : K extends 'then' ? QueryThenShallowSimplifyArr<T['result']> : T[K];
|
|
7704
7703
|
} & QueryMetaHasWhere;
|
|
7705
7704
|
type SetQueryReturnsOneOptional<T extends PickQueryResult> = {
|
|
7706
|
-
[K in keyof T]: K extends 'returnType' ? 'one' : K extends 'then' ?
|
|
7705
|
+
[K in keyof T]: K extends 'returnType' ? 'one' : K extends 'then' ? QueryThenShallowSimplifyOptional<ColumnShapeOutput<T['result']>> : T[K];
|
|
7707
7706
|
};
|
|
7708
7707
|
type SetQueryReturnsOne<T extends PickQueryResult> = {
|
|
7709
|
-
[K in keyof T]: K extends 'returnType' ? 'oneOrThrow' : K extends 'then' ?
|
|
7708
|
+
[K in keyof T]: K extends 'returnType' ? 'oneOrThrow' : K extends 'then' ? QueryThenShallowSimplify<ColumnShapeOutput<T['result']>> : T[K];
|
|
7710
7709
|
};
|
|
7711
7710
|
type SetQueryReturnsOneKind<T extends PickQueryMetaResult, Kind extends string> = {
|
|
7712
7711
|
[K in keyof T]: K extends 'meta' ? {
|
|
7713
7712
|
[K in keyof T['meta']]: K extends 'kind' ? Kind : T['meta'][K];
|
|
7714
|
-
} : K extends 'returnType' ? 'oneOrThrow' : K extends 'then' ?
|
|
7713
|
+
} : K extends 'returnType' ? 'oneOrThrow' : K extends 'then' ? QueryThenShallowSimplify<ColumnShapeOutput<T['result']>> : T[K];
|
|
7715
7714
|
};
|
|
7716
7715
|
type SetQueryReturnsOneKindResult<T extends PickQueryMetaResult, Kind extends string, Result extends QueryColumns> = {
|
|
7717
7716
|
[K in keyof T]: K extends 'meta' ? {
|
|
7718
7717
|
[K in keyof T['meta']]: K extends 'kind' ? Kind : T['meta'][K];
|
|
7719
|
-
} : K extends 'returnType' ? 'oneOrThrow' : K extends 'result' ? Result : K extends 'then' ?
|
|
7718
|
+
} : K extends 'returnType' ? 'oneOrThrow' : K extends 'result' ? Result : K extends 'then' ? QueryThenShallowSimplify<ColumnShapeOutput<Result>> : T[K];
|
|
7720
7719
|
};
|
|
7721
7720
|
type SetQueryReturnsRows<T extends PickQueryResult> = {
|
|
7722
7721
|
[K in keyof T]: K extends 'returnType' ? 'rows' : K extends 'then' ? QueryThen<ColumnShapeOutput<T['result']>[keyof T['result']][][]> : T[K];
|
|
@@ -7799,7 +7798,7 @@ type SetQueryKind<T extends PickQueryMeta, Kind extends string> = {
|
|
|
7799
7798
|
type SetQueryKindResult<T extends PickQueryMetaReturnType, Kind extends string, Result extends QueryColumns> = {
|
|
7800
7799
|
[K in keyof T]: K extends 'meta' ? {
|
|
7801
7800
|
[K in keyof T['meta']]: K extends 'kind' ? Kind : T['meta'][K];
|
|
7802
|
-
} : K extends 'result' ? Result : K extends 'then' ?
|
|
7801
|
+
} : K extends 'result' ? Result : K extends 'then' ? QueryThenByQuery<T, Result> : T[K];
|
|
7803
7802
|
};
|
|
7804
7803
|
type SetQueryTableAlias<T extends PickQueryMetaTableShape, As extends string> = {
|
|
7805
7804
|
[K in keyof T]: K extends 'meta' ? {
|
|
@@ -8241,14 +8240,14 @@ interface ColumnsShape {
|
|
|
8241
8240
|
interface ColumnsShapeToObject<Shape extends QueryColumns> {
|
|
8242
8241
|
dataType: 'object';
|
|
8243
8242
|
type: ObjectType<Shape>;
|
|
8244
|
-
outputType: ObjectOutput<Shape
|
|
8243
|
+
outputType: ShallowSimplify<ObjectOutput<Shape>>;
|
|
8245
8244
|
queryType: ObjectQuery<Shape>;
|
|
8246
8245
|
operators: OperatorsAny;
|
|
8247
8246
|
}
|
|
8248
8247
|
interface ColumnsShapeToNullableObject<Shape extends QueryColumns> {
|
|
8249
8248
|
dataType: 'object';
|
|
8250
8249
|
type: ObjectType<Shape>;
|
|
8251
|
-
outputType: ObjectOutput<Shape
|
|
8250
|
+
outputType: ShallowSimplify<ObjectOutput<Shape>> | undefined;
|
|
8252
8251
|
queryType: ObjectQuery<Shape> | null;
|
|
8253
8252
|
operators: OperatorsAny;
|
|
8254
8253
|
}
|
|
@@ -8271,7 +8270,7 @@ interface ColumnsShapeToPluck<Shape extends QueryColumns> {
|
|
|
8271
8270
|
interface ColumnsShapeToObjectArray<Shape extends QueryColumns> {
|
|
8272
8271
|
dataType: 'array';
|
|
8273
8272
|
type: ObjectType<Shape>[];
|
|
8274
|
-
outputType: ObjectOutput<Shape
|
|
8273
|
+
outputType: ShallowSimplify<ObjectOutput<Shape>>[];
|
|
8275
8274
|
queryType: ObjectQuery<Shape>[];
|
|
8276
8275
|
operators: OperatorsAny;
|
|
8277
8276
|
}
|
|
@@ -8422,7 +8421,7 @@ type SetQueryReturnsColumnInfo<T extends PickQueryMetaShape, Column extends keyo
|
|
|
8422
8421
|
value: QueryColumn<Result>;
|
|
8423
8422
|
};
|
|
8424
8423
|
returnType: 'value';
|
|
8425
|
-
then:
|
|
8424
|
+
then: QueryThenShallowSimplify<Result>;
|
|
8426
8425
|
};
|
|
8427
8426
|
type GetColumnInfo = {
|
|
8428
8427
|
defaultValue: unknown;
|
|
@@ -8506,4 +8505,4 @@ type CopyResult<T extends PickQueryMeta> = SetQueryKind<T, 'copy'>;
|
|
|
8506
8505
|
*/
|
|
8507
8506
|
declare function copyTableData<T extends PickQueryMetaShape>(query: T, arg: CopyArg<T>): CopyResult<T>;
|
|
8508
8507
|
|
|
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,
|
|
8508
|
+
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 };
|
package/dist/index.js
CHANGED
|
@@ -4285,6 +4285,10 @@ class Transaction {
|
|
|
4285
4285
|
return cb();
|
|
4286
4286
|
return Transaction.prototype.transaction.call(this, cb);
|
|
4287
4287
|
}
|
|
4288
|
+
isInTransaction() {
|
|
4289
|
+
const trx = this.internal.transactionStorage.getStore();
|
|
4290
|
+
return !!(trx && (!trx.testTransactionCount || trx.transactionId >= trx.testTransactionCount));
|
|
4291
|
+
}
|
|
4288
4292
|
}
|
|
4289
4293
|
const runAfterCommit = async (afterCommit, result) => {
|
|
4290
4294
|
if (afterCommit) {
|