pqb 0.46.1 → 0.46.4

package/dist/index.d.ts

@@ -344,7 +344,7 @@ interface HandleResult {
 }
 interface CommonQueryData {
     adapter: Adapter;
-    shape: ColumnsShapeBase;
+    shape: ColumnsShape;
     patchResult?(q: Query, hookSelect: HookSelect | undefined, queryResult: QueryResult): Promise<void>;
     handleResult: HandleResult;
     returnType: QueryReturnType;
@@ -368,6 +368,10 @@ interface CommonQueryData {
     outerAliases?: RecordString;
     schema?: string;
     select?: SelectItem[];
+    selectCache?: {
+        sql: string;
+        aliases: string[];
+    };
     selectAllColumns?: string[];
     selectAllKeys?: RecordUnknown;
     /**
@@ -3286,7 +3290,7 @@ declare class TsVectorColumn<Schema extends ColumnSchemaConfig> extends ColumnTy
      *
      * @param args
      */
-    generated<T extends PickColumnData>(this: T, ...args: StaticSQLArgs | [language: string, columns: TsVectorGeneratedColumns] | [columns: TsVectorGeneratedColumns]): T;
+    generated<T extends PickColumnData>(this: T, ...args: StaticSQLArgs | [language: string, columns: TsVectorGeneratedColumns] | [columns: TsVectorGeneratedColumns]): GeneratedColumn<T>;
 }
 declare class TsQueryColumn<Schema extends ColumnSchemaConfig> extends ColumnType<Schema, string, ReturnType<Schema['stringSchema']>, OperatorsText> {
     dataType: "tsquery";
@@ -3707,6 +3711,7 @@ declare const _initQueryBuilder: (adapter: Adapter, columnTypes: unknown, transa
 
 interface ToSQLCtx {
     queryBuilder: Db;
+    q: QueryData;
     sql: string[];
     values: unknown[];
     aliasValue?: true;
@@ -8102,7 +8107,13 @@ interface ColumnData extends ColumnDataBase {
     foreignKeys?: TableData.ColumnReferences[];
     identity?: TableData.Identity;
     generated?: ColumnDataGenerated;
+    readonly?: boolean;
 }
+type GeneratedColumn<T extends PickColumnData> = {
+    [K in keyof T]: K extends 'data' ? {
+        [K in keyof T['data']]: K extends 'default' ? true : T['data'][K];
+    } : K extends 'inputType' ? never : T[K];
+};
 interface ColumnDataGenerated {
     toSQL(ctx: {
         values: unknown[];
@@ -8450,7 +8461,7 @@ declare abstract class ColumnType<Schema extends ColumnTypeSchemaArg = ColumnTyp
      *
      * @param args - raw SQL
      */
-    generated<T extends PickColumnData>(this: T, ...args: StaticSQLArgs): T;
+    generated<T extends PickColumnData>(this: T, ...args: StaticSQLArgs): GeneratedColumn<T>;
 }
 
 declare class BooleanColumn<Schema extends ColumnSchemaConfig> extends ColumnType<Schema, boolean, ReturnType<Schema['boolean']>, OperatorsBoolean> {
@@ -8824,4 +8835,4 @@ type CopyResult<T extends PickQueryMeta> = SetQueryKind<T, 'copy'>;
  */
 declare function copyTableData<T extends PickQueryMetaShape>(query: T, arg: CopyArg<T>): CopyResult<T>;
 
-export { Adapter, type AdapterConfig, type AdapterOptions, type AddQueryDefaults, AfterCommitError, type AfterCommitErrorFulfilledResult, type AfterCommitErrorRejectedResult, type AfterCommitErrorResult, type AfterHook, type AggregateArgTypes, AggregateMethods, type AggregateOptions, type AliasOrTable, ArrayColumn, type ArrayColumnValue, type ArrayData, AsMethods, type AsQueryArg, BigIntColumn, BigSerialColumn, BitColumn, BitVaryingColumn, BooleanColumn, type BooleanQueryColumn, BoxColumn, ByteaColumn, type ChangeCountArg, CidrColumn, CircleColumn, CitextColumn, Clear, type ClearStatement, type ColumnData, type ColumnDataGenerated, type ColumnFromDbParams, type ColumnInfoQueryData, ColumnRefExpression, ColumnType, type ColumnsByType, type ColumnsShape, type ColumnsShapeToNullableObject, type ColumnsShapeToObject, type ColumnsShapeToObjectArray, type ColumnsShapeToPluck, type CommonQueryData, ComputedColumn, type ComputedColumns, type ComputedColumnsFromOptions, type ComputedMethods, type ComputedOptionsFactory, type CopyOptions, type CopyQueryData, Create, type CreateBelongsToData, type CreateColumn, type CreateCtx, type CreateData, type CreateKind, type CreateMethodsNames, type CreateRelationsData, type CreateRelationsDataOmittingFKeys, type CreateResult, type CreateSelf, CustomTypeColumn, DateBaseColumn, DateColumn, type DateColumnInput, DateTimeBaseClass, DateTimeTzBaseClass, Db, type DbDomainArg, type DbDomainArgRecord, type DbExtension, type DbOptions, type DbResult, type DbSharedOptions, type DbTableConstructor, type DbTableOptionScopes, type DbTableOptions, DecimalColumn, type DecimalColumnData, type DefaultColumnTypes, type DefaultSchemaConfig, Delete, type DeleteArgs, type DeleteMethodsNames, type DeleteQueryData, type DeleteResult, DomainColumn, DoublePrecisionColumn, DynamicRawSQL, EnumColumn, ExpressionMethods, type ExpressionOutput, FnExpression, type FnExpressionArgs, type FnExpressionArgsPairs, type FnExpressionArgsValue, For, type FromArg, FromMethods, type FromQuerySelf, type FromResult, type GeneratorIgnore, type GetArg, type GetColumnInfo, type GetResult, type GetResultOptional, type GetStringArg, type GroupArgs, type HandleResult, Having, type HavingItem, type HookAction, type HookSelectArg, type IdentityColumn, InetColumn, type InsertQueryData, IntegerBaseColumn, IntegerColumn, IntervalColumn, type IsolationLevel, JSONColumn, JSONTextColumn, Join, type JoinArgToQuery, type JoinArgs, type JoinCallback, type JoinFirstArg, type JoinItem, type JoinItemArgs, type JoinLateralItem, type JoinLateralResult, type JoinQueryBuilder, type JoinQueryMethod, type JoinResult, type JoinedParsers, type JoinedShapes, JsonMethods, LimitedTextBaseColumn, LineColumn, LsegColumn, MacAddr8Column, MacAddrColumn, type MapTableScopesOption, type MergeQuery, MergeQueryMethods, MoneyColumn, MoreThanOneRowError, type NoPrimaryKeyOption, type NonUniqDataItem, NotFoundError, NumberAsStringBaseColumn, NumberBaseColumn, type NumberColumnData, type NumericColumns, type OnConflictMerge, OnConflictQueryBuilder, type OnConflictSet, type OnConflictTarget, OnMethods, type Operator, Operators, type OperatorsAny, type OperatorsArray, type OperatorsBoolean, type OperatorsDate, type OperatorsJson, type OperatorsNumber, type OperatorsText, type OperatorsTime, type OrCreateArg, OrExpression, OrchidOrmError, OrchidOrmInternalError, type OrderArg, type OrderArgSelf, type OrderArgs, type OrderItem, type OrderTsQueryConfig, type Over, PathColumn, type PickColumnData, type PickQueryBaseQuery, type PickQueryColumnTypes, type PickQueryDataShapeAndJoinedShapes, type PickQueryInternal, type PickQueryMetaColumnTypes, type PickQueryMetaRelations, type PickQueryMetaRelationsResult, type PickQueryMetaRelationsResultReturnType, type PickQueryMetaResultRelations, type PickQueryMetaResultRelationsWindows, type PickQueryMetaResultRelationsWindowsColumnTypes, type PickQueryMetaResultRelationsWithDataReturnType, type PickQueryMetaResultRelationsWithDataReturnTypeShape, type PickQueryMetaResultReturnTypeWithDataWindows, type PickQueryMetaResultReturnTypeWithDataWindowsThen, type PickQueryMetaShapeRelationsWithData, type PickQueryMetaTable, type PickQueryMetaTableShape, type PickQueryMetaTableShapeReturnTypeWithData, type PickQueryMetaWithData, type PickQueryMetaWithDataColumnTypes, type PickQueryQ, type PickQueryQAndBaseQuery, type PickQueryQAndInternal, type PickQueryRelations, type PickQueryRelationsWithData, type PickQueryResultColumnTypes, type PickQueryShapeResultReturnTypeSinglePrimaryKey, type PickQueryShapeResultSinglePrimaryKey, type PickQueryShapeSinglePrimaryKey, type PickQuerySinglePrimaryKey, type PickQueryWindows, type PickQueryWithData, type PickQueryWithDataColumnTypes, PointColumn, PolygonColumn, PostgisGeographyPointColumn, type PostgisPoint, type Query, type QueryAfterHook, type QueryArraysResult, type QueryBatchResult, type QueryBeforeHook, type QueryComputedArg, type QueryData, type QueryDataFromItem, type QueryDataJoinTo, type QueryDefaultReturnData, QueryError, type QueryErrorName, QueryGet, type QueryGetSelf, type QueryHelperResult, QueryHooks, type QueryIfResultThen, type QueryInternal, QueryLog, type QueryMetaHasSelect, type QueryMetaHasWhere, QueryMethods, type QueryOrExpression, type QueryOrExpressionBooleanOrNullResult, type QueryResult, type QueryScopeData, type QueryScopes, type QuerySourceItem, type QueryTake, type QueryTakeOptional, QueryUpsertOrCreate, RawSQL, RealColumn, type RecordOfColumnsShapeBase, RefExpression, type RelationConfigBase, type RelationConfigDataForCreate, type RelationJoinQuery, type RelationQueryBase, type RelationsBase, type RuntimeComputedQueryColumn, type SearchArg, SearchMethods, type SearchWeight, type SearchWeightRecord, Select, type SelectArg, type SelectArgs, type SelectAs, type SelectAsValue, type SelectItem, type SelectQueryData, type SelectSubQueryResult, type SelectableFromShape, type SelectableOfType, type SelectableOrExpression, type SelectableOrExpressionOfType, type SelectableOrExpressions, SerialColumn, type SerialColumnData, type SetQueryKind, type SetQueryKindResult, type SetQueryReturnsAll, type SetQueryReturnsAllKind, type SetQueryReturnsAllKindResult, type SetQueryReturnsColumnInfo, type SetQueryReturnsColumnKind, type SetQueryReturnsColumnKindResult, type SetQueryReturnsColumnOptional, type SetQueryReturnsColumnOrThrow, type SetQueryReturnsOneKind, type SetQueryReturnsOneKindResult, type SetQueryReturnsPluck, type SetQueryReturnsPluckColumn, type SetQueryReturnsPluckColumnKind, type SetQueryReturnsPluckColumnKindResult, type SetQueryReturnsRowCount, type SetQueryReturnsRowCountMany, type SetQueryReturnsRows, type SetQueryReturnsValueOptional, type SetQueryReturnsValueOrThrow, type SetQueryReturnsVoid, type SetQueryReturnsVoidKind, type SetQueryTableAlias, type ShapeColumnPrimaryKeys, type ShapeUniqueColumns, type SimpleJoinItem, type SimpleJoinItemNonSubQueryArgs, SmallIntColumn, SmallSerialColumn, type SortDir, type SqlFn, SqlMethod, StringColumn$1 as StringColumn, TableData, type TableDataFn, type TableDataInput, type TableDataItem, type TableDataItemsUniqueColumnTuples, type TableDataItemsUniqueColumns, type TableDataItemsUniqueConstraints, type TableDataMethods, TextBaseColumn, TextColumn, type TextColumnData, Then, TimeColumn, TimestampColumn, TimestampTZColumn, type ToSQLCtx, type ToSQLOptions, type ToSQLQuery, Transaction, TransactionAdapter, type TransactionOptions, TransformMethods, type TruncateQueryData, TsQueryColumn, TsVectorColumn, type TypeParsers, UUIDColumn, UnhandledTypeError, Union, type UnionArgs, type UnionItem, type UnionKind, type UnionSet, type UniqueConstraints, type UniqueQueryTypeOrExpression, type UniqueTableDataItem, UnknownColumn, Update, type UpdateArg, type UpdateCtx, type UpdateCtxCollect, type UpdateData, type UpdateQueryData, type UpdateQueryDataItem, type UpdateQueryDataObject, type UpdateSelf, type UpdatedAtDataInjector, type UpsertResult, type UpsertThis, VarCharColumn, VirtualColumn, Where, type WhereArg, type WhereArgs, type WhereInArg, type WhereInColumn, type WhereInItem, type WhereInValues, type WhereItem, type WhereJsonPathEqualsItem, type WhereNotArgs, type WhereOnItem, type WhereOnJoinItem, type WhereQueryBuilder, type WhereResult, type WhereSearchItem, type WhereSearchResult, type WindowArg, type WindowArgDeclaration, type WindowDeclaration, type WindowItem, type WithArgsOptions, type WithConfigs, type WithDataItem, type WithDataItems, type WithItem, WithMethods, type WithOptions, type WithQueryBuilder, type WithRecursiveOptions, type WithResult, type WithSqlResult, type 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, cloneQueryBaseUnscoped, columnCheckToCode, columnCode, columnExcludesToCode, columnForeignKeysToCode, columnIndexesToCode, columnsShapeToCode, commitSql, constraintInnerToCode, constraintToCode, copyTableData, countSelect, createDb, defaultSchemaConfig, escapeForLog, escapeForMigration, escapeString, excludeInnerToCode, excludeToCode, extendQuery, filterResult, foreignKeyArgumentToCode, getClonedQueryData, getColumnInfo, getColumnTypes, getFullColumnTable, 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, pushQueryArrayImmutable, pushQueryOn, pushQueryOnForOuter, pushQueryOrOn, pushQueryValueImmutable, pushTableDataCode, queryFrom, queryFromSql, queryJson, queryMethodByReturnType, queryTypeWithLimitOne, queryWrap, raw, referencesArgsToCode, resolveSubQueryCallbackV2, rollbackSql, saveSearchAlias, setColumnDefaultParse, setColumnEncode, setColumnParse, setColumnParseNull, setParserForSelectedString, setQueryObjectValueImmutable, setQueryOperators, simplifyColumnDefault, sqlFn, sqlQueryArgsToExpression, tableDataMethods, templateLiteralToSQL, testTransaction, throwIfJoinLateral, throwIfNoWhere, toSQL };
+export { Adapter, type AdapterConfig, type AdapterOptions, type AddQueryDefaults, AfterCommitError, type AfterCommitErrorFulfilledResult, type AfterCommitErrorRejectedResult, type AfterCommitErrorResult, type AfterHook, type AggregateArgTypes, AggregateMethods, type AggregateOptions, type AliasOrTable, ArrayColumn, type ArrayColumnValue, type ArrayData, AsMethods, type AsQueryArg, BigIntColumn, BigSerialColumn, BitColumn, BitVaryingColumn, BooleanColumn, type BooleanQueryColumn, BoxColumn, ByteaColumn, type ChangeCountArg, CidrColumn, CircleColumn, CitextColumn, Clear, type ClearStatement, type ColumnData, type ColumnDataGenerated, type ColumnFromDbParams, type ColumnInfoQueryData, ColumnRefExpression, ColumnType, type ColumnsByType, type ColumnsShape, type ColumnsShapeToNullableObject, type ColumnsShapeToObject, type ColumnsShapeToObjectArray, type ColumnsShapeToPluck, type CommonQueryData, ComputedColumn, type ComputedColumns, type ComputedColumnsFromOptions, type ComputedMethods, type ComputedOptionsFactory, type CopyOptions, type CopyQueryData, Create, type CreateBelongsToData, type CreateColumn, type CreateCtx, type CreateData, type CreateKind, type CreateMethodsNames, type CreateRelationsData, type CreateRelationsDataOmittingFKeys, type CreateResult, type CreateSelf, CustomTypeColumn, DateBaseColumn, DateColumn, type DateColumnInput, DateTimeBaseClass, DateTimeTzBaseClass, Db, type DbDomainArg, type DbDomainArgRecord, type DbExtension, type DbOptions, type DbResult, type DbSharedOptions, type DbTableConstructor, type DbTableOptionScopes, type DbTableOptions, DecimalColumn, type DecimalColumnData, type DefaultColumnTypes, type DefaultSchemaConfig, Delete, type DeleteArgs, type DeleteMethodsNames, type DeleteQueryData, type DeleteResult, DomainColumn, DoublePrecisionColumn, DynamicRawSQL, EnumColumn, ExpressionMethods, type ExpressionOutput, FnExpression, type FnExpressionArgs, type FnExpressionArgsPairs, type FnExpressionArgsValue, For, type FromArg, FromMethods, type FromQuerySelf, type FromResult, type GeneratedColumn, type GeneratorIgnore, type GetArg, type GetColumnInfo, type GetResult, type GetResultOptional, type GetStringArg, type GroupArgs, type HandleResult, Having, type HavingItem, type HookAction, type HookSelectArg, type IdentityColumn, InetColumn, type InsertQueryData, IntegerBaseColumn, IntegerColumn, IntervalColumn, type IsolationLevel, JSONColumn, JSONTextColumn, Join, type JoinArgToQuery, type JoinArgs, type JoinCallback, type JoinFirstArg, type JoinItem, type JoinItemArgs, type JoinLateralItem, type JoinLateralResult, type JoinQueryBuilder, type JoinQueryMethod, type JoinResult, type JoinedParsers, type JoinedShapes, JsonMethods, LimitedTextBaseColumn, LineColumn, LsegColumn, MacAddr8Column, MacAddrColumn, type MapTableScopesOption, type MergeQuery, MergeQueryMethods, MoneyColumn, MoreThanOneRowError, type NoPrimaryKeyOption, type NonUniqDataItem, NotFoundError, NumberAsStringBaseColumn, NumberBaseColumn, type NumberColumnData, type NumericColumns, type OnConflictMerge, OnConflictQueryBuilder, type OnConflictSet, type OnConflictTarget, OnMethods, type Operator, Operators, type OperatorsAny, type OperatorsArray, type OperatorsBoolean, type OperatorsDate, type OperatorsJson, type OperatorsNumber, type OperatorsText, type OperatorsTime, type OrCreateArg, OrExpression, OrchidOrmError, OrchidOrmInternalError, type OrderArg, type OrderArgSelf, type OrderArgs, type OrderItem, type OrderTsQueryConfig, type Over, PathColumn, type PickColumnData, type PickQueryBaseQuery, type PickQueryColumnTypes, type PickQueryDataShapeAndJoinedShapes, type PickQueryInternal, type PickQueryMetaColumnTypes, type PickQueryMetaRelations, type PickQueryMetaRelationsResult, type PickQueryMetaRelationsResultReturnType, type PickQueryMetaResultRelations, type PickQueryMetaResultRelationsWindows, type PickQueryMetaResultRelationsWindowsColumnTypes, type PickQueryMetaResultRelationsWithDataReturnType, type PickQueryMetaResultRelationsWithDataReturnTypeShape, type PickQueryMetaResultReturnTypeWithDataWindows, type PickQueryMetaResultReturnTypeWithDataWindowsThen, type PickQueryMetaShapeRelationsWithData, type PickQueryMetaTable, type PickQueryMetaTableShape, type PickQueryMetaTableShapeReturnTypeWithData, type PickQueryMetaWithData, type PickQueryMetaWithDataColumnTypes, type PickQueryQ, type PickQueryQAndBaseQuery, type PickQueryQAndInternal, type PickQueryRelations, type PickQueryRelationsWithData, type PickQueryResultColumnTypes, type PickQueryShapeResultReturnTypeSinglePrimaryKey, type PickQueryShapeResultSinglePrimaryKey, type PickQueryShapeSinglePrimaryKey, type PickQuerySinglePrimaryKey, type PickQueryWindows, type PickQueryWithData, type PickQueryWithDataColumnTypes, PointColumn, PolygonColumn, PostgisGeographyPointColumn, type PostgisPoint, type Query, type QueryAfterHook, type QueryArraysResult, type QueryBatchResult, type QueryBeforeHook, type QueryComputedArg, type QueryData, type QueryDataFromItem, type QueryDataJoinTo, type QueryDefaultReturnData, QueryError, type QueryErrorName, QueryGet, type QueryGetSelf, type QueryHelperResult, QueryHooks, type QueryIfResultThen, type QueryInternal, QueryLog, type QueryMetaHasSelect, type QueryMetaHasWhere, QueryMethods, type QueryOrExpression, type QueryOrExpressionBooleanOrNullResult, type QueryResult, type QueryScopeData, type QueryScopes, type QuerySourceItem, type QueryTake, type QueryTakeOptional, QueryUpsertOrCreate, RawSQL, RealColumn, type RecordOfColumnsShapeBase, RefExpression, type RelationConfigBase, type RelationConfigDataForCreate, type RelationJoinQuery, type RelationQueryBase, type RelationsBase, type RuntimeComputedQueryColumn, type SearchArg, SearchMethods, type SearchWeight, type SearchWeightRecord, Select, type SelectArg, type SelectArgs, type SelectAs, type SelectAsValue, type SelectItem, type SelectQueryData, type SelectSubQueryResult, type SelectableFromShape, type SelectableOfType, type SelectableOrExpression, type SelectableOrExpressionOfType, type SelectableOrExpressions, SerialColumn, type SerialColumnData, type SetQueryKind, type SetQueryKindResult, type SetQueryReturnsAll, type SetQueryReturnsAllKind, type SetQueryReturnsAllKindResult, type SetQueryReturnsColumnInfo, type SetQueryReturnsColumnKind, type SetQueryReturnsColumnKindResult, type SetQueryReturnsColumnOptional, type SetQueryReturnsColumnOrThrow, type SetQueryReturnsOneKind, type SetQueryReturnsOneKindResult, type SetQueryReturnsPluck, type SetQueryReturnsPluckColumn, type SetQueryReturnsPluckColumnKind, type SetQueryReturnsPluckColumnKindResult, type SetQueryReturnsRowCount, type SetQueryReturnsRowCountMany, type SetQueryReturnsRows, type SetQueryReturnsValueOptional, type SetQueryReturnsValueOrThrow, type SetQueryReturnsVoid, type SetQueryReturnsVoidKind, type SetQueryTableAlias, type ShapeColumnPrimaryKeys, type ShapeUniqueColumns, type SimpleJoinItem, type SimpleJoinItemNonSubQueryArgs, SmallIntColumn, SmallSerialColumn, type SortDir, type SqlFn, SqlMethod, StringColumn$1 as StringColumn, TableData, type TableDataFn, type TableDataInput, type TableDataItem, type TableDataItemsUniqueColumnTuples, type TableDataItemsUniqueColumns, type TableDataItemsUniqueConstraints, type TableDataMethods, TextBaseColumn, TextColumn, type TextColumnData, Then, TimeColumn, TimestampColumn, TimestampTZColumn, type ToSQLCtx, type ToSQLOptions, type ToSQLQuery, Transaction, TransactionAdapter, type TransactionOptions, TransformMethods, type TruncateQueryData, TsQueryColumn, TsVectorColumn, type TypeParsers, UUIDColumn, UnhandledTypeError, Union, type UnionArgs, type UnionItem, type UnionKind, type UnionSet, type UniqueConstraints, type UniqueQueryTypeOrExpression, type UniqueTableDataItem, UnknownColumn, Update, type UpdateArg, type UpdateCtx, type UpdateCtxCollect, type UpdateData, type UpdateQueryData, type UpdateQueryDataItem, type UpdateQueryDataObject, type UpdateSelf, type UpdatedAtDataInjector, type UpsertResult, type UpsertThis, VarCharColumn, VirtualColumn, Where, type WhereArg, type WhereArgs, type WhereInArg, type WhereInColumn, type WhereInItem, type WhereInValues, type WhereItem, type WhereJsonPathEqualsItem, type WhereNotArgs, type WhereOnItem, type WhereOnJoinItem, type WhereQueryBuilder, type WhereResult, type WhereSearchItem, type WhereSearchResult, type WindowArg, type WindowArgDeclaration, type WindowDeclaration, type WindowItem, type WithArgsOptions, type WithConfigs, type WithDataItem, type WithDataItems, type WithItem, WithMethods, type WithOptions, type WithQueryBuilder, type WithRecursiveOptions, type WithResult, type WithSqlResult, type 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, cloneQueryBaseUnscoped, columnCheckToCode, columnCode, columnExcludesToCode, columnForeignKeysToCode, columnIndexesToCode, columnsShapeToCode, commitSql, constraintInnerToCode, constraintToCode, copyTableData, countSelect, createDb, defaultSchemaConfig, escapeForLog, escapeForMigration, escapeString, excludeInnerToCode, excludeToCode, extendQuery, filterResult, foreignKeyArgumentToCode, getClonedQueryData, getColumnInfo, getColumnTypes, getFullColumnTable, 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, pushQueryArrayImmutable, pushQueryOn, pushQueryOnForOuter, pushQueryOrOn, pushQueryValueImmutable, pushTableDataCode, queryFrom, queryFromSql, queryJson, queryMethodByReturnType, queryTypeWithLimitOne, queryWrap, raw, referencesArgsToCode, resolveSubQueryCallbackV2, rollbackSql, saveSearchAlias, setColumnDefaultParse, setColumnEncode, setColumnParse, setColumnParseNull, setParserForSelectedString, setQueryObjectValueImmutable, setQueryOperators, simplifyColumnDefault, sqlFn, sqlQueryArgsToExpression, tableDataMethods, templateLiteralToSQL, testTransaction, throwIfJoinLateral, throwIfNoWhere, toSQL };

package/dist/index.js

@@ -416,7 +416,7 @@ class ColumnType extends orchidCore.ColumnTypeBase {
    */
   generated(...args) {
     const sql = raw(...args);
-    return orchidCore.setColumnData(this, "generated", {
+    const column = orchidCore.setColumnData(this, "generated", {
       toSQL(ctx, quoted) {
         return sql.toSQL(ctx, quoted);
       },
@@ -431,6 +431,8 @@ class ColumnType extends orchidCore.ColumnTypeBase {
         return sql2;
       }
     });
+    column.data.readonly = true;
+    return column;
   }
 }
 
@@ -1528,7 +1530,7 @@ class TsVectorColumn extends ColumnType {
       let sql;
       if (Array.isArray(target)) {
         const columns = target.length === 1 ? `"${snakeCase ? orchidCore.toSnakeCase(target[0]) : target[0]}"` : target.map(
-          (column) => `coalesce("${snakeCase ? orchidCore.toSnakeCase(column) : column}", '')`
+          (column2) => `coalesce("${snakeCase ? orchidCore.toSnakeCase(column2) : column2}", '')`
         ).join(` || ' ' || `);
         sql = `to_tsvector('${language}', ${columns})`;
       } else {
@@ -1566,10 +1568,12 @@ class TsVectorColumn extends ColumnType {
       }
       return code + ")";
     };
-    return orchidCore.setColumnData(this, "generated", {
+    const column = orchidCore.setColumnData(this, "generated", {
       toSQL,
       toCode
     });
+    column.data.readonly = true;
+    return column;
   }
 }
 class TsQueryColumn extends ColumnType {
@@ -2050,7 +2054,8 @@ const columnWithDotToSql = (ctx, data, shape, column, index, quotedAs, select) =
   const table = column.slice(0, index);
   const key = column.slice(index + 1);
   if (key === "*") {
-    return data.joinedShapes?.[table] ? select ? `row_to_json("${table}".*)` : `"${table}".*` : column;
+    const shape2 = data.joinedShapes?.[table];
+    return shape2 ? select ? makeRowToJson(table, shape2, true) : `"${table}".*` : column;
   }
   const tableName = data.aliases?.[table] || table;
   const quoted = `"${table}"`;
@@ -2066,7 +2071,7 @@ const columnWithDotToSql = (ctx, data, shape, column, index, quotedAs, select) =
   }
   return `"${tableName}"."${key}"`;
 };
-const columnToSqlWithAs = (ctx, data, column, as, quotedAs, select) => {
+const columnToSqlWithAs = (ctx, data, column, as, quotedAs, select, jsonList) => {
   const index = column.indexOf(".");
   return index !== -1 ? tableColumnToSqlWithAs(
     ctx,
@@ -2075,26 +2080,18 @@ const columnToSqlWithAs = (ctx, data, column, as, quotedAs, select) => {
     column.slice(0, index),
     column.slice(index + 1),
     as,
-    quotedAs) : ownColumnToSqlWithAs(ctx, data, column, as, quotedAs, select);
+    quotedAs,
+    select,
+    jsonList
+  ) : ownColumnToSqlWithAs(ctx, data, column, as, quotedAs, select, jsonList);
 };
-const tableColumnToSqlWithAs = (ctx, data, column, table, key, as, quotedAs, select) => {
+const tableColumnToSqlWithAs = (ctx, data, column, table, key, as, quotedAs, select, jsonList) => {
   if (key === "*") {
+    if (jsonList) jsonList[as] = void 0;
     const shape = data.joinedShapes?.[table];
     if (shape) {
       {
-        let isSimple = true;
-        const list = [];
-        for (const key2 in shape) {
-          const column2 = shape[key2];
-          if (column2.data.explicitSelect || column2 instanceof VirtualColumn) {
-            continue;
-          }
-          if (column2.data.name) {
-            isSimple = false;
-          }
-          list.push(`'${key2}'`, `"${table}"."${column2.data.name || key2}"`);
-        }
-        return (isSimple ? `row_to_json("${table}".*)` : "json_build_object(" + list.join(", ") + ")") + ` "${as}"`;
+        return makeRowToJson(table, shape, true) + ` "${as}"`;
       }
     }
     return column;
@@ -2116,12 +2113,10 @@ const tableColumnToSqlWithAs = (ctx, data, column, table, key, as, quotedAs, sel
       )} "${as}"`;
     }
   }
+  if (jsonList) jsonList[as] = col;
   return `"${tableName}"."${key}"${key === as ? "" : ` "${as}"`}`;
 };
-const ownColumnToSqlWithAs = (ctx, data, column, as, quotedAs, select) => {
-  if (!select && data.joinedShapes?.[column]) {
-    return select ? `row_to_json("${column}".*) "${as}"` : `"${column}".r "${as}"`;
-  }
+const ownColumnToSqlWithAs = (ctx, data, column, as, quotedAs, select, jsonList) => {
   const col = data.shape[column];
   if (col) {
     if (col.data.name && col.data.name !== column) {
@@ -2137,6 +2132,7 @@ const ownColumnToSqlWithAs = (ctx, data, column, as, quotedAs, select) => {
       )} "${as}"`;
     }
   }
+  if (jsonList) jsonList[as] = col;
   return `${quotedAs ? `${quotedAs}.` : ""}"${column}"${column === as ? "" : ` "${as}"`}`;
 };
 const rawOrColumnToSql = (ctx, data, expr, quotedAs, shape = data.shape, select) => {
@@ -2145,6 +2141,23 @@ const rawOrColumnToSql = (ctx, data, expr, quotedAs, shape = data.shape, select)
 const quoteSchemaAndTable = (schema, table) => {
   return schema ? `"${schema}"."${table}"` : `"${table}"`;
 };
+const makeRowToJson = (table, shape, aliasName) => {
+  let isSimple = true;
+  const list = [];
+  for (const key in shape) {
+    const column = shape[key];
+    if (column.data.explicitSelect || column instanceof VirtualColumn) {
+      continue;
+    }
+    if (aliasName && column.data.name || column.data.jsonCast) {
+      isSimple = false;
+    }
+    list.push(
+      `'${key}', "${table}"."${aliasName && column.data.name || key}"${column.data.jsonCast ? `::${column.data.jsonCast}` : ""}`
+    );
+  }
+  return isSimple ? `row_to_json("${table}".*)` : "json_build_object(" + list.join(", ") + ")";
+};
 
 const queryTypeWithLimitOne = {
   one: true,
@@ -2500,6 +2513,7 @@ class NumberAsStringBaseColumn extends ColumnType {
   constructor(schema) {
     super(schema, schema.stringSchema());
     this.operators = Operators.number;
+    this.data.jsonCast = "text";
   }
 }
 class DecimalColumn extends NumberAsStringBaseColumn {
@@ -3059,6 +3073,7 @@ const applyComputedColumns = (q, fn) => {
       const data = (q.shape[key] = item.result.value || UnknownColumn.instance).data;
       data.computed = item;
       data.explicitSelect = true;
+      data.readonly = true;
     }
   }
   q.computeAtRuntime = q.computeBatchAtRuntime = void 0;
@@ -4411,15 +4426,53 @@ function cloneQueryBaseUnscoped(query) {
   return q;
 }
 
+class RowToJsonExpression extends orchidCore.Expression {
+  constructor(from, one, coalesce) {
+    super();
+    this.from = from;
+    this.one = one;
+    this.coalesce = coalesce;
+    this.result = { value: UnknownColumn.instance };
+    this.q = { expr: this };
+  }
+  makeSQL(ctx) {
+    const q = this.from;
+    const aliases = [];
+    const jsonList = {};
+    const select = selectToSql(
+      ctx,
+      q,
+      q.q,
+      `"${getQueryAs(q)}"`,
+      q.q.hookSelect,
+      aliases,
+      void 0,
+      jsonList
+    );
+    q.q.selectCache = { sql: select, aliases };
+    let rowToJson;
+    if (Object.values(jsonList).some((x) => x?.data.jsonCast)) {
+      rowToJson = `json_build_object(${Object.entries(jsonList).map(
+        ([key, column]) => `'${key}', t."${key}"${column?.data.jsonCast ? `::${column.data.jsonCast}` : ""}`
+      ).join(", ")})`;
+    } else {
+      rowToJson = "row_to_json(t.*)";
+    }
+    return this.one ? rowToJson : this.coalesce !== false ? `COALESCE(json_agg(${rowToJson}), '[]')` : `json_agg(${rowToJson})`;
+  }
+}
 function queryJson(self, coalesce) {
+  const inner = self.clone();
   const q = queryWrap(
-    self,
+    inner,
     cloneQueryBaseUnscoped(self)
   );
   _queryGetOptional(
     q,
-    new RawSQL(
-      queryTypeWithLimitOne[self.q.returnType] ? `row_to_json("t".*)` : coalesce !== false ? `COALESCE(json_agg(row_to_json("t".*)), '[]')` : 'json_agg(row_to_json("t".*))'
+    new RowToJsonExpression(
+      inner,
+      queryTypeWithLimitOne[self.q.returnType],
+      coalesce
     )
   );
   q.q.returnsOne = true;
@@ -4726,17 +4779,22 @@ const makeReturningSql = (ctx, q, data, quotedAs, hookSelectI, addHookSelectI) =
 };
 
 const pushSelectSql = (ctx, table, query, quotedAs, aliases) => {
-  const sql = selectToSql(
-    ctx,
-    table,
-    query,
-    quotedAs,
-    query.hookSelect,
-    aliases
-  );
-  if (sql) ctx.sql.push(sql);
+  if (query.selectCache) {
+    ctx.sql.push(query.selectCache.sql);
+    if (aliases) aliases.push(...query.selectCache.aliases);
+  } else {
+    const sql = selectToSql(
+      ctx,
+      table,
+      query,
+      quotedAs,
+      query.hookSelect,
+      aliases
+    );
+    if (sql) ctx.sql.push(sql);
+  }
 };
-const selectToSql = (ctx, table, query, quotedAs, hookSelect = query.hookSelect, aliases, skipCTE) => {
+const selectToSql = (ctx, table, query, quotedAs, hookSelect = query.hookSelect, aliases, skipCTE, jsonList) => {
   if (query.inCTE && !skipCTE) {
     const { select } = makeReturningSql(
       ctx,
@@ -4759,13 +4817,15 @@ const selectToSql = (ctx, table, query, quotedAs, hookSelect = query.hookSelect,
               selected[key] = quotedAs;
             }
           }
-          sql = selectAllSql(query, quotedAs);
+          sql = selectAllSql(query, quotedAs, jsonList);
         } else {
           const index = item.indexOf(".");
           if (index !== -1) {
             const tableName = item.slice(0, index);
             const key = item.slice(index + 1);
-            if (hookSelect?.get(key)) (selected ?? (selected = {}))[key] = `"${tableName}"`;
+            if (hookSelect?.get(key)) {
+              (selected ?? (selected = {}))[key] = `"${tableName}"`;
+            }
             sql = tableColumnToSqlWithAs(
               ctx,
               table.q,
@@ -4773,7 +4833,10 @@ const selectToSql = (ctx, table, query, quotedAs, hookSelect = query.hookSelect,
               tableName,
               key,
               key === "*" ? tableName : key,
-              quotedAs);
+              quotedAs,
+              true,
+              jsonList
+            );
           } else {
             if (hookSelect?.get(item)) (selected ?? (selected = {}))[item] = quotedAs;
             sql = ownColumnToSqlWithAs(
@@ -4782,7 +4845,8 @@ const selectToSql = (ctx, table, query, quotedAs, hookSelect = query.hookSelect,
               item,
               item,
               quotedAs,
-              true
+              true,
+              jsonList
             );
           }
         }
@@ -4797,9 +4861,15 @@ const selectToSql = (ctx, table, query, quotedAs, hookSelect = query.hookSelect,
             if (typeof value === "object") {
               if (orchidCore.isExpression(value)) {
                 list.push(`${value.toSQL(ctx, quotedAs)} "${as}"`);
+                if (jsonList) {
+                  jsonList[as] = value.result.value;
+                }
                 aliases?.push(as);
               } else {
-                pushSubQuerySql(ctx, value, as, list, quotedAs, aliases);
+                pushSubQuerySql(ctx, query, value, as, list, quotedAs, aliases);
+                if (jsonList) {
+                  jsonList[as] = value.q.returnType === "value" || value.q.returnType === "valueOrThrow" ? value.q.expr?.result.value || value.result?.value : void 0;
+                }
               }
             } else if (value) {
               list.push(
@@ -4809,7 +4879,8 @@ const selectToSql = (ctx, table, query, quotedAs, hookSelect = query.hookSelect,
                   value,
                   as,
                   quotedAs,
-                  true
+                  true,
+                  jsonList
                 )
               );
               aliases?.push(as);
@@ -4843,32 +4914,39 @@ const selectToSql = (ctx, table, query, quotedAs, hookSelect = query.hookSelect,
         col = query.shape[select];
         sql = simpleColumnToSQL(ctx, query, select, col, quotedAs);
       }
+      let name = columnName;
       if (selected?.[columnName]) {
         if (selected?.[columnName] === quotedTable) {
           hookSelect.delete(column);
           continue;
         }
         let i = 2;
-        let name;
         while (selected[name = `${column}${i}`]) i++;
         item.as = name;
         sql += ` "${name}"`;
       } else if (col?.data.name) {
         sql += ` "${columnName}"`;
       }
+      if (jsonList) jsonList[name] = col;
       list.push(sql);
     }
   }
-  return list.length ? list.join(", ") : query.select ? "" : selectAllSql(query, quotedAs);
+  return list.length ? list.join(", ") : query.select ? "" : selectAllSql(query, quotedAs, jsonList);
 };
 function selectedObjectToSQL(ctx, quotedAs, item) {
   const sql = item.toSQL(ctx, quotedAs);
   return ctx.aliasValue ? `${sql} r` : sql;
 }
-const selectAllSql = (query, quotedAs) => {
+const selectAllSql = (query, quotedAs, jsonList) => {
+  if (jsonList) {
+    Object.assign(
+      jsonList,
+      query.selectAllKeys || query.shape
+    );
+  }
   return query.join?.length ? query.selectAllColumns?.map((item) => `${quotedAs}.${item}`).join(", ") || `${quotedAs}.*` : query.selectAllColumns?.join(", ") || "*";
 };
-const pushSubQuerySql = (ctx, query, as, list, quotedAs, aliases) => {
+const pushSubQuerySql = (ctx, mainQuery, query, as, list, quotedAs, aliases) => {
   const { returnType = "all" } = query.q;
   if (isQueryNone(query)) {
     let sql;
@@ -4901,9 +4979,12 @@ const pushSubQuerySql = (ctx, query, as, list, quotedAs, aliases) => {
     let sql;
     switch (returnType) {
       case "one":
-      case "oneOrThrow":
-        sql = `row_to_json("${query.q.joinedForSelect}".*)`;
+      case "oneOrThrow": {
+        const table = query.q.joinedForSelect;
+        const shape = mainQuery.joinedShapes?.[as];
+        sql = makeRowToJson(table, shape, false);
         break;
+      }
       case "all":
       case "pluck":
       case "value":
@@ -5411,6 +5492,7 @@ const makeSQL = (table, options) => {
   const values = options?.values || [];
   const ctx = {
     queryBuilder: table.queryBuilder,
+    q: query,
     sql,
     values,
     aliasValue: options?.aliasValue
@@ -8192,7 +8274,7 @@ const processCreateItem = (q, item, rowIndex, ctx, encoders) => {
           item[key]
         );
       }
-      if (!ctx.columns.has(key) && (shape[key] && !shape[key].data.computed || shape === anyShape) && item[key] !== void 0) {
+      if (!ctx.columns.has(key) && (shape[key] && !shape[key].data.readonly || shape === anyShape) && item[key] !== void 0) {
         ctx.columns.set(key, ctx.columns.size);
         encoders[key] = shape[key]?.data.encode;
       }
@@ -10462,7 +10544,7 @@ const _queryUpdate = (query, arg) => {
     if (item instanceof VirtualColumn && item.update) {
       item.update(query, ctx, set);
       delete set[key];
-    } else if ((!shape[key] || shape[key].data.computed) && shape !== anyShape) {
+    } else if ((!shape[key] || shape[key].data.readonly) && shape !== anyShape) {
       delete set[key];
     } else {
       let value = set[key];
@@ -12801,6 +12883,7 @@ const performQuery = async (q, args, method) => {
     sql = {
       text: templateLiteralToSQL(args, {
         queryBuilder: q.queryBuilder,
+        q: q.q,
         sql: [],
         values
       }),