pqb 0.10.16 → 0.10.18

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import * as orchid_core from 'orchid-core';
-import { EmptyObject, RawExpression, ColumnTypeBase, MaybeArray, QueryResultRow, AdapterBase, QueryInput, ColumnsShapeBase, StringKey, ColumnOutput, SimpleSpread, FilterTuple, NullableColumn, QueryInternal, QueryMetaBase, ColumnTypesBase, DbBase, ThenResult, ColumnShapeOutput, DefaultSelectColumns, SetOptional, Spread, CoalesceString, QueryBaseCommon, QueryCommon, ColumnDataBase, BaseOperators, PrimaryKeyColumn, HiddenColumn, ValidationContext, MessageParam, BaseNumberData, Code, numberTypeMethods, BaseStringData, DateColumnData, dateTypeMethods, JSONTypeAny, record, ArrayMethodsData, arrayMethods, name } from 'orchid-core';
+import { EmptyObject, RawExpression, ColumnTypeBase, MaybeArray, QueryResultRow, AdapterBase, QueryInput, ColumnsShapeBase, StringKey, ColumnOutput, NullableColumn, QueryInternal, QueryMetaBase, ColumnTypesBase, DbBase, ThenResult, ColumnShapeOutput, DefaultSelectColumns, SetOptional, Spread, CoalesceString, QueryBaseCommon, QueryCommon, ColumnDataBase, BaseOperators, PrimaryKeyColumn, HiddenColumn, ValidationContext, MessageParam, BaseNumberData, Code, numberTypeMethods, BaseStringData, DateColumnData, dateTypeMethods, JSONTypeAny, record, ArrayMethodsData, arrayMethods, name } from 'orchid-core';
 import { PoolConfig, Pool, PoolClient } from 'pg';
 
 declare type BaseRelation = {
@@ -462,12 +462,22 @@ declare class QueryGet {
 }
 
 declare type SelectArg<T extends QueryBase> = '*' | StringKey<keyof T['selectable']> | (T['relations'] extends Record<string, Relation> ? StringKey<keyof T['relations']> : never) | SelectAsArg<T>;
-declare type SelectAsArg<T extends QueryBase> = Record<string, StringKey<keyof T['selectable']> | RawExpression | ((q: T) => Query | RawExpression)>;
-declare type SelectResult<T extends Query, Args extends SelectArg<T>[], SelectAsArgs = SimpleSpread<FilterTuple<Args, SelectAsArg<T>>>> = AddQuerySelect<T, ('*' extends Args[number] ? T['shape'] : EmptyObject) & {
+declare type SelectAsArg<T extends QueryBase> = Record<string, SelectAsValue<T>>;
+declare type SelectAsValue<T extends QueryBase> = StringKey<keyof T['selectable']> | RawExpression | ((q: T) => Query) | ((q: T) => RawExpression);
+declare type SelectResult<T extends Query, Args extends SelectArg<T>[], SelectAllResult extends ColumnsShapeBase = '*' extends Args[number] ? T['shape'] : EmptyObject, SelectStringsResult extends ColumnsShapeBase = SelectStringArgsResult<T, Args>, SelectAsResult extends ColumnsShapeBase = SpreadSelectArgs<T, Args>> = AddQuerySelect<T, SelectAllResult & {
+    [K in keyof SelectStringsResult]: K extends keyof SelectAsResult ? unknown : SelectStringsResult[K];
+} & SelectAsResult>;
+declare type SpreadSelectArgs<T extends Query, Args extends [...any]> = Args extends [
+    infer L,
+    ...infer R
+] ? L extends SelectAsArg<T> ? SelectAsResult<T, L> & SpreadSelectArgs<T, R> : SpreadSelectArgs<T, R> : EmptyObject;
+declare type SelectStringArgsResult<T extends Query, Args extends SelectArg<T>[]> = {
     [Arg in Args[number] as Arg extends keyof T['selectable'] ? T['selectable'][Arg]['as'] : Arg extends keyof T['relations'] ? Arg : never]: Arg extends keyof T['selectable'] ? T['selectable'][Arg]['column'] : T['relations'] extends Record<string, Relation> ? Arg extends keyof T['relations'] ? T['relations'][Arg]['returns'] extends 'many' ? ArrayOfColumnsObjects<T['relations'][Arg]['table']['result']> : T['relations'][Arg]['options']['required'] extends true ? ColumnsObject<T['relations'][Arg]['table']['result']> : NullableColumn<ColumnsObject<T['relations'][Arg]['table']['result']>> : never : never;
-} & {
-    [K in keyof SelectAsArgs]: SelectAsArgs[K] extends keyof T['selectable'] ? T['selectable'][SelectAsArgs[K]]['column'] : SelectAsArgs[K] extends RawExpression ? SelectAsArgs[K]['__column'] : SelectAsArgs[K] extends (q: T) => RawExpression ? ReturnType<SelectAsArgs[K]>['__column'] : SelectAsArgs[K] extends (q: T) => Query ? SelectSubQueryResult<ReturnType<SelectAsArgs[K]>> : SelectAsArgs[K] extends ((q: T) => Query) | RawExpression ? SelectSubQueryResult<ReturnType<Exclude<SelectAsArgs[K], RawExpression>>> | Exclude<SelectAsArgs[K], (q: T) => Query>['__column'] : never;
-}>;
+};
+declare type SelectAsResult<T extends Query, Arg extends SelectAsArg<T>> = {
+    [K in keyof Arg]: SelectAsValueResult<T, Arg[K]>;
+};
+declare type SelectAsValueResult<T extends Query, Arg extends SelectAsValue<T>> = Arg extends keyof T['selectable'] ? T['selectable'][Arg]['column'] : Arg extends RawExpression ? Arg['__column'] : Arg extends (q: T) => infer R ? R extends Query ? SelectSubQueryResult<R> : R extends RawExpression ? R['__column'] : never : never;
 declare type SelectSubQueryResult<Arg extends Query & {
     [isRequiredRelationKey]?: boolean;
 }> = QueryReturnsAll<Arg['returnType']> extends true ? ArrayOfColumnsObjects<Arg['result']> : Arg['returnType'] extends 'valueOrThrow' ? Arg['result']['value'] : Arg['returnType'] extends 'pluck' ? PluckResultColumnType<Arg['result']['pluck']> : Arg[isRequiredRelationKey] extends true ? ColumnsObject<Arg['result']> : NullableColumn<ColumnsObject<Arg['result']>>;
@@ -489,23 +499,22 @@ declare type FromArgs<T extends Query> = [
         only?: boolean;
     }
 ];
-declare type SetFromSelectable<T extends Query, Arg extends Query> = Omit<T, 'selectable'> & {
-    selectable: {
-        [K in keyof Arg['result']]: K extends string ? {
-            as: K;
-            column: Arg['result'][K];
-        } : never;
-    };
-};
-declare type MergeFromResult<T extends Query, Arg extends Query> = AddQuerySelect<Omit<T, 'result'> & {
-    result: Pick<T['result'], keyof Arg['result']>;
-}, Arg['result']>;
 declare type FromResult<T extends Query, Args extends FromArgs<T>, Arg = Args[0]> = Arg extends string ? T['withData'] extends Record<string, WithDataItem> ? Arg extends keyof T['withData'] ? Omit<T, 'meta' | 'selectable'> & {
     meta: Omit<T['meta'], 'as'> & {
         as?: string;
     };
     selectable: SelectableFromShape<T['withData'][Arg]['shape'], Arg>;
-} : SetQueryTableAlias<T, Arg> : SetQueryTableAlias<T, Arg> : Arg extends Query ? SetQueryTableAlias<MergeFromResult<SetFromSelectable<T, Arg>, Arg>, AliasOrTable<Arg>> : T;
+} : SetQueryTableAlias<T, Arg> : SetQueryTableAlias<T, Arg> : Arg extends Query ? FromQueryResult<T, Arg> : T;
+declare type FromQueryResult<T extends Query, Q extends Query, Selectable extends SelectableBase = {
+    [K in keyof Q['result']]: K extends string ? {
+        as: K;
+        column: Q['result'][K];
+    } : never;
+}> = {
+    [K in keyof T]: K extends 'meta' ? Omit<T['meta'], 'hasSelect' | 'as'> & {
+        as: AliasOrTable<Q>;
+    } : K extends 'selectable' ? Selectable : K extends 'result' | 'shape' ? Q['result'] : K extends 'then' ? QueryThen<T['returnType'], Q['result']> : T[K];
+};
 declare class From {
     from<T extends Query, Args extends FromArgs<T>>(this: T, ...args: Args): FromResult<T, Args>;
     _from<T extends Query, Args extends FromArgs<T>>(this: T, ...args: Args): FromResult<T, Args>;
@@ -605,7 +614,7 @@ declare class WhereQueryBuilder<Q extends QueryBase = QueryBase> extends Where i
     relations: Q['relations'];
     baseQuery: Query;
     withData: {};
-    internal: {};
+    internal: QueryInternal;
     constructor(q: QueryBase | string, { shape, joinedShapes }: Pick<QueryData, 'shape' | 'joinedShapes'>);
     clone<T extends this>(this: T): T;
 }
@@ -1565,15 +1574,15 @@ declare type QueryThen<ReturnType extends QueryReturnType, Result extends Column
 } ? ThenResult<Result['value']['type']> : never : ReturnType extends 'rows' ? ThenResult<ColumnShapeOutput<Result>[keyof Result][][]> : ReturnType extends 'pluck' ? Result extends {
     pluck: ColumnType;
 } ? ThenResult<Result['pluck']['type'][]> : never : ReturnType extends 'rowCount' ? ThenResult<number> : ReturnType extends 'void' ? ThenResult<void> : never;
-declare type AddQuerySelect<T extends Pick<Query, 'result' | 'then' | 'returnType' | 'meta'>, Result extends ColumnsShapeBase> = T['meta']['hasSelect'] extends true ? Omit<T, 'result' | 'then'> & {
-    result: Spread<[T['result'], Result]>;
-    then: QueryThen<T['returnType'], Spread<[T['result'], Result]>>;
-} : Omit<T, 'result' | 'then'> & {
-    meta: {
+declare type AddQuerySelect<T extends Pick<Query, 'result' | 'then' | 'returnType' | 'meta'>, Result extends ColumnsShapeBase> = T['meta']['hasSelect'] extends true ? MergeSelect<T, Result> : {
+    [K in keyof T]: K extends 'meta' ? T['meta'] & {
         hasSelect: true;
-    };
-    result: Result;
-    then: QueryThen<T['returnType'], Result>;
+    } : K extends 'result' ? Result : K extends 'then' ? QueryThen<T['returnType'], Result> : T[K];
+};
+declare type MergeSelect<T extends Pick<Query, 'result' | 'then' | 'returnType' | 'meta'>, Result extends ColumnsShapeBase, Merged extends ColumnsShapeBase = {
+    [K in keyof T['result']]: K extends keyof Result ? unknown : T['result'][K];
+} & Result> = {
+    [K in keyof T]: K extends 'result' ? Merged : K extends 'then' ? QueryThen<T['returnType'], Merged> : T[K];
 };
 declare type SetQueryReturns<T extends Query, R extends QueryReturnType> = Omit<T, 'returnType' | 'then'> & {
     returnType: R;

package/dist/index.js

@@ -2529,8 +2529,22 @@ const pushInsertSql = (ctx, table, query, quotedAs) => {
       } else {
         ctx.sql.push(getRaw(expr, ctx.values));
       }
-    } else {
-      ctx.sql.push(`(${quotedColumns.join(", ")})`);
+    } else if (type === "merge") {
+      const { indexes } = table.internal;
+      const quotedUniques = query.columns.reduce((arr, key, i) => {
+        var _a2, _b2;
+        const unique = ((_b2 = ((_a2 = shape[key]) == null ? void 0 : _a2.data).indexes) == null ? void 0 : _b2.some(
+          (index) => index.unique
+        )) || indexes.some(
+          (index) => index.columns.some(
+            (item) => "column" in item && item.column === key
+          )
+        );
+        if (unique)
+          arr.push(quotedColumns[i]);
+        return arr;
+      }, []);
+      ctx.sql.push(`(${quotedUniques.join(", ")})`);
     }
     if (type === "ignore") {
       ctx.sql.push("DO NOTHING");
@@ -4961,11 +4975,14 @@ class Where {
     return this._orNot({ EXISTS: args });
   }
 }
+const emptyInternal = {
+  indexes: []
+};
 class WhereQueryBuilder extends Where {
   constructor(q, { shape, joinedShapes }) {
     super();
     this.withData = orchidCore.emptyObject;
-    this.internal = orchidCore.emptyObject;
+    this.internal = emptyInternal;
     this.table = typeof q === "object" ? q.table : q;
     this.shape = shape;
     this.query = {
@@ -5985,7 +6002,10 @@ class Db {
     this.whereQueryBuilder = WhereQueryBuilder;
     this.onQueryBuilder = OnQueryBuilder;
     var _a, _b;
-    this.internal = {};
+    const tableData = getTableData();
+    this.internal = {
+      indexes: tableData.indexes
+    };
     this.baseQuery = this;
     const logger = options.logger || console;
     const parsers = {};