pqb 0.11.31 → 0.11.33

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import * as orchid_core from 'orchid-core';
-import { Sql, QueryBaseCommon, ColumnsShapeBase, QueryInternal, QueryMetaBase, EmptyObject, RawExpression, ColumnTypeBase, MaybeArray, QueryResultRow, AdapterBase, QueryInput, ColumnsParsers, getValueKey, StringKey, ColumnOutput, QueryThen, QueryCatch, NullableColumn, EmptyTuple, ColumnTypesBase, ColumnShapeOutput, DefaultSelectColumns, DbBase, SetOptional, Spread, CoalesceString, QueryCommon, BaseNumberData, Code, ColumnWithDefault, numberTypeMethods, BaseStringData, PrimaryKeyColumn, DateTypeMethods, DateColumnData, EncodeColumn, ParseColumn, JSONTypeAny, record, ArrayMethodsData, arrayMethods, ForeignKeyTable, name, ColumnNameOfTable, ColumnDataBase, BaseOperators, ValidationContext, MessageParam } from 'orchid-core';
+import { Sql, QueryBaseCommon, ColumnsShapeBase, QueryInternal, QueryMetaBase, EmptyObject, RawExpression, ColumnTypeBase, MaybeArray, QueryResultRow, AdapterBase, QueryInput, ColumnsParsers, getValueKey, StringKey, ColumnOutput, QueryThen, QueryCatch, NullableColumn, EmptyTuple, ColumnTypesBase, ColumnShapeOutput, DefaultSelectColumns, DbBase, SetOptional, MergeObjects, CoalesceString, QueryCommon, Spread, BaseNumberData, Code, ColumnWithDefault, numberTypeMethods, BaseStringData, PrimaryKeyColumn, DateTypeMethods, DateColumnData, EncodeColumn, ParseColumn, JSONTypeAny, record, ArrayMethodsData, arrayMethods, ForeignKeyTable, name, ColumnNameOfTable, ColumnDataBase, BaseOperators, ValidationContext, MessageParam } from 'orchid-core';
 import { PoolConfig, Pool, PoolClient } from 'pg';
 import { inspect } from 'util';
 import { AsyncLocalStorage } from 'node:async_hooks';
@@ -200,7 +200,7 @@ type SimpleJoinItem = {
     ];
     isSubQuery: boolean;
 };
-type JoinLateralItem = [type: string, joined: Query, as?: string];
+type JoinLateralItem = [type: string, joined: Query, as: string];
 type WhereItem = (Omit<Record<string, unknown | Record<string, unknown | Query | RawExpression> | RawExpression>, 'NOT' | 'AND' | 'OR' | 'IN' | 'EXISTS' | 'ON' | 'ON_JSON_PATH_EQUALS'> & {
     NOT?: MaybeArray<WhereItem>;
     AND?: MaybeArray<WhereItem>;
@@ -310,6 +310,7 @@ declare class TransactionAdapter implements Adapter {
 
 type JoinedShapes = Record<string, ColumnsShapeBase>;
 type JoinedParsers = Record<string, ColumnsParsers>;
+type JoinOverrides = Record<string, string>;
 type CommonQueryData = {
     adapter: Adapter;
     shape: ColumnsShapeBase;
@@ -326,6 +327,7 @@ type CommonQueryData = {
     joinedParsers?: JoinedParsers;
     joinedForSelect?: string;
     innerJoinLateral?: true;
+    joinOverrides?: JoinOverrides;
     schema?: string;
     select?: SelectItem[];
     as?: string;
@@ -1436,15 +1438,10 @@ declare class QueryGet {
     _getOptional<T extends Query, Arg extends GetArg<T>>(this: T, arg: Arg): GetOptionalResult<T, Arg>;
 }
 
-type MergeQuery<T extends Query, Q extends Query, ReturnType extends QueryReturnType = QueryReturnType extends Q['returnType'] ? T['returnType'] : Q['returnType'], Data = T['meta']['hasSelect'] extends true ? GetQueryResult<ReturnType, Spread<[T['result'], Q['result']]>> : GetQueryResult<ReturnType, Q['result']>> = Omit<T, 'result' | 'returnType' | 'then' | 'catch' | 'selectable' | 'windows' | 'withData'> & {
-    meta: Q['meta'];
-    result: T['meta']['hasSelect'] extends true ? Spread<[T['result'], Q['result']]> : Q['result'];
-    returnType: ReturnType;
-    then: QueryThen<Data>;
-    catch: QueryCatch<Data>;
-    selectable: T['selectable'] & Q['selectable'];
-    windows: T['windows'] & Q['windows'];
-    withData: T['withData'] & Q['withData'];
+type MergeQuery<T extends Query, Q extends Query, ReturnType extends QueryReturnType = QueryReturnType extends Q['returnType'] ? T['returnType'] : Q['returnType'], Result extends ColumnsShapeBase = T['meta']['hasSelect'] extends true ? Q['meta']['hasSelect'] extends true ? {
+    [K in keyof T['result'] | keyof Q['result']]: K extends keyof Q['result'] ? Q['result'][K] : T['result'][K];
+} : T['result'] : Q['result'], Data = GetQueryResult<ReturnType, Result>> = {
+    [K in keyof T]: K extends 'meta' ? MergeObjects<T['meta'], Q['meta']> : K extends 'result' ? Result : K extends 'returnType' ? ReturnType : K extends 'then' ? QueryThen<Data> : K extends 'catch' ? QueryCatch<Data> : K extends 'selectable' ? T['selectable'] & Q['selectable'] : K extends 'windows' ? MergeObjects<T['windows'], Q['windows']> : K extends 'withData' ? MergeObjects<T['withData'], Q['withData']> : T[K];
 };
 declare class MergeQueryMethods {
     merge<T extends Query, Q extends Query>(this: T, q: Q): MergeQuery<T, Q>;
@@ -1510,6 +1507,9 @@ type OrderArg<T extends Query, Key extends PropertyKey = keyof T['selectable'] |
 } | RawExpression;
 type OrderArgs<T extends Query> = OrderArg<T>[] | [TemplateStringsArray, ...unknown[]];
 type FindArgs<T extends Query> = [T['shape'][T['singlePrimaryKey']]['type'] | RawExpression] | [TemplateStringsArray, ...unknown[]];
+type QueryHelper<T extends Query, Args extends unknown[], Result> = <Q extends {
+    [K in keyof T]: K extends 'then' ? QueryThen<unknown> : K extends 'result' ? ColumnsShapeBase : T[K];
+}>(q: Q, ...args: Args) => Result extends Query ? MergeQuery<Q, Result> : Result;
 interface QueryMethods extends Omit<AsMethods, 'result'>, Aggregate, Select, From, Join, With, Union, Json, Create, Update, Delete, Transaction, For, ColumnInfoMethods, Omit<Where, 'result'>, Clear, Having, Window, Then, QueryLog, QueryHooks, QueryUpsertOrCreate, QueryGet, MergeQueryMethods, RawSqlMethods, CopyMethods {
 }
 declare class QueryMethods {
@@ -1562,6 +1562,44 @@ declare class QueryMethods {
         restartIdentity?: boolean;
         cascade?: boolean;
     }): SetQueryReturnsVoid<T>;
+    /**
+     * Use `makeHelper` to make a query helper - a function where you can modify the query, and reuse this function across different places.
+     *
+     * ```ts
+     * const defaultAuthorSelect = db.author.makeHelper((q) => {
+     *   return q.select('firstName', 'lastName');
+     * });
+     *
+     * // this will select id, firstName, lastName with a correct TS type
+     * // and return a single record
+     * const result = await defaultAuthorSelect(db.author.select('id').find(1));
+     * ```
+     *
+     * Such helper is available for relation queries inside `select`:
+     *
+     * ```ts
+     * await db.book.select({
+     *   author: (book) => defaultAuthorSelect(book.author),
+     * });
+     * ```
+     *
+     * Helper can accept additional arguments:
+     *
+     * ```ts
+     * const selectFollowing = db.user.makeHelper((q, currentUser: { id: number }) => {
+     *   return q.select({
+     *     following: (q) =>
+     *       q.followers.where({ followerId: currentUser.id }).exists(),
+     *   });
+     * });
+     *
+     * // select some columns and the `following` boolean field from users
+     * await selectFollowing(db.user.select('id', 'name'), currentUser);
+     * ```
+     *
+     * @param fn - helper function
+     */
+    makeHelper<T extends Query, Args extends unknown[], Result>(this: T, fn: (q: T, ...args: Args) => Result): QueryHelper<T, Args, Result>;
 }
 
 type AggregateArg<T extends Query> = Expression<T> | Record<string, Expression<T>> | [Expression<T>, string];
@@ -3831,4 +3869,4 @@ declare const testTransaction: {
     close(arg: Arg): Promise<void>;
 };
 
-export { Adapter, AdapterConfig, AdapterOptions, AddQuerySelect, AddQueryWith, AfterHook, AfterHookKey, Aggregate, Aggregate1ArgumentTypes, AggregateArg, AggregateItem, AggregateItemArg, AggregateItemOptions, AggregateOptions, AliasOrTable, ArrayColumn, ArrayData, ArrayOfColumnsObjects, BaseRelation, BeforeHook, BeforeHookKey, BelongsToRelation, BigIntColumn, BigSerialColumn, BitColumn, BitVaryingColumn, BooleanColumn, BooleanExpression, BoxColumn, ByteaColumn, CharColumn, CidrColumn, CircleColumn, CitextColumn, Clear, ClearStatement, ColumnData, ColumnFromDbParams, ColumnInfo, ColumnInfoMethods, ColumnInfoQueryData, ColumnOperators, ColumnType, ColumnTypes, ColumnsObject, ColumnsShape, CommonQueryData, CopyOptions, CopyQueryData, Create, CreateCtx, CreateData, CreateMethodsNames, CustomTypeColumn, DateBaseColumn, DateColumn, DateTimeBaseClass, DateTimeTzBaseClass, Db, DbOptions, DbResult, DbTableOptions, DecimalBaseColumn, DecimalColumn, DefaultColumnTypes, Delete, DeleteMethodsNames, DeleteQueryData, DomainColumn, DoublePrecisionColumn, DropMode, EnumColumn, Expression, ExpressionOfType, ExpressionOutput, For, ForeignKey, ForeignKeyAction, ForeignKeyMatch, ForeignKeyOptions, From, FromArgs, FromResult, GetArg, GetQueryResult, HasAndBelongsToManyRelation, HasManyRelation, HasOneRelation, Having, HavingArg, HavingArgs, HavingItem, IdentityColumn, IndexColumnOptions, IndexOptions, InetColumn, InsertQueryData, IntegerBaseColumn, IntegerColumn, IntervalColumn, IsolationLevel, JSONColumn, JSONTextColumn, JSONTypes, Join, JoinArgs, JoinCallback, JoinFirstArg, JoinItem, JoinLateralCallback, JoinLateralItem, JoinLateralResult, JoinResult, JoinedParsers, JoinedShapes, Json, JsonItem, LimitedTextBaseColumn, LineColumn, LsegColumn, MacAddr8Column, MacAddrColumn, MergeQuery, MergeQueryMethods, MoneyColumn, MoreThanOneRowError, NoPrimaryKeyOption, NotFoundError, NumberAsStringBaseColumn, NumberBaseColumn, NumberColumn, NumberColumnData, NumberExpression, OnConflictItem, OnConflictMergeUpdate, OnConflictQueryBuilder, OnQueryBuilder, Operators, OrchidOrmError, OrchidOrmInternalError, OrderArg, OrderArgs, OrderItem, PathColumn, PluckResultColumnType, PointColumn, PolygonColumn, Query, QueryArraysResult, QueryBase, QueryData, QueryError, QueryErrorName, QueryGet, QueryHooks, QueryLog, QueryLogObject, QueryLogOptions, QueryLogger, QueryMethods, QueryResult, QueryReturnType, QueryReturnsAll, QueryUpsertOrCreate, QueryWithTable, RawSqlMethods, RealColumn, Relation, RelationQuery, RelationQueryBase, RelationQueryData, RelationsBase, Select, SelectAgg, SelectArg, SelectFunctionItem, SelectItem, SelectQueryData, Selectable, SelectableBase, SelectableFromShape, SerialColumn, SerialColumnData, SetQueryReturns, SetQueryReturnsAll, SetQueryReturnsColumnInfo, SetQueryReturnsOne, SetQueryReturnsOneOptional, SetQueryReturnsPluck, SetQueryReturnsRowCount, SetQueryReturnsRows, SetQueryReturnsValue, SetQueryReturnsValueOptional, SetQueryReturnsVoid, SetQueryTableAlias, SetQueryWith, SimpleJoinItem, SingleColumnIndexOptions, SmallIntColumn, SmallSerialColumn, SortDir, StringColumn, StringExpression, TableData, TextBaseColumn, TextColumn, TextColumnData, Then, TimeColumn, TimeInterval, TimestampColumn, TimestampTZColumn, ToSqlCtx, ToSqlOptions, Transaction, TransactionAdapter, TransactionOptions, TruncateQueryData, TsQueryColumn, TsVectorColumn, TypeParsers, UUIDColumn, UnhandledTypeError, Union, UnionArg, UnionItem, UnionKind, UnknownColumn, Update, UpdateCtx, UpdateData, UpdateQueryData, UpdateQueryDataItem, UpdateQueryDataObject, UpdatedAtDataInjector, UpsertCreateArg, UpsertData, UpsertResult, UpsertThis, VarCharColumn, VirtualColumn, Where, WhereArg, WhereArgs, WhereInArg, WhereInColumn, WhereInItem, WhereInValues, WhereItem, WhereJsonPathEqualsItem, WhereOnItem, WhereOnJoinItem, WhereQueryBuilder, WhereResult, WindowArg, WindowArgDeclaration, WindowDeclaration, WindowFunctionOptions, WindowItem, With, WithDataBase, WithDataItem, WithItem, WithOptions, XMLColumn, addOr, addOrNot, addParserForRawExpression, addParserForSelectItem, addQueryHook, addQueryOn, addQueryOrOn, addWhere, addWhereIn, addWhereNot, aggregate1FunctionNames, anyShape, checkIfASimpleQuery, cloneQueryArrays, columnCheckToCode, columnCode, columnForeignKeysToCode, columnIndexesToCode, columnTypes, utils as columnUtils, columnsByType, columnsShapeToCode, constraintPropsToCode, constraintToCode, createDb, foreignKeyArgumentToCode, getClonedQueryData, getColumnTypes, getConstraintKind, getQueryAs, getRaw, getShapeFromSelect, getTableData, handleResult, identityToCode, indexToCode, instantiateColumn, isQueryReturnsAll, isRequiredRelationKey, jsonTypes, logColors, logParamToLogObject, makeRegexToFindInSql, makeSql, newTableData, parseRecord, parseResult, primaryKeyToCode, processSelectArg, pushQueryArray, pushQueryOn, pushQueryOrOn, pushQueryValue, queryMethodByReturnType, queryTypeWithLimitOne, quote, quoteString, referencesArgsToCode, relationQueryKey, resetTableData, setQueryObjectValue, simplifyColumnDefault, testTransaction, toSql, toSqlCacheKey };
+export { Adapter, AdapterConfig, AdapterOptions, AddQuerySelect, AddQueryWith, AfterHook, AfterHookKey, Aggregate, Aggregate1ArgumentTypes, AggregateArg, AggregateItem, AggregateItemArg, AggregateItemOptions, AggregateOptions, AliasOrTable, ArrayColumn, ArrayData, ArrayOfColumnsObjects, BaseRelation, BeforeHook, BeforeHookKey, BelongsToRelation, BigIntColumn, BigSerialColumn, BitColumn, BitVaryingColumn, BooleanColumn, BooleanExpression, BoxColumn, ByteaColumn, CharColumn, CidrColumn, CircleColumn, CitextColumn, Clear, ClearStatement, ColumnData, ColumnFromDbParams, ColumnInfo, ColumnInfoMethods, ColumnInfoQueryData, ColumnOperators, ColumnType, ColumnTypes, ColumnsObject, ColumnsShape, CommonQueryData, CopyOptions, CopyQueryData, Create, CreateCtx, CreateData, CreateMethodsNames, CustomTypeColumn, DateBaseColumn, DateColumn, DateTimeBaseClass, DateTimeTzBaseClass, Db, DbOptions, DbResult, DbTableOptions, DecimalBaseColumn, DecimalColumn, DefaultColumnTypes, Delete, DeleteMethodsNames, DeleteQueryData, DomainColumn, DoublePrecisionColumn, DropMode, EnumColumn, Expression, ExpressionOfType, ExpressionOutput, For, ForeignKey, ForeignKeyAction, ForeignKeyMatch, ForeignKeyOptions, From, FromArgs, FromResult, GetArg, GetQueryResult, HasAndBelongsToManyRelation, HasManyRelation, HasOneRelation, Having, HavingArg, HavingArgs, HavingItem, IdentityColumn, IndexColumnOptions, IndexOptions, InetColumn, InsertQueryData, IntegerBaseColumn, IntegerColumn, IntervalColumn, IsolationLevel, JSONColumn, JSONTextColumn, JSONTypes, Join, JoinArgs, JoinCallback, JoinFirstArg, JoinItem, JoinLateralCallback, JoinLateralItem, JoinLateralResult, JoinOverrides, JoinResult, JoinedParsers, JoinedShapes, Json, JsonItem, LimitedTextBaseColumn, LineColumn, LsegColumn, MacAddr8Column, MacAddrColumn, MergeQuery, MergeQueryMethods, MoneyColumn, MoreThanOneRowError, NoPrimaryKeyOption, NotFoundError, NumberAsStringBaseColumn, NumberBaseColumn, NumberColumn, NumberColumnData, NumberExpression, OnConflictItem, OnConflictMergeUpdate, OnConflictQueryBuilder, OnQueryBuilder, Operators, OrchidOrmError, OrchidOrmInternalError, OrderArg, OrderArgs, OrderItem, PathColumn, PluckResultColumnType, PointColumn, PolygonColumn, Query, QueryArraysResult, QueryBase, QueryData, QueryError, QueryErrorName, QueryGet, QueryHooks, QueryLog, QueryLogObject, QueryLogOptions, QueryLogger, QueryMethods, QueryResult, QueryReturnType, QueryReturnsAll, QueryUpsertOrCreate, QueryWithTable, RawSqlMethods, RealColumn, Relation, RelationQuery, RelationQueryBase, RelationQueryData, RelationsBase, Select, SelectAgg, SelectArg, SelectFunctionItem, SelectItem, SelectQueryData, Selectable, SelectableBase, SelectableFromShape, SerialColumn, SerialColumnData, SetQueryReturns, SetQueryReturnsAll, SetQueryReturnsColumnInfo, SetQueryReturnsOne, SetQueryReturnsOneOptional, SetQueryReturnsPluck, SetQueryReturnsRowCount, SetQueryReturnsRows, SetQueryReturnsValue, SetQueryReturnsValueOptional, SetQueryReturnsVoid, SetQueryTableAlias, SetQueryWith, SimpleJoinItem, SingleColumnIndexOptions, SmallIntColumn, SmallSerialColumn, SortDir, StringColumn, StringExpression, TableData, TextBaseColumn, TextColumn, TextColumnData, Then, TimeColumn, TimeInterval, TimestampColumn, TimestampTZColumn, ToSqlCtx, ToSqlOptions, Transaction, TransactionAdapter, TransactionOptions, TruncateQueryData, TsQueryColumn, TsVectorColumn, TypeParsers, UUIDColumn, UnhandledTypeError, Union, UnionArg, UnionItem, UnionKind, UnknownColumn, Update, UpdateCtx, UpdateData, UpdateQueryData, UpdateQueryDataItem, UpdateQueryDataObject, UpdatedAtDataInjector, UpsertCreateArg, UpsertData, UpsertResult, UpsertThis, VarCharColumn, VirtualColumn, Where, WhereArg, WhereArgs, WhereInArg, WhereInColumn, WhereInItem, WhereInValues, WhereItem, WhereJsonPathEqualsItem, WhereOnItem, WhereOnJoinItem, WhereQueryBuilder, WhereResult, WindowArg, WindowArgDeclaration, WindowDeclaration, WindowFunctionOptions, WindowItem, With, WithDataBase, WithDataItem, WithItem, WithOptions, XMLColumn, addOr, addOrNot, addParserForRawExpression, addParserForSelectItem, addQueryHook, addQueryOn, addQueryOrOn, addWhere, addWhereIn, addWhereNot, aggregate1FunctionNames, anyShape, checkIfASimpleQuery, cloneQueryArrays, columnCheckToCode, columnCode, columnForeignKeysToCode, columnIndexesToCode, columnTypes, utils as columnUtils, columnsByType, columnsShapeToCode, constraintPropsToCode, constraintToCode, createDb, foreignKeyArgumentToCode, getClonedQueryData, getColumnTypes, getConstraintKind, getQueryAs, getRaw, getShapeFromSelect, getTableData, handleResult, identityToCode, indexToCode, instantiateColumn, isQueryReturnsAll, isRequiredRelationKey, jsonTypes, logColors, logParamToLogObject, makeRegexToFindInSql, makeSql, newTableData, parseRecord, parseResult, primaryKeyToCode, processSelectArg, pushQueryArray, pushQueryOn, pushQueryOrOn, pushQueryValue, queryMethodByReturnType, queryTypeWithLimitOne, quote, quoteString, referencesArgsToCode, relationQueryKey, resetTableData, setQueryObjectValue, simplifyColumnDefault, testTransaction, toSql, toSqlCacheKey };

package/dist/index.js

@@ -174,42 +174,46 @@ const getJoinedColumnName = (data, shape, table, key, isOwnColumn) => {
   return (_c = (isOwnColumn ? shape[key] : void 0) || ((_b = (_a = data.joinedShapes) == null ? void 0 : _a[table]) == null ? void 0 : _b[key])) == null ? void 0 : _c.data.name;
 };
 const revealColumnToSql = (data, shape, column, quotedAs, select) => {
-  var _a, _b;
+  var _a, _b, _c;
   const index = column.indexOf(".");
   if (index !== -1) {
     const table = column.slice(0, index);
     const key = column.slice(index + 1);
-    const quoted = q(table);
-    return `${quoted}.${q(
-      getJoinedColumnName(data, shape, table, key, quoted === quotedAs) || key
-    )}`;
-  } else if ((_a = data.joinedShapes) == null ? void 0 : _a[column]) {
+    const tableName = ((_a = data.joinOverrides) == null ? void 0 : _a[table]) || table;
+    return `"${tableName}"."${getJoinedColumnName(
+      data,
+      shape,
+      tableName,
+      key,
+      `"${table}"` === quotedAs
+    ) || key}"`;
+  } else if ((_b = data.joinedShapes) == null ? void 0 : _b[column]) {
     return select ? `row_to_json("${column}".*)` : `"${column}".r`;
   } else if (quotedAs && shape[column]) {
     return `${quotedAs}.${q(shape[column].data.name || column)}`;
   } else {
-    return q(((_b = shape[column]) == null ? void 0 : _b.data.name) || column);
+    return q(((_c = shape[column]) == null ? void 0 : _c.data.name) || column);
   }
 };
 const revealColumnToSqlWithAs = (data, column, quotedAs, select) => {
-  var _a, _b;
+  var _a, _b, _c;
   const index = column.indexOf(".");
   if (index !== -1) {
     const table = column.slice(0, index);
     const key = column.slice(index + 1);
-    const quoted = q(table);
+    const tableName = ((_a = data.joinOverrides) == null ? void 0 : _a[table]) || table;
     const name = getJoinedColumnName(
       data,
       data.shape,
       table,
       key,
-      quoted === quotedAs
+      `"${table}"` === quotedAs
     );
-    return `${quoted}.${q(name || key)}${name && name !== key ? ` AS ${q(key)}` : ""}`;
-  } else if ((_a = data.joinedShapes) == null ? void 0 : _a[column]) {
+    return `"${tableName}"."${name || key}"${name && name !== key ? ` AS "${key}"` : ""}`;
+  } else if ((_b = data.joinedShapes) == null ? void 0 : _b[column]) {
     return select ? `row_to_json("${column}".*) "${column}"` : `"${column}".r "${column}"`;
   } else {
-    const name = (_b = data.shape[column]) == null ? void 0 : _b.data.name;
+    const name = (_c = data.shape[column]) == null ? void 0 : _c.data.name;
     return `${quotedAs ? `${quotedAs}.` : ""}${q(name || column)}${name && name !== column ? ` AS ${q(column)}` : ""}`;
   }
 };
@@ -1899,12 +1903,14 @@ const getObjectOrRawConditions = (query, data, values, quotedAs, joinAs, joinSha
 };
 const pushJoinSql = (ctx, table, query, quotedAs) => {
   query.join.forEach((item) => {
+    var _a;
     if (Array.isArray(item)) {
       const q2 = item[1];
       const { aliasValue } = ctx;
       ctx.aliasValue = true;
+      const as = item[2];
       ctx.sql.push(
-        `${item[0]} LATERAL (${q2.toSql(ctx).text}) "${item[2] || getQueryAs(q2)}" ON true`
+        `${item[0]} LATERAL (${q2.toSql(ctx).text}) "${((_a = query.joinOverrides) == null ? void 0 : _a[as]) || as}" ON true`
       );
       ctx.aliasValue = aliasValue;
     } else {
@@ -3658,11 +3664,22 @@ class Adapter {
   }
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   query(query, types2) {
-    return performQuery(this.pool, query, types2, this.schema);
+    return performQuery(
+      this.pool,
+      query,
+      types2,
+      this.schema
+    );
   }
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   arrays(query, types2) {
-    return performQuery(this.pool, query, types2, this.schema, "array");
+    return performQuery(
+      this.pool,
+      query,
+      types2,
+      this.schema,
+      "array"
+    );
   }
   async transaction(begin, cb) {
     const client = await this.pool.connect();
@@ -4400,7 +4417,11 @@ const _joinLateral = (q, type, arg, cb, as) => {
     setQueryObjectValue(q, "joinedShapes", joinKey, shape);
     setQueryObjectValue(q, "joinedParsers", joinKey, result.query.parsers);
   }
-  return pushQueryValue(q, "join", [type, result, as]);
+  return pushQueryValue(q, "join", [
+    type,
+    result,
+    as || getQueryAs(result)
+  ]);
 };
 
 const addParserForRawExpression = (q, key, raw2) => {
@@ -4470,7 +4491,7 @@ const addParserForSelectItem = (q, as, key, arg) => {
   }
 };
 const processSelectArg = (q, as, arg, columnAs) => {
-  var _a;
+  var _a, _b, _c, _d;
   if (typeof arg === "string") {
     if ((_a = q.query.joinedShapes) == null ? void 0 : _a[arg]) {
       addParsersForSelectJoined(q, arg);
@@ -4489,7 +4510,6 @@ const processSelectArg = (q, as, arg, columnAs) => {
       q.isSubQuery = isSubQuery;
       if (!orchidCore.isRaw(value) && value.joinQuery) {
         value = value.joinQuery(q, value);
-        value.query.joinedForSelect = key;
         let query;
         const returnType = value.query.returnType;
         if (!returnType || returnType === "all") {
@@ -4508,6 +4528,17 @@ const processSelectArg = (q, as, arg, columnAs) => {
           }
           query = value;
         }
+        let asOverride = key;
+        let suffix = "";
+        if ((_b = value.query.joinedShapes) == null ? void 0 : _b[key]) {
+          suffix = 2;
+          const joinOverrides = (_d = (_c = q.query).joinOverrides) != null ? _d : _c.joinOverrides = {};
+          while (joinOverrides[asOverride = `${key}${suffix}`]) {
+            suffix++;
+          }
+          joinOverrides[key] = asOverride;
+        }
+        value.query.joinedForSelect = asOverride;
         _joinLateral(
           q,
           value.query.innerJoinLateral ? "JOIN" : "LEFT JOIN",
@@ -6582,6 +6613,46 @@ class QueryMethods {
     }
     return this._exec();
   }
+  /**
+   * Use `makeHelper` to make a query helper - a function where you can modify the query, and reuse this function across different places.
+   *
+   * ```ts
+   * const defaultAuthorSelect = db.author.makeHelper((q) => {
+   *   return q.select('firstName', 'lastName');
+   * });
+   *
+   * // this will select id, firstName, lastName with a correct TS type
+   * // and return a single record
+   * const result = await defaultAuthorSelect(db.author.select('id').find(1));
+   * ```
+   *
+   * Such helper is available for relation queries inside `select`:
+   *
+   * ```ts
+   * await db.book.select({
+   *   author: (book) => defaultAuthorSelect(book.author),
+   * });
+   * ```
+   *
+   * Helper can accept additional arguments:
+   *
+   * ```ts
+   * const selectFollowing = db.user.makeHelper((q, currentUser: { id: number }) => {
+   *   return q.select({
+   *     following: (q) =>
+   *       q.followers.where({ followerId: currentUser.id }).exists(),
+   *   });
+   * });
+   *
+   * // select some columns and the `following` boolean field from users
+   * await selectFollowing(db.user.select('id', 'name'), currentUser);
+   * ```
+   *
+   * @param fn - helper function
+   */
+  makeHelper(fn) {
+    return fn;
+  }
 }
 orchidCore.applyMixins(QueryMethods, [
   QueryBase,