pqb 0.67.2 → 0.67.4

package/dist/index.d.ts

@@ -6255,6 +6255,14 @@ declare abstract class QueryHooks {
    */
   catchAfterCommitError<T>(this: T, fn: AfterCommitErrorHandler): T;
 }
+interface ColumnDataSelectSqlProp {
+  selectSql?: Expression;
+  selectSqlFn?: SelectSqlCallback;
+}
+interface SelectSqlCallback {
+  (column: ColumnRefExpression<Column.Pick.QueryColumn>): Expression;
+}
+type SelectSqlColumn<T extends Column.Pick.DataAndDataType, Expr extends Expression> = unknown extends Expr['result']['value']['outputType'] ? T : { [K in keyof T]: K extends 'outputType' ? Expr['result']['value']['outputType'] : T[K] };
 declare namespace Column {
   export namespace Modifiers {
     export interface IsPrimaryKey<Name extends string> {
@@ -6895,6 +6903,13 @@ declare abstract class Column<Schema extends ColumnTypeSchemaArg = ColumnTypeSch
    * ```
    */
   select<T extends Column.Pick.Data, Value extends boolean>(this: T, value: Value): Column.Modifiers.DefaultSelect<T, Value>;
+  /**
+   * Set SQL to use when selecting this column.
+   *
+   * The column remains a regular writable database column. Create, update,
+   * filters, ordering, grouping, and migrations still use the physical column.
+   */
+  selectSql<T extends Column.Pick.DataAndDataType, Expr extends Expression>(this: T, fn: (column: ColumnRefExpression<T & Column.Pick.QueryColumn>) => Expr): SelectSqlColumn<T, Expr>;
   /**
    * Forbid the column to be used in [create](/guide/create-update-delete.html#create-insert) and [update](/guide/create-update-delete.html#update) methods.
    *
@@ -8369,7 +8384,7 @@ declare const setColumnParse: (column: Column.Pick.Data, fn: (input: any) => unk
 declare const setColumnParseNull: (column: Column.Pick.Data, fn: () => unknown, nullSchema?: unknown) => any;
 declare const setColumnEncode: (column: Column.Pick.Data, fn: (input: any) => unknown, inputSchema?: unknown) => any;
 declare const getColumnBaseType: (column: Column.Pick.Data, domainsMap: DbStructureDomainsMap, type: string) => string;
-interface ColumnDataComputedProp {
+interface ColumnDataComputedProp extends ColumnDataSelectSqlProp {
   computed?: Expression;
 }
 type ComputedColumnsFromOptions<T extends ComputedOptionsFactory<never, never> | undefined> = T extends ((...args: any[]) => infer R extends ComputedOptionsConfig) ? { [K in keyof R]: R[K] extends QueryOrExpression<unknown> ? R[K]['result']['value'] : R[K] extends (() => {
@@ -8590,6 +8605,10 @@ type QueryType = undefined | null | 'upsert' | 'insert' | 'update' | 'delete';
 interface AsFn {
   (as: string): void;
 }
+interface SelectAllColumnExpression {
+  (ctx: ToSQLCtx, quotedAs?: string): string;
+}
+type SelectAllColumn = string | SelectAllColumnExpression;
 interface QueryData extends QueryDataAliases, PickQueryDataParsers, HasHookSelect, MutativeQueriesSelectRelationsQueryData {
   type: QueryType;
   adapter: Adapter;
@@ -8625,7 +8644,7 @@ interface QueryData extends QueryDataAliases, PickQueryDataParsers, HasHookSelec
     sql: string;
     aliases: string[];
   };
-  selectAllColumns?: string[];
+  selectAllColumns?: SelectAllColumn[];
   /**
    * Subset of the `shape` that only includes columns with no `data.explicitSelect`.
    */
@@ -8713,6 +8732,8 @@ interface QueryData extends QueryDataAliases, PickQueryDataParsers, HasHookSelec
   /** upsert **/
   upsertUpdate?: boolean;
   upsertSecond?: boolean;
+  upsertCreateAppendQueries?: SubQueryForSql[];
+  upsertCreateAsFns?: AsFn[];
   upsertInsert?(): unknown;
   /** insert **/
   columns: string[];
@@ -10539,6 +10560,7 @@ declare abstract class QueryAsMethods {
   as<T extends AsQueryArg, As extends string>(this: T, as: As): SetQueryTableAlias<T, As>;
 }
 declare const _appendQuery: (main: Query, append: Query, asFn: (as: string) => void) => Query;
+declare const _appendQueryOnUpsertCreate: (main: Query, append: Query, asFn: (as: string) => void) => Query;
 declare const getPrimaryKeys: (q: Query) => string[];
 /**
  * Set value into the object in query data, create the object if it doesn't yet exist.
@@ -10694,4 +10716,4 @@ declare const testTransaction: {
    */
   close(arg: Arg$1): Promise<void>;
 };
-export { type Adapter, AdapterClass, type AdapterConfigBase, type AdapterParams, type AdapterSchemaConfigOptions, type AfterCommitStandaloneHook, type AfterHook, ArrayColumn, type ArrayColumnValue, type ArrayData, type AsyncState, type BaseNumberData, BigIntColumn, BigSerialColumn, BitColumn, BitVaryingColumn, BooleanColumn, BoxColumn, ByteaColumn, CidrColumn, CircleColumn, CitextColumn, type Code, type Codes, Column, type ColumnFromDbParams, type ColumnSchemaConfig, type ColumnSchemaGetterColumns, type ColumnSchemaGetterTableClass, type ColumnToCodeCtx, type ColumnTypeSchemaArg, type ColumnsByType, type ColumnsShape, type ComputedColumnsFromOptions, type ComputedOptionsConfig, type ComputedOptionsFactory, type CreateCtx, type CreateData, type CreateManyMethodsNames, type CreateMethodsNames, type CreateSelf, CustomTypeColumn, DateBaseColumn, DateColumn, type DateColumnData, DateTimeBaseClass, DateTimeTzBaseClass, Db, type DbDomainArg, type DbExtension, type DbOptions, type DbResult, type DbSharedOptions, type DbSqlMethod, type DbStructureDomainsMap, type DbTableOptionScopes, type DbTableOptions, DecimalColumn, type DecimalColumnData, type DefaultColumnTypes, type DefaultPrivileges, type DefaultSchemaConfig, type DeleteMethodsNames, DomainColumn, DoublePrecisionColumn, type DriverAdapter, DynamicRawSQL, type EmptyObject, type EmptyTuple, EnumColumn, Expression, type FromArg, type FromResult, type GeneratorIgnore, type Grant, type HookSelectValue, InetColumn, IntegerBaseColumn, IntegerColumn, IntervalColumn, type IsQuery, type IsolationLevel, JSONColumn, JSONTextColumn, type JoinQueryMethod, type JoinedShapes, LimitedTextBaseColumn, LineColumn, LsegColumn, MacAddr8Column, MacAddrColumn, type MapTableScopesOption, type MaybeArray, type MaybePromise, type MergeQuery, MoneyColumn, type NoPrimaryKeyOption, type NonUniqDataItem, NotFoundError, NumberAsStringBaseColumn, NumberBaseColumn, type NumberColumnData, Operators, type OperatorsArray, type OperatorsJson, type OperatorsOrdinalText, OrchidOrmInternalError, type Ord, PathColumn, type PickQueryInputType, type PickQueryInternal, type PickQueryQ, type PickQueryRelations, type PickQuerySelectableRelations, type PickQueryShape, PointColumn, PolygonColumn, PostgisGeographyPointColumn, type Query, type QueryAfterHook, type QueryBeforeActionHook, type QueryBeforeHook, type QueryData, QueryError, type QueryHasWhere, type QueryHelperResult, QueryHookUtils, QueryHooks, type QueryInternal, type QueryLogObject, type QueryLogOptions, type QueryLogger, type QueryManyTake, type QueryManyTakeOptional, type QueryOrExpression, type QueryResult, type QueryResultRow, type QueryReturnType, type QuerySchema, type QueryScopes, RawSql, type RawSqlBase, RealColumn, type RecordKeyTrue, type RecordOptionalString, type RecordString, type RecordStringOrNumber, type RecordUnknown, type RelationConfigBase, type RelationJoinQuery, type RelationsBase, type Rls, type RlsPolicy, type SchemaConfigFnWithOptions, type SearchWeight, type SelectableFromShape, SerialColumn, type SerialColumnData, type ShallowSimplify, type ShapeColumnPrimaryKeys, type ShapeUniqueColumns, type SingleSql, type SingleSqlItem, SmallIntColumn, SmallSerialColumn, type Sql, type SqlFn, type SqlSessionState, type StorageOptions, StringColumn, type StringData, type TableData, type TableDataFn, type TableDataInput, type TableDataItem, type TableDataItemsUniqueColumnTuples, type TableDataItemsUniqueColumns, type TableDataItemsUniqueConstraints, type TableDataMethods, type TemplateLiteralArgs, TextBaseColumn, TextColumn, TimeColumn, TimestampColumn, TimestampTZColumn, type Timestamps, type TransactionAdapter, TransactionAdapterClass, type TransactionOptions, TsQueryColumn, TsVectorColumn, UUIDColumn, type UniqueConstraints, type UniqueTableDataItem, UnknownColumn, type UpdateData, type UpsertData, type UpsertThis, VarCharColumn, VirtualColumn, type WhereArg, XMLColumn, _appendQuery, _clone, _createDbSqlMethod, _hookSelectColumns, _initQueryBuilder, _orCreate, _prependWith, _queryCreate, _queryCreateMany, _queryCreateManyFrom, _queryDefaults, _queryDelete, _queryFindBy, _queryFindByOptional, _queryHookAfterCreate, _queryHookAfterUpdate, _queryInsert, _queryInsertMany, _queryJoinOn, _queryRows, _querySelect, _queryTake, _queryTakeOptional, _queryUpdate, _queryUpdateOrThrow, _queryUpsert, _queryWhere, _queryWhereExists, _queryWhereIn, addCode, addTopCte, addTopCteSql, applyMixins, assignDbDataToColumn, backtickQuote, cloneQueryBaseUnscoped, codeToString, colors, columnsShapeToCode, constraintInnerToCode, consumeColumnName, copyTableData, createDbWithAdapter, deepCompare, defaultSchemaConfig, emptyArray, emptyObject, escapeForMigration, escapeString, excludeInnerToCode, exhaustive, getCallerFilePath, getClonedQueryData, getColumnBaseType, getColumnInfo, getColumnTypes, getDateAsDateFn, getDateAsNumberFn, getDriverErrorCode, getFreeAlias, getFreeSetAlias, getImportPath, getPrimaryKeys, getQueryAs, getQuerySchema, getShapeFromSelect, getSqlText, getStackTrace, getSupportedDefaultPrivileges, indexInnerToCode, internalSchemaConfig, isExpression, isQueryReturnsAll, isRawSQL, logColors, logParamToLogObject, makeColumnNullable, makeColumnTypes, makeColumnsByType, makeConnectRetryConfig, noop, objectHasValues, omit, parseTableData, parseTableDataInput, pathToLog, pick, pluralize, prepareSubQueryForSql, primaryKeyInnerToCode, pushQueryOnForOuter, pushQueryValueImmutable, pushTableDataCode, quoteIdentifier, quoteObjectKey, quoteTableWithSchema, raw, rawSqlToCode, referencesArgsToCode, returnArg, setColumnData, setColumnEncode, setColumnParse, setColumnParseNull, setCurrentColumnName, setDataValue, setDefaultLanguage, setFreeAlias, setQueryObjectValueImmutable, singleQuote, tableDataMethods, testTransaction, toArray, toCamelCase, toPascalCase, toSnakeCase, wrapAdapterFnWithConnectRetry };
+export { type Adapter, AdapterClass, type AdapterConfigBase, type AdapterParams, type AdapterSchemaConfigOptions, type AfterCommitStandaloneHook, type AfterHook, ArrayColumn, type ArrayColumnValue, type ArrayData, type AsyncState, type BaseNumberData, BigIntColumn, BigSerialColumn, BitColumn, BitVaryingColumn, BooleanColumn, BoxColumn, ByteaColumn, CidrColumn, CircleColumn, CitextColumn, type Code, type Codes, Column, type ColumnFromDbParams, type ColumnSchemaConfig, type ColumnSchemaGetterColumns, type ColumnSchemaGetterTableClass, type ColumnToCodeCtx, type ColumnTypeSchemaArg, type ColumnsByType, type ColumnsShape, type ComputedColumnsFromOptions, type ComputedOptionsConfig, type ComputedOptionsFactory, type CreateCtx, type CreateData, type CreateManyMethodsNames, type CreateMethodsNames, type CreateSelf, CustomTypeColumn, DateBaseColumn, DateColumn, type DateColumnData, DateTimeBaseClass, DateTimeTzBaseClass, Db, type DbDomainArg, type DbExtension, type DbOptions, type DbResult, type DbSharedOptions, type DbSqlMethod, type DbStructureDomainsMap, type DbTableOptionScopes, type DbTableOptions, DecimalColumn, type DecimalColumnData, type DefaultColumnTypes, type DefaultPrivileges, type DefaultSchemaConfig, type DeleteMethodsNames, DomainColumn, DoublePrecisionColumn, type DriverAdapter, DynamicRawSQL, type EmptyObject, type EmptyTuple, EnumColumn, Expression, type ExpressionData, type FromArg, type FromResult, type GeneratorIgnore, type Grant, type HookSelectValue, InetColumn, IntegerBaseColumn, IntegerColumn, IntervalColumn, type IsQuery, type IsolationLevel, JSONColumn, JSONTextColumn, type JoinQueryMethod, type JoinedShapes, LimitedTextBaseColumn, LineColumn, LsegColumn, MacAddr8Column, MacAddrColumn, type MapTableScopesOption, type MaybeArray, type MaybePromise, type MergeQuery, MoneyColumn, type NoPrimaryKeyOption, type NonUniqDataItem, NotFoundError, NumberAsStringBaseColumn, NumberBaseColumn, type NumberColumnData, Operators, type OperatorsArray, type OperatorsJson, type OperatorsOrdinalText, OrchidOrmInternalError, type Ord, PathColumn, type PickQueryInputType, type PickQueryInternal, type PickQueryQ, type PickQueryRelations, type PickQuerySelectableRelations, type PickQueryShape, PointColumn, PolygonColumn, PostgisGeographyPointColumn, type Query, type QueryAfterHook, type QueryBeforeActionHook, type QueryBeforeHook, type QueryData, QueryError, type QueryHasWhere, type QueryHelperResult, QueryHookUtils, QueryHooks, type QueryInternal, type QueryLogObject, type QueryLogOptions, type QueryLogger, type QueryManyTake, type QueryManyTakeOptional, type QueryOrExpression, type QueryResult, type QueryResultRow, type QueryReturnType, type QuerySchema, type QueryScopes, RawSql, type RawSqlBase, RealColumn, type RecordKeyTrue, type RecordOptionalString, type RecordString, type RecordStringOrNumber, type RecordUnknown, type RelationConfigBase, type RelationJoinQuery, type RelationsBase, type Rls, type RlsPolicy, type SchemaConfigFnWithOptions, type SearchWeight, type SelectableFromShape, SerialColumn, type SerialColumnData, type ShallowSimplify, type ShapeColumnPrimaryKeys, type ShapeUniqueColumns, type SingleSql, type SingleSqlItem, SmallIntColumn, SmallSerialColumn, type Sql, type SqlFn, type SqlSessionState, type StorageOptions, StringColumn, type StringData, type TableData, type TableDataFn, type TableDataInput, type TableDataItem, type TableDataItemsUniqueColumnTuples, type TableDataItemsUniqueColumns, type TableDataItemsUniqueConstraints, type TableDataMethods, type TemplateLiteralArgs, TextBaseColumn, TextColumn, TimeColumn, TimestampColumn, TimestampTZColumn, type Timestamps, type ToSQLCtx, type ToSqlValues, type TransactionAdapter, TransactionAdapterClass, type TransactionOptions, TsQueryColumn, TsVectorColumn, UUIDColumn, type UniqueConstraints, type UniqueTableDataItem, UnknownColumn, type UpdateData, type UpsertData, type UpsertThis, VarCharColumn, VirtualColumn, type WhereArg, XMLColumn, _appendQuery, _appendQueryOnUpsertCreate, _clone, _createDbSqlMethod, _hookSelectColumns, _initQueryBuilder, _orCreate, _prependWith, _queryCreate, _queryCreateMany, _queryCreateManyFrom, _queryDefaults, _queryDelete, _queryFindBy, _queryFindByOptional, _queryHookAfterCreate, _queryHookAfterUpdate, _queryInsert, _queryInsertMany, _queryJoinOn, _queryRows, _querySelect, _queryTake, _queryTakeOptional, _queryUpdate, _queryUpdateOrThrow, _queryUpsert, _queryWhere, _queryWhereExists, _queryWhereIn, addCode, addTopCte, addTopCteSql, applyMixins, assignDbDataToColumn, backtickQuote, cloneQueryBaseUnscoped, codeToString, colors, columnsShapeToCode, constraintInnerToCode, consumeColumnName, copyTableData, createDbWithAdapter, deepCompare, defaultSchemaConfig, emptyArray, emptyObject, escapeForMigration, escapeString, excludeInnerToCode, exhaustive, getCallerFilePath, getClonedQueryData, getColumnBaseType, getColumnInfo, getColumnTypes, getDateAsDateFn, getDateAsNumberFn, getDriverErrorCode, getFreeAlias, getFreeSetAlias, getImportPath, getPrimaryKeys, getQueryAs, getQuerySchema, getShapeFromSelect, getSqlText, getStackTrace, getSupportedDefaultPrivileges, indexInnerToCode, internalSchemaConfig, isExpression, isQueryReturnsAll, isRawSQL, logColors, logParamToLogObject, makeColumnNullable, makeColumnTypes, makeColumnsByType, makeConnectRetryConfig, noop, objectHasValues, omit, parseTableData, parseTableDataInput, pathToLog, pick, pluralize, prepareSubQueryForSql, primaryKeyInnerToCode, pushQueryOnForOuter, pushQueryValueImmutable, pushTableDataCode, quoteIdentifier, quoteObjectKey, quoteTableWithSchema, raw, rawSqlToCode, referencesArgsToCode, returnArg, setColumnData, setColumnEncode, setColumnParse, setColumnParseNull, setCurrentColumnName, setDataValue, setDefaultLanguage, setFreeAlias, setQueryObjectValueImmutable, singleQuote, tableDataMethods, testTransaction, toArray, toCamelCase, toPascalCase, toSnakeCase, wrapAdapterFnWithConnectRetry };

package/dist/index.js

@@ -771,6 +771,15 @@ var Column = class {
 		return setColumnData(this, "explicitSelect", !value);
 	}
 	/**
+	* Set SQL to use when selecting this column.
+	*
+	* The column remains a regular writable database column. Create, update,
+	* filters, ordering, grouping, and migrations still use the physical column.
+	*/
+	selectSql(fn) {
+		return setColumnData(this, "selectSqlFn", fn);
+	}
+	/**
 	* Forbid the column to be used in [create](/guide/create-update-delete.html#create-insert) and [update](/guide/create-update-delete.html#update) methods.
 	*
 	* `readOnly` column is still can be set from a [hook](http://localhost:5173/guide/hooks.html#set-values-before-create-or-update).
@@ -3992,6 +4001,7 @@ const applyComputedColumns = (q, fn) => {
 			q.shape[key] = col;
 			const { data } = col;
 			data.computed = item;
+			data.selectSql = item;
 			data.explicitSelect = true;
 			data.readOnly = true;
 			const parse = col._parse;
@@ -4563,7 +4573,11 @@ const loadRelations = async (state, result, savepointState, renames) => {
 	const q = state.query;
 	const primaryKeys = requirePrimaryKeys(q, "Cannot select a relation of a table that has no primary keys");
 	const selectQuery = _unscope(q, "nonDeleted");
-	selectQuery.q.type = selectQuery.q.returnType = void 0;
+	selectQuery.q.type = void 0;
+	selectQuery.q.returnType = void 0;
+	selectQuery.q.with = void 0;
+	selectQuery.q.appendQueries = void 0;
+	selectQuery.q.valuesJoinedAs = void 0;
 	const matchSourceTableIds = {};
 	for (const pkey of primaryKeys) matchSourceTableIds[pkey] = { in: result.map((row) => row[pkey]) };
 	(selectQuery.q.and ??= []).push(matchSourceTableIds);
@@ -6523,6 +6537,15 @@ const columnToSql = (ctx, data, shape, column, quotedAs, select) => {
 	if (index !== -1) return columnWithDotToSql(ctx, data, shape, column, index, quotedAs, select);
 	return simpleColumnToSQL(ctx, column, shape[column], quotedAs);
 };
+const selectedColumnToSql = (ctx, data, shape, column, quotedAs) => {
+	const index = column.indexOf(".");
+	return index !== -1 ? selectedColumnWithDotToSql(ctx, data, shape, column, index, quotedAs) : selectedSimpleColumnToSql(ctx, column, shape[column], quotedAs);
+};
+const selectedSimpleColumnToSql = (ctx, key, column, quotedAs) => {
+	if (!column) return `"${key}"`;
+	const { data } = column;
+	return data.selectSql ? `(${data.selectSql.toSQL(ctx, quotedAs)})` : `${quotedAs ? `${quotedAs}.` : ""}"${data.name || key}"`;
+};
 /**
 * in a case when ordering or grouping by a column which was selected as expression:
 * ```ts
@@ -6548,7 +6571,7 @@ const columnWithDotToSql = (ctx, data, shape, column, index, quotedAs, select) =
 	const key = column.slice(index + 1);
 	if (key === "*") {
 		const shape = data.joinedShapes?.[table];
-		return shape ? select ? makeRowToJson(table, shape, true) : `"${table}".*` : column;
+		return shape ? select ? makeRowToJson(ctx, table, shape, true) : `"${table}".*` : column;
 	}
 	const tableName = _getQueryAliasOrName(data, table);
 	const quoted = `"${table}"`;
@@ -6560,6 +6583,22 @@ const columnWithDotToSql = (ctx, data, shape, column, index, quotedAs, select) =
 	}
 	return `"${tableName}"."${key}"`;
 };
+const selectedColumnWithDotToSql = (ctx, data, shape, column, index, quotedAs) => {
+	const table = column.slice(0, index);
+	const key = column.slice(index + 1);
+	if (key === "*") {
+		const shape = data.joinedShapes?.[table];
+		return shape ? makeRowToJson(ctx, table, shape, true) : column;
+	}
+	const tableName = _getQueryAliasOrName(data, table);
+	const quoted = `"${table}"`;
+	const col = quoted === quotedAs ? shape[key] : data.joinedShapes?.[tableName]?.[key];
+	if (col) {
+		if (col.data.selectSql) return `(${col.data.selectSql.toSQL(ctx, quoted)})`;
+		if (col.data.name) return `"${tableName}"."${col.data.name}"`;
+	}
+	return `"${tableName}"."${key}"`;
+};
 const columnToSqlWithAs = (ctx, data, column, as, quotedAs, select, jsonList) => {
 	const index = column.indexOf(".");
 	return index !== -1 ? tableColumnToSqlWithAs(ctx, data, column, column.slice(0, index), column.slice(index + 1), as, quotedAs, select, jsonList) : ownColumnToSqlWithAs(ctx, data, column, as, quotedAs, select, jsonList);
@@ -6569,7 +6608,7 @@ const tableColumnToSqlWithAs = (ctx, data, column, table, key, as, quotedAs, sel
 		if (jsonList) jsonList[as] = void 0;
 		const shape = data.joinedShapes?.[table];
 		if (shape) {
-			if (select) return makeRowToJson(table, shape, true) + ` "${as}"`;
+			if (select) return makeRowToJson(ctx, table, shape, true) + ` "${as}"`;
 			return `"${table}"."${table}" "${as}"`;
 		}
 		return column;
@@ -6577,10 +6616,10 @@ const tableColumnToSqlWithAs = (ctx, data, column, table, key, as, quotedAs, sel
 	const tableName = _getQueryAliasOrName(data, table);
 	const quoted = `"${table}"`;
 	const col = quoted === quotedAs ? data.shape[key] : data.joinedShapes?.[tableName][key];
-	if (jsonList) jsonList[as] = col;
+	if (jsonList) jsonList[as] = col && getSelectedColumnData(col);
 	if (col) {
+		if (col.data.selectSql) return `(${col.data.selectSql.toSQL(ctx, quoted)}) "${as}"`;
 		if (col.data.name && col.data.name !== key) return `"${tableName}"."${col.data.name}" "${as}"`;
-		if (col.data.computed) return `(${col.data.computed.toSQL(ctx, quoted)}) "${as}"`;
 	}
 	return `"${tableName}"."${key}"${key === as ? "" : ` "${as}"`}`;
 };
@@ -6590,10 +6629,10 @@ const ownColumnToSqlWithAs = (ctx, data, column, as, quotedAs, select, jsonList)
 		return `"${column}"."${column}" "${as}"`;
 	}
 	const col = data.shape[column];
-	if (jsonList) jsonList[as] = col;
+	if (jsonList) jsonList[as] = col && getSelectedColumnData(col);
 	if (col) {
+		if (col.data.selectSql) return `(${col.data.selectSql.toSQL(ctx, quotedAs)}) "${as}"`;
 		if (col.data.name && col.data.name !== column) return `${quotedAs ? `${quotedAs}.` : ""}"${col.data.name}"${col.data.name === as ? "" : ` "${as}"`}`;
-		if (col.data.computed) return `(${col.data.computed.toSQL(ctx, quotedAs)}) "${as}"`;
 	}
 	return `${quotedAs ? `${quotedAs}.` : ""}"${column}"${column === as ? "" : ` "${as}"`}`;
 };
@@ -6749,7 +6788,7 @@ var SelectItemExpression = class extends Expression {
 	}
 	makeSQL(ctx, quotedAs) {
 		const q = this.q;
-		return typeof this.item === "string" ? this.item === "*" ? selectAllSql(q, quotedAs).join(", ") : columnToSql(ctx, q, q.shape, this.item, quotedAs, true) : this.item.toSQL(ctx, quotedAs);
+		return typeof this.item === "string" ? this.item === "*" ? selectAllSql(q, quotedAs, void 0, ctx).join(", ") : selectedColumnToSql(ctx, q, q.shape, this.item, quotedAs) : this.item.toSQL(ctx, quotedAs);
 	}
 };
 const _getSelectableColumn = (q, arg) => {
@@ -6961,22 +7000,33 @@ const setMutativeQueriesSelectRelationsSqlState = (d, as, rel) => {
 const handleInsertAndUpdateSelectRelationsSqlState = (ctx, state) => {
 	if (state) ctx.topCtx.mutativeQueriesSelectRelationsSqlState = state;
 };
+const unsetValuesJoinedAsForMutativeSelectRelations = (query) => {
+	if (!query.q.selectRelation || !query.q.valuesJoinedAs) return;
+	const { valuesJoinedAs } = query.q;
+	query.q.valuesJoinedAs = void 0;
+	return valuesJoinedAs;
+};
+const restoreValuesJoinedAsForMutativeSelectRelations = (query, valuesJoinedAs) => {
+	if (valuesJoinedAs) query.q.valuesJoinedAs = valuesJoinedAs;
+};
 const handleDeleteSelectRelationsSqlState = (ctx, query, relationSelectState) => {
 	const selectRelations = relationSelectState?.value;
 	if (!selectRelations) return;
 	const selectPrimaryKeysQuery = prepareSubQueryForSql(query, _clone(query));
+	selectPrimaryKeysQuery.q.valuesJoinedAs = void 0;
 	const primaryKeys = requirePrimaryKeys(query, "primary keys are required for selecting relation in delete");
 	_addToHookSelect(selectPrimaryKeysQuery, primaryKeys, true);
 	const { as: cteAs } = moveQueryToCte(ctx, selectPrimaryKeysQuery, void 0, true);
 	const relKeys = Object.keys(selectRelations);
 	const hookSelect = selectPrimaryKeysQuery.q.hookSelect;
+	const queryAs = getQueryAs(query);
 	const join = {
 		type: "JOIN",
 		args: {
 			w: cteAs,
 			a: [Object.fromEntries(primaryKeys.map((key) => {
 				const selected = hookSelect.get(key);
-				return [cteAs + "." + (selected.as || selected.select), key];
+				return [cteAs + "." + (selected.as || selected.select), `${queryAs}.${key}`];
 			}))]
 		}
 	};
@@ -7095,12 +7145,12 @@ const selectToSqlList = (ctx, table, query, quotedAs, hookSelect = query.hookSel
 				quotedTable = `"${tableName}"`;
 				columnName = select.slice(index + 1);
 				col = table.q.joinedShapes?.[tableName]?.[columnName];
-				sql = col?.data.computed ? col.data.computed.toSQL(ctx, `"${tableName}"`) : `"${tableName}"."${col?.data.name || columnName}"`;
+				sql = selectedColumnToSql(ctx, table.q, table.q.shape, select, void 0);
 			} else {
 				quotedTable = quotedAs;
 				columnName = select;
 				col = query.shape[select];
-				sql = simpleColumnToSQL(ctx, select, col, quotedAs);
+				sql = selectedColumnToSql(ctx, table.q, query.shape, select, quotedAs);
 			}
 		} else {
 			columnName = column;
@@ -7140,17 +7190,24 @@ const selectToSql = (ctx, table, query, quotedAs, hookSelect = query.hookSelect,
 	return selectToSqlList(ctx, table, query, quotedAs, hookSelect, isSubSql, aliases, jsonList, delayedRelationSelect).join(", ");
 };
 const internalSelectAllSql = (ctx, query, quotedAs, jsonList) => {
-	if (jsonList) Object.assign(jsonList, query.selectAllShape);
+	if (jsonList) for (const key in query.selectAllShape) {
+		const column = query.selectAllShape[key];
+		jsonList[key] = getSelectedColumnData(column);
+	}
 	let columnsCount;
 	if (query.shape !== anyShape) {
 		columnsCount = 0;
 		for (const key in query.shape) if (!query.shape[key].data.explicitSelect) columnsCount++;
 		ctx.selectedCount += columnsCount;
 	}
-	return selectAllSql(query, quotedAs, columnsCount);
+	return selectAllSql(query, quotedAs, columnsCount, ctx);
+};
+const selectAllSql = (q, quotedAs, columnsCount, ctx) => {
+	return q.join?.length || q.updateFrom || q.updateMany ? q.selectAllColumns?.map((item) => selectAllColumnToSql(item, ctx, quotedAs, true)) || (isEmptySelect(q.shape, columnsCount) ? [] : [`${quotedAs}.*`]) : q.selectAllColumns ? q.selectAllColumns.map((item) => selectAllColumnToSql(item, ctx, quotedAs)) : isEmptySelect(q.shape, columnsCount) ? [] : ["*"];
 };
-const selectAllSql = (q, quotedAs, columnsCount) => {
-	return q.join?.length || q.updateFrom || q.updateMany ? q.selectAllColumns?.map((item) => `${quotedAs}.${item}`) || (isEmptySelect(q.shape, columnsCount) ? [] : [`${quotedAs}.*`]) : q.selectAllColumns ? [...q.selectAllColumns] : isEmptySelect(q.shape, columnsCount) ? [] : ["*"];
+const selectAllColumnToSql = (item, ctx, quotedAs, prefix) => {
+	if (typeof item !== "string") return item(ctx, quotedAs);
+	return prefix ? `${quotedAs}.${item}` : item;
 };
 const isEmptySelect = (shape, columnsCount) => columnsCount === void 0 ? shape === anyShape ? false : isObjectEmpty(shape) : !columnsCount;
 const pushSubQuerySql = (ctx, mainQuery, query, as, list, quotedAs, aliases) => {
@@ -7184,7 +7241,7 @@ const pushSubQuerySql = (ctx, mainQuery, query, as, list, quotedAs, aliases) =>
 			case "oneOrThrow": {
 				const table = query.q.joinedForSelect;
 				const shape = mainQuery.joinedShapes?.[as];
-				sql = makeRowToJson(table, shape, false);
+				sql = makeRowToJson(ctx, table, shape, false);
 				break;
 			}
 			case "all":
@@ -7711,6 +7768,14 @@ function pushLimitSQL(sql, values, q) {
 	}
 }
 const pushUpdateSql = (ctx, query, q, quotedAs, isSubSql) => {
+	const valuesJoinedAs = unsetValuesJoinedAsForMutativeSelectRelations(query);
+	try {
+		return pushUpdateSqlWithoutValuesJoinedAs(ctx, query, q, quotedAs, isSubSql);
+	} finally {
+		restoreValuesJoinedAsForMutativeSelectRelations(query, valuesJoinedAs);
+	}
+};
+const pushUpdateSqlWithoutValuesJoinedAs = (ctx, query, q, quotedAs, isSubSql) => {
 	const quotedTable = `"${query.table || q.from}"`;
 	const from = quoteTableWithSchema(query);
 	const set = [];
@@ -9569,6 +9634,8 @@ const toSql = (table, type, topCtx, isSubSql, cteName, calledByThen, dontAddTabl
 					_queryInsert(upsertOrCreate, query.upsertInsert());
 					upsertOrCreate.q.type = "upsert";
 				}
+				upsertOrCreate.q.appendQueries = query.upsertCreateAppendQueries;
+				upsertOrCreate.q.asFns = query.upsertCreateAsFns;
 				const { makeSql: makeSecondSql } = moveMutativeQueryToCteBase(toSql, ctx, upsertOrCreate, "insert");
 				sql.push(makeFirstSql(isSubSql), "UNION ALL", makeSecondSql(isSubSql));
 			} else {
@@ -9642,7 +9709,7 @@ const toSql = (table, type, topCtx, isSubSql, cteName, calledByThen, dontAddTabl
 			if (ctx.topCtx.cteHooks.hasSelect) {
 				if (prependedSelectParenthesis) result.text += ")";
 				const { tableHooks, ensureCount } = ctx.topCtx.cteHooks;
-				const keyValues = [...tableHooks ? Object.entries(tableHooks).map(([cteName, data]) => `'${cteName}', (SELECT json_agg(${makeRowToJson(cteName, data.shape, false, true)}) FROM "${cteName}")`) : emptyArray, ...ensureCount ? Object.entries(ensureCount).map(([cteName, item]) => `'#${cteName}', CASE WHEN ${"count" in item ? `(SELECT count(*) FROM "${cteName}") < ${item.count}` : `(SELECT "${cteName}"."${item.jsonNotNull}" FROM "${cteName}") IS NULL`} THEN (SELECT 'not-found')::int END`) : emptyArray];
+				const keyValues = [...tableHooks ? Object.entries(tableHooks).map(([cteName, data]) => `'${cteName}', (SELECT json_agg(${makeRowToJson(ctx, cteName, data.shape, false, true)}) FROM "${cteName}")`) : emptyArray, ...ensureCount ? Object.entries(ensureCount).map(([cteName, item]) => `'#${cteName}', CASE WHEN ${"count" in item ? `(SELECT count(*) FROM "${cteName}") < ${item.count}` : `(SELECT "${cteName}"."${item.jsonNotNull}" FROM "${cteName}") IS NULL`} THEN (SELECT 'not-found')::int END`) : emptyArray];
 				result.text += ` UNION ALL SELECT ${"NULL, ".repeat(ctx.selectedCount || 0)}json_build_object(${keyValues.join(", ")})`;
 			}
 		}
@@ -9724,9 +9791,9 @@ const addTopCteInternal = (place, ctx, item, type, dontAddTableHook) => {
 	topCTE.stack.pop();
 };
 const addWithToSql = (ctx, sql, isSubSql) => {
-	if (!isSubSql && ctx.topCtx.topCTE) {
+	if (!isSubSql && ctx.topCtx.topCTE?.append.length) {
 		const sqls = [];
-		if (!isSubSql && ctx.topCtx.topCTE) for (const append of ctx.topCtx.topCTE.append) sqls.push(...append);
+		for (const append of ctx.topCtx.topCTE.append) sqls.push(...append);
 		sql.text = "WITH " + sqls.join(", ") + " " + sql.text;
 	}
 };
@@ -9770,17 +9837,23 @@ const quoteFromWithSchema = (schema, table) => {
 	const s = typeof schema === "function" ? schema() : schema;
 	return s ? `"${s}"."${table}"` : `"${table}"`;
 };
-const makeRowToJson = (table, shape, aliasName, includingExplicitSelect) => {
+const makeRowToJson = (ctx, table, shape, aliasName, includingExplicitSelect) => {
 	let isSimple = true;
 	const list = [];
 	for (const key in shape) {
 		const column = shape[key];
 		if (!includingExplicitSelect && column.data.explicitSelect) 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}` : ""}`);
+		const selectSql = !column.data.computed ? column.data.selectSql : void 0;
+		const outputColumn = getSelectedColumnData(column);
+		if (aliasName && column.data.name || outputColumn.data.jsonCast || selectSql) isSimple = false;
+		const value = selectSql ? selectSql.toSQL(ctx, `"${table}"`) : `"${table}"."${aliasName && column.data.name || key}"`;
+		list.push(`'${key}', ${value}${outputColumn.data.jsonCast ? `::${outputColumn.data.jsonCast}` : ""}`);
 	}
 	return isSimple ? `row_to_json("${table}".*)` : `CASE WHEN to_jsonb("${table}") IS NULL THEN NULL ELSE json_build_object(` + list.join(", ") + ") END";
 };
+const getSelectedColumnData = (column) => {
+	return column.data.selectSql?.result.value || column;
+};
 const getSqlText = (sql) => {
 	if ("text" in sql) return sql.text;
 	throw new Error(`Batch SQL is not supported in this query`);
@@ -12370,6 +12443,9 @@ var QueryExpressions = class {
 const _appendQuery = (main, append, asFn) => {
 	return pushQueryValueImmutable(pushQueryValueImmutable(main, "appendQueries", prepareSubQueryForSql(main, append)), "asFns", asFn);
 };
+const _appendQueryOnUpsertCreate = (main, append, asFn) => {
+	return pushQueryValueImmutable(pushQueryValueImmutable(main, "upsertCreateAppendQueries", prepareSubQueryForSql(main, append)), "upsertCreateAsFns", asFn);
+};
 const mergableObjects = new Set([
 	"shape",
 	"withShapes",
@@ -12416,6 +12492,10 @@ var MergeQueryMethods = class {
 		return query;
 	}
 };
+const applyColumnSelectSql = (column) => {
+	const { selectSqlFn } = column.data;
+	if (selectSqlFn) column.data.selectSql = selectSqlFn(new ColumnRefExpression(column, column.data.key));
+};
 const DEFAULT_PRIVILEGE = {
 	OBJECT_TYPES: [
 		"TABLES",
@@ -13786,6 +13866,10 @@ var Db = class extends QueryMethods {
 			}
 			if (column.data.explicitSelect) prepareSelectAll = true;
 			else selectAllCount++;
+			if (column.data.selectSqlFn) {
+				applyColumnSelectSql(column);
+				prepareSelectAll = true;
+			}
 			const { modifyQuery: mq } = column.data;
 			if (mq) modifyQuery = pushOrNewArray(modifyQuery, (q) => mq(q, column));
 			if (typeof column.data.default === "function") {
@@ -13843,7 +13927,12 @@ var Db = class extends QueryMethods {
 			for (const key in shape) {
 				const column = shape[key];
 				if (!column.data.explicitSelect) {
-					list.push(column.data.name ? `"${column.data.name}" "${key}"` : `"${key}"`);
+					const { data } = column;
+					const { selectSql } = data;
+					let item;
+					if (selectSql) item = (ctx, quotedAs) => `(${selectSql.toSQL(ctx, quotedAs)}) "${key}"`;
+					else item = data.name ? `"${data.name}" "${key}"` : `"${key}"`;
+					list.push(item);
 					selectAllShape[key] = column;
 				}
 			}
@@ -14401,6 +14490,7 @@ exports.VarCharColumn = VarCharColumn;
 exports.VirtualColumn = VirtualColumn;
 exports.XMLColumn = XMLColumn;
 exports._appendQuery = _appendQuery;
+exports._appendQueryOnUpsertCreate = _appendQueryOnUpsertCreate;
 exports._clone = _clone;
 exports._createDbSqlMethod = _createDbSqlMethod;
 exports._hookSelectColumns = _hookSelectColumns;