drizzle-orm 1.0.0-beta.21 → 1.0.0-beta.21-4fa69ab

package/pg-core/dialect.cjs

@@ -1,5 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 const require_runtime = require('../_virtual/_rolldown/runtime.cjs');
+const require_pg_core_codecs = require('./codecs.cjs');
 const require_pg_core_view_base = require('./view-base.cjs');
 let __entity_ts = require("../entity.cjs");
 let __subquery_ts = require("../subquery.cjs");
@@ -7,9 +8,8 @@ let __view_common_ts = require("../view-common.cjs");
 let __table_ts = require("../table.cjs");
 let __column_ts = require("../column.cjs");
 let __utils_ts = require("../utils.cjs");
+let __codecs_ts = require("../codecs.cjs");
 let __sql_sql_ts = require("../sql/sql.cjs");
-let ___relations_ts = require("../_relations.cjs");
-___relations_ts = require_runtime.__toESM(___relations_ts);
 let __errors_ts = require("../errors.cjs");
 let __relations_ts = require("../relations.cjs");
 let __alias_ts = require("../alias.cjs");
@@ -21,10 +21,19 @@ let __pg_core_columns_index_ts = require("./columns/index.cjs");
 //#region src/pg-core/dialect.ts
 var PgDialect = class {
 	static [__entity_ts.entityKind] = "PgDialect";
-	/** @internal */
 	casing;
+	codecs;
+	mapperGenerators;
 	constructor(config) {
-		this.casing = new __casing_ts.CasingCache(config?.casing);
+		this.casing = typeof config?.casing === "object" ? config.casing : new __casing_ts.CasingCache(config?.casing);
+		this.codecs = new __codecs_ts.CodecsCollection(require_pg_core_codecs.resolvePgType, config?.codecs);
+		this.mapperGenerators = config?.useJitMappers ? {
+			rows: __utils_ts.makeJitQueryMapper,
+			relationalRows: __relations_ts.makeJitRqbMapper
+		} : {
+			rows: __utils_ts.makeDefaultQueryMapper,
+			relationalRows: __relations_ts.makeDefaultRqbMapper
+		};
 	}
 	escapeName(name) {
 		return `"${name.replace(/"/g, "\"\"")}"`;
@@ -45,9 +54,12 @@ var PgDialect = class {
 		withSqlChunks.push(__sql_sql_ts.sql` `);
 		return __sql_sql_ts.sql.join(withSqlChunks);
 	}
-	buildDeleteQuery({ table, where, returning, withList, comment }) {
+	buildDeleteQuery({ table, where, returning, withList, comment, ignoreSelectionCastCodecs }) {
 		const withSql = this.buildWithCTE(withList);
-		const returningSql = returning ? __sql_sql_ts.sql` returning ${this.buildSelection(returning, { isSingleTable: true })}` : void 0;
+		const returningSql = returning ? __sql_sql_ts.sql` returning ${this.buildSelection(returning, {
+			isSingleTable: true,
+			ignoreCastCodecs: ignoreSelectionCastCodecs
+		})}` : void 0;
 		return __sql_sql_ts.sql`${withSql}delete from ${table}${where ? __sql_sql_ts.sql` where ${where}` : void 0}${returningSql}${comment !== void 0 ? __sql_sql_ts.sql` ${comment}` : void 0}`;
 	}
 	buildUpdateSet(table, set) {
@@ -63,7 +75,7 @@ var PgDialect = class {
 			return [res];
 		}));
 	}
-	buildUpdateQuery({ table, set, where, returning, withList, from, joins, comment }) {
+	buildUpdateQuery({ table, set, where, returning, withList, from, joins, comment, ignoreSelectionCastCodecs }) {
 		const withSql = this.buildWithCTE(withList);
 		const tableName = table[__pg_core_table_ts.PgTable.Symbol.Name];
 		const tableSchema = table[__pg_core_table_ts.PgTable.Symbol.Schema];
@@ -73,7 +85,10 @@ var PgDialect = class {
 		const setSql = this.buildUpdateSet(table, set);
 		const fromSql = from && __sql_sql_ts.sql.join([__sql_sql_ts.sql.raw(" from "), this.buildFromTable(from)]);
 		const joinsSql = this.buildJoins(joins);
-		const returningSql = returning ? __sql_sql_ts.sql` returning ${this.buildSelection(returning, { isSingleTable: !from })}` : void 0;
+		const returningSql = returning ? __sql_sql_ts.sql` returning ${this.buildSelection(returning, {
+			isSingleTable: !from,
+			ignoreCastCodecs: ignoreSelectionCastCodecs
+		})}` : void 0;
 		return __sql_sql_ts.sql`${withSql}update ${tableSql} set ${setSql}${fromSql}${joinsSql}${where ? __sql_sql_ts.sql` where ${where}` : void 0}${returningSql}${comment !== void 0 ? __sql_sql_ts.sql` ${comment}` : void 0}`;
 	}
 	/**
@@ -87,7 +102,7 @@ var PgDialect = class {
 	*
 	* If `isSingleTable` is true, then columns won't be prefixed with table name
 	*/
-	buildSelection(fields, { isSingleTable = false } = {}) {
+	buildSelection(fields, { isSingleTable = false, ignoreCastCodecs = false } = {}) {
 		const columnsLen = fields.length;
 		const chunks = fields.flatMap(({ field }, i) => {
 			const chunk = [];
@@ -104,9 +119,13 @@ var PgDialect = class {
 					chunk.push(query.shouldInlineParams ? newSql.inlineParams() : newSql);
 				} else chunk.push(query);
 				if ((0, __entity_ts.is)(field, __sql_sql_ts.SQL.Aliased)) chunk.push(__sql_sql_ts.sql` as ${__sql_sql_ts.sql.identifier(field.fieldAlias)}`);
-			} else if ((0, __entity_ts.is)(field, __column_ts.Column)) if (isSingleTable) chunk.push(field.isAlias ? __sql_sql_ts.sql`${__sql_sql_ts.sql.identifier(this.casing.getColumnCasing((0, __alias_ts.getOriginalColumnFromAlias)(field)))} as ${field}` : __sql_sql_ts.sql.identifier(this.casing.getColumnCasing(field)));
-			else chunk.push(field.isAlias ? __sql_sql_ts.sql`${(0, __alias_ts.getOriginalColumnFromAlias)(field)} as ${field}` : field);
-			else if ((0, __entity_ts.is)(field, __subquery_ts.Subquery)) {
+			} else if ((0, __entity_ts.is)(field, __column_ts.Column)) {
+				let name;
+				if (isSingleTable) name = field.isAlias ? __sql_sql_ts.sql.identifier(this.casing.getColumnCasing((0, __alias_ts.getOriginalColumnFromAlias)(field))) : __sql_sql_ts.sql.identifier(this.casing.getColumnCasing(field));
+				else name = field.isAlias ? (0, __alias_ts.getOriginalColumnFromAlias)(field) : field;
+				const casted = ignoreCastCodecs ? name : this.codecs.apply(field, "cast", name);
+				chunk.push(field.isAlias ? __sql_sql_ts.sql`${casted} as ${field}` : casted);
+			} else if ((0, __entity_ts.is)(field, __subquery_ts.Subquery)) {
 				const entries = Object.entries(field._.selectedFields);
 				if (entries.length === 1) {
 					const entry = entries[0][1];
@@ -158,8 +177,8 @@ var PgDialect = class {
 		}
 		return table;
 	}
-	buildSelectQuery({ withList, fields, fieldsFlat, where, having, table, joins, orderBy, groupBy, limit, offset, lockingClause, distinct, setOperators, comment }) {
-		const fieldsList = fieldsFlat ?? (0, __utils_ts.orderSelectedFields)(fields);
+	buildSelectQuery({ withList, fields, fieldsFlat, where, having, table, joins, orderBy, groupBy, limit, offset, lockingClause, distinct, setOperators, comment, ignoreSelectionCastCodecs }) {
+		const fieldsList = fieldsFlat ?? (0, __utils_ts.orderSelectedFields)(fields, void 0, this.codecs);
 		for (const f of fieldsList) if ((0, __entity_ts.is)(f.field, __column_ts.Column) && (0, __table_ts.getTableName)(f.field.table) !== ((0, __entity_ts.is)(table, __subquery_ts.Subquery) ? table._.alias : (0, __entity_ts.is)(table, require_pg_core_view_base.PgViewBase) ? table[__view_common_ts.ViewBaseConfig].name : (0, __entity_ts.is)(table, __sql_sql_ts.SQL) ? void 0 : (0, __table_ts.getTableName)(table)) && !((table) => joins?.some(({ alias }) => alias === (table[__table_ts.Table.Symbol.IsAlias] ? (0, __table_ts.getTableName)(table) : table[__table_ts.Table.Symbol.BaseName])))(f.field.table)) {
 			const tableName = (0, __table_ts.getTableName)(f.field.table);
 			throw new Error(`Your "${f.path.join("->")}" field references a column "${tableName}"."${f.field.name}", but the table "${tableName}" is not part of the query! Did you forget to join it?`);
@@ -168,7 +187,10 @@ var PgDialect = class {
 		const withSql = this.buildWithCTE(withList);
 		let distinctSql;
 		if (distinct) distinctSql = distinct === true ? __sql_sql_ts.sql` distinct` : __sql_sql_ts.sql` distinct on (${__sql_sql_ts.sql.join(distinct.on, __sql_sql_ts.sql`, `)})`;
-		const selection = this.buildSelection(fieldsList, { isSingleTable });
+		const selection = this.buildSelection(fieldsList, {
+			isSingleTable,
+			ignoreCastCodecs: ignoreSelectionCastCodecs
+		});
 		const tableSql = this.buildFromTable(table);
 		const joinsSql = this.buildJoins(joins);
 		const whereSql = where ? __sql_sql_ts.sql` where ${where}` : void 0;
@@ -224,7 +246,7 @@ var PgDialect = class {
 		const offsetSql = offset ? __sql_sql_ts.sql` offset ${offset}` : void 0;
 		return __sql_sql_ts.sql`${leftChunk}${operatorChunk}${rightChunk}${orderBySql}${limitSql}${offsetSql}`;
 	}
-	buildInsertQuery({ table, values: valuesOrSelect, onConflict, returning, withList, select, overridingSystemValue_, comment }) {
+	buildInsertQuery({ table, values: valuesOrSelect, onConflict, returning, withList, select, overridingSystemValue_, comment, ignoreSelectionCastCodecs }) {
 		const valuesSqlList = [];
 		const columns = table[__table_ts.Table.Symbol.Columns];
 		const colEntries = Object.entries(columns).filter(([_, col]) => !col.shouldDisableInsert());
@@ -257,7 +279,10 @@ var PgDialect = class {
 		}
 		const withSql = this.buildWithCTE(withList);
 		const valuesSql = __sql_sql_ts.sql.join(valuesSqlList);
-		const returningSql = returning ? __sql_sql_ts.sql` returning ${this.buildSelection(returning, { isSingleTable: true })}` : void 0;
+		const returningSql = returning ? __sql_sql_ts.sql` returning ${this.buildSelection(returning, {
+			isSingleTable: true,
+			ignoreCastCodecs: ignoreSelectionCastCodecs
+		})}` : void 0;
 		const onConflictSql = onConflict ? __sql_sql_ts.sql` on conflict ${onConflict}` : void 0;
 		return __sql_sql_ts.sql`${withSql}insert into ${table} ${insertOrder} ${overridingSystemValue_ === true ? __sql_sql_ts.sql`overriding system value ` : void 0}${valuesSql}${onConflictSql}${returningSql}${comment !== void 0 ? __sql_sql_ts.sql` ${comment}` : void 0}`;
 	}
@@ -280,224 +305,35 @@ var PgDialect = class {
 			escapeParam: this.escapeParam,
 			escapeString: this.escapeString,
 			prepareTyping: this.prepareTyping,
+			codecs: this.codecs,
 			invokeSource
 		});
 	}
-	/** @deprecated */
-	_buildRelationalQuery({ fullSchema, schema, tableNamesMap, table, tableConfig, queryConfig: config, tableAlias, nestedQueryRelation, joinOn }) {
-		let selection = [];
-		let limit, offset, orderBy = [], where;
-		const joins = [];
-		if (config === true) selection = Object.entries(tableConfig.columns).map(([key, value]) => ({
-			dbKey: value.name,
-			tsKey: key,
-			field: (0, __alias_ts.aliasedTableColumn)(value, tableAlias),
-			relationTableTsKey: void 0,
-			isJson: false,
-			selection: []
-		}));
-		else {
-			const aliasedColumns = Object.fromEntries(Object.entries(tableConfig.columns).map(([key, value]) => [key, (0, __alias_ts.aliasedTableColumn)(value, tableAlias)]));
-			if (config.where) {
-				const whereSql = typeof config.where === "function" ? config.where(aliasedColumns, ___relations_ts.getOperators()) : config.where;
-				where = whereSql && (0, __alias_ts.mapColumnsInSQLToAlias)(whereSql, tableAlias);
-			}
-			const fieldsSelection = [];
-			let selectedColumns = [];
-			if (config.columns) {
-				let isIncludeMode = false;
-				for (const [field, value] of Object.entries(config.columns)) {
-					if (value === void 0) continue;
-					if (field in tableConfig.columns) {
-						if (!isIncludeMode && value === true) isIncludeMode = true;
-						selectedColumns.push(field);
-					}
-				}
-				if (selectedColumns.length > 0) selectedColumns = isIncludeMode ? selectedColumns.filter((c) => config.columns?.[c] === true) : Object.keys(tableConfig.columns).filter((key) => !selectedColumns.includes(key));
-			} else selectedColumns = Object.keys(tableConfig.columns);
-			for (const field of selectedColumns) {
-				const column = tableConfig.columns[field];
-				fieldsSelection.push({
-					tsKey: field,
-					value: column
-				});
-			}
-			let selectedRelations = [];
-			if (config.with) selectedRelations = Object.entries(config.with).filter((entry) => !!entry[1]).map(([tsKey, queryConfig]) => ({
-				tsKey,
-				queryConfig,
-				relation: tableConfig.relations[tsKey]
-			}));
-			let extras;
-			if (config.extras) {
-				extras = typeof config.extras === "function" ? config.extras(aliasedColumns, { sql: __sql_sql_ts.sql }) : config.extras;
-				for (const [tsKey, value] of Object.entries(extras)) fieldsSelection.push({
-					tsKey,
-					value: (0, __alias_ts.mapColumnsInAliasedSQLToAlias)(value, tableAlias)
-				});
-			}
-			for (const { tsKey, value } of fieldsSelection) selection.push({
-				dbKey: (0, __entity_ts.is)(value, __sql_sql_ts.SQL.Aliased) ? value.fieldAlias : tableConfig.columns[tsKey].name,
-				tsKey,
-				field: (0, __entity_ts.is)(value, __column_ts.Column) ? (0, __alias_ts.aliasedTableColumn)(value, tableAlias) : value,
-				relationTableTsKey: void 0,
-				isJson: false,
-				selection: []
-			});
-			let orderByOrig = typeof config.orderBy === "function" ? config.orderBy(aliasedColumns, ___relations_ts.getOrderByOperators()) : config.orderBy ?? [];
-			if (!Array.isArray(orderByOrig)) orderByOrig = [orderByOrig];
-			orderBy = orderByOrig.map((orderByValue) => {
-				if ((0, __entity_ts.is)(orderByValue, __column_ts.Column)) return (0, __alias_ts.aliasedTableColumn)(orderByValue, tableAlias);
-				return (0, __alias_ts.mapColumnsInSQLToAlias)(orderByValue, tableAlias);
-			});
-			limit = config.limit;
-			offset = config.offset;
-			for (const { tsKey: selectedRelationTsKey, queryConfig: selectedRelationConfigValue, relation } of selectedRelations) {
-				const normalizedRelation = ___relations_ts.normalizeRelation(schema, tableNamesMap, relation);
-				const relationTableTsName = tableNamesMap[(0, __table_ts.getTableUniqueName)(relation.referencedTable)];
-				const relationTableAlias = `${tableAlias}_${selectedRelationTsKey}`;
-				const joinOn = (0, __sql_index_ts.and)(...normalizedRelation.fields.map((field, i) => (0, __sql_index_ts.eq)((0, __alias_ts.aliasedTableColumn)(normalizedRelation.references[i], relationTableAlias), (0, __alias_ts.aliasedTableColumn)(field, tableAlias))));
-				const builtRelation = this._buildRelationalQuery({
-					fullSchema,
-					schema,
-					tableNamesMap,
-					table: fullSchema[relationTableTsName],
-					tableConfig: schema[relationTableTsName],
-					queryConfig: (0, __entity_ts.is)(relation, ___relations_ts.One) ? selectedRelationConfigValue === true ? { limit: 1 } : {
-						...selectedRelationConfigValue,
-						limit: 1
-					} : selectedRelationConfigValue,
-					tableAlias: relationTableAlias,
-					joinOn,
-					nestedQueryRelation: relation
-				});
-				const field = __sql_sql_ts.sql`${__sql_sql_ts.sql.identifier(relationTableAlias)}.${__sql_sql_ts.sql.identifier("data")}`.as(selectedRelationTsKey);
-				joins.push({
-					on: __sql_sql_ts.sql`true`,
-					table: new __subquery_ts.Subquery(builtRelation.sql, {}, relationTableAlias),
-					alias: relationTableAlias,
-					joinType: "left",
-					lateral: true
-				});
-				selection.push({
-					dbKey: selectedRelationTsKey,
-					tsKey: selectedRelationTsKey,
-					field,
-					relationTableTsKey: relationTableTsName,
-					isJson: true,
-					selection: builtRelation.selection
-				});
-			}
-		}
-		if (selection.length === 0) throw new __errors_ts.DrizzleError({ message: `No fields selected for table "${tableConfig.tsName}" ("${tableAlias}")` });
-		let result;
-		where = (0, __sql_index_ts.and)(joinOn, where);
-		if (nestedQueryRelation) {
-			let field = __sql_sql_ts.sql`json_build_array(${__sql_sql_ts.sql.join(selection.map(({ field, tsKey, isJson }) => isJson ? __sql_sql_ts.sql`${__sql_sql_ts.sql.identifier(`${tableAlias}_${tsKey}`)}.${__sql_sql_ts.sql.identifier("data")}` : (0, __entity_ts.is)(field, __sql_sql_ts.SQL.Aliased) ? field.sql : field), __sql_sql_ts.sql`, `)})`;
-			if ((0, __entity_ts.is)(nestedQueryRelation, ___relations_ts.Many)) field = __sql_sql_ts.sql`coalesce(json_agg(${field}${orderBy.length > 0 ? __sql_sql_ts.sql` order by ${__sql_sql_ts.sql.join(orderBy, __sql_sql_ts.sql`, `)}` : void 0}), '[]'::json)`;
-			const nestedSelection = [{
-				dbKey: "data",
-				tsKey: "data",
-				field: field.as("data"),
-				isJson: true,
-				relationTableTsKey: tableConfig.tsName,
-				selection
-			}];
-			if (limit !== void 0 || offset !== void 0 || orderBy.length > 0) {
-				result = this.buildSelectQuery({
-					table: (0, __alias_ts.aliasedTable)(table, tableAlias),
-					fields: {},
-					fieldsFlat: [{
-						path: [],
-						field: __sql_sql_ts.sql.raw("*")
-					}],
-					where,
-					limit,
-					offset,
-					orderBy,
-					setOperators: []
-				});
-				where = void 0;
-				limit = void 0;
-				offset = void 0;
-				orderBy = [];
-			} else result = (0, __alias_ts.aliasedTable)(table, tableAlias);
-			result = this.buildSelectQuery({
-				table: (0, __entity_ts.is)(result, __pg_core_table_ts.PgTable) ? result : new __subquery_ts.Subquery(result, {}, tableAlias),
-				fields: {},
-				fieldsFlat: nestedSelection.map(({ field }) => ({
-					path: [],
-					field: (0, __entity_ts.is)(field, __column_ts.Column) ? (0, __alias_ts.aliasedTableColumn)(field, tableAlias) : field
-				})),
-				joins,
-				where,
-				limit,
-				offset,
-				orderBy,
-				setOperators: []
-			});
-		} else result = this.buildSelectQuery({
-			table: (0, __alias_ts.aliasedTable)(table, tableAlias),
-			fields: {},
-			fieldsFlat: selection.map(({ field }) => ({
-				path: [],
-				field: (0, __entity_ts.is)(field, __column_ts.Column) ? (0, __alias_ts.aliasedTableColumn)(field, tableAlias) : field
-			})),
-			joins,
-			where,
-			limit,
-			offset,
-			orderBy,
-			setOperators: []
-		});
-		if (config !== true && config.comment) {
-			const comment = __sql_sql_ts.sql.comment(config.comment);
-			result = comment ? __sql_sql_ts.sql`${result} ${comment}` : result;
-		}
-		return {
-			tableTsKey: tableConfig.tsName,
-			sql: result,
-			selection
-		};
-	}
 	nestedSelectionerror() {
 		throw new __errors_ts.DrizzleError({ message: `Views with nested selections are not supported by the relational query builder` });
 	}
-	buildRqbColumn(table, column, key) {
+	buildRqbColumn(table, column, key, inJson) {
 		if ((0, __entity_ts.is)(column, __column_ts.Column)) {
 			const name = __sql_sql_ts.sql`${table}.${__sql_sql_ts.sql.identifier(this.casing.getColumnCasing(column))}`;
-			const targetType = column.columnType;
-			const dimensionCnt = (0, __entity_ts.is)(column, __pg_core_columns_index_ts.PgColumn) ? column.dimensions : 0;
-			switch (targetType) {
-				case "PgNumeric":
-				case "PgNumericNumber":
-				case "PgNumericBigInt":
-				case "PgBigInt64":
-				case "PgBigIntString":
-				case "PgBigSerial64":
-				case "PgTimestampString":
-				case "PgGeometry":
-				case "PgGeometryObject":
-				case "PgBytea": {
-					const arrVal = "[]".repeat(dimensionCnt);
-					return __sql_sql_ts.sql`${name}::text${__sql_sql_ts.sql.raw(arrVal).if(arrVal)} as ${__sql_sql_ts.sql.identifier(key)}`;
-				}
-				case "PgCustomColumn": return __sql_sql_ts.sql`${column.jsonSelectIdentifier(name, __sql_sql_ts.sql, dimensionCnt > 0 ? dimensionCnt : void 0)} as ${__sql_sql_ts.sql.identifier(key)}`;
-				default: return __sql_sql_ts.sql`${name} as ${__sql_sql_ts.sql.identifier(key)}`;
-			}
+			return __sql_sql_ts.sql`${inJson && column.jsonSelectIdentifier ? column.jsonSelectIdentifier(name, __sql_sql_ts.sql, column.dimensions) : this.codecs.apply(column, inJson ? "castInJson" : "cast", name)} as ${__sql_sql_ts.sql.identifier(key)}`;
 		}
 		return __sql_sql_ts.sql`${table}.${(0, __entity_ts.is)(column, __sql_sql_ts.SQL.Aliased) ? __sql_sql_ts.sql.identifier(column.fieldAlias) : (0, __sql_index_ts.isSQLWrapper)(column) ? __sql_sql_ts.sql.identifier(key) : this.nestedSelectionerror()} as ${__sql_sql_ts.sql.identifier(key)}`;
 	}
-	unwrapAllColumns = (table, selection) => {
+	unwrapAllColumns = (table, selection, inJson) => {
 		return __sql_sql_ts.sql.join(Object.entries(table[__table_ts.TableColumns]).map(([k, v]) => {
-			selection.push({
+			selection.push((0, __entity_ts.is)(v, __column_ts.Column) ? {
+				key: k,
+				codec: this.codecs.get(v, inJson ? "normalizeInJson" : "normalize"),
+				arrayDimensions: v.dimensions,
+				field: v
+			} : {
 				key: k,
 				field: v
 			});
-			return this.buildRqbColumn(table, v, k);
+			return this.buildRqbColumn(table, v, k, inJson);
 		}), __sql_sql_ts.sql`, `);
 	};
-	buildColumns = (table, selection, config) => config?.columns ? (() => {
+	buildColumns = (table, selection, inJson, config) => config?.columns ? (() => {
 		const entries = Object.entries(config.columns);
 		const columnContainer = table[__table_ts.TableColumns];
 		const columnIdentifiers = [];
@@ -507,8 +343,13 @@ var PgDialect = class {
 			colSelectionMode = colSelectionMode || v;
 			if (v) {
 				const column = columnContainer[k];
-				columnIdentifiers.push(this.buildRqbColumn(table, column, k));
-				selection.push({
+				columnIdentifiers.push(this.buildRqbColumn(table, column, k, inJson));
+				selection.push((0, __entity_ts.is)(column, __column_ts.Column) ? {
+					key: k,
+					codec: this.codecs.get(column, inJson ? "normalizeInJson" : "normalize"),
+					arrayDimensions: column.dimensions,
+					field: column
+				} : {
 					key: k,
 					field: column
 				});
@@ -516,15 +357,20 @@ var PgDialect = class {
 		}
 		if (colSelectionMode === false) for (const [k, v] of Object.entries(columnContainer)) {
 			if (config.columns[k] === false) continue;
-			columnIdentifiers.push(this.buildRqbColumn(table, v, k));
-			selection.push({
+			columnIdentifiers.push(this.buildRqbColumn(table, v, k, inJson));
+			selection.push((0, __entity_ts.is)(v, __column_ts.Column) ? {
+				key: k,
+				codec: this.codecs.get(v, inJson ? "normalizeInJson" : "normalize"),
+				arrayDimensions: v.dimensions,
+				field: v
+			} : {
 				key: k,
 				field: v
 			});
 		}
 		return columnIdentifiers.length ? __sql_sql_ts.sql.join(columnIdentifiers, __sql_sql_ts.sql`, `) : void 0;
-	})() : this.unwrapAllColumns(table, selection);
-	buildRelationalQuery({ schema, table, tableConfig, queryConfig: config, relationWhere, mode, errorPath, depth, throughJoin }) {
+	})() : this.unwrapAllColumns(table, selection, inJson);
+	buildRelationalQuery({ schema, table, tableConfig, queryConfig: config, relationWhere, mode, errorPath, depth, throughJoin, nested }) {
 		const selection = [];
 		const isSingle = mode === "first";
 		const params = config === true ? void 0 : config;
@@ -535,7 +381,7 @@ var PgDialect = class {
 		const offset = params?.offset;
 		const where = params?.where && relationWhere ? (0, __sql_index_ts.and)((0, __relations_ts.relationsFilterToSQL)(table, params.where, tableConfig.relations, schema, this.casing), relationWhere) : params?.where ? (0, __relations_ts.relationsFilterToSQL)(table, params.where, tableConfig.relations, schema, this.casing) : relationWhere;
 		const order = params?.orderBy ? (0, __relations_ts.relationsOrderToSQL)(table, params.orderBy) : void 0;
-		const columns = this.buildColumns(table, selection, params);
+		const columns = this.buildColumns(table, selection, !!nested, params);
 		const extras = params?.extras ? (0, __relations_ts.relationExtrasToSQL)(table, params.extras) : void 0;
 		if (extras) selection.push(...extras.selection);
 		const selectionArr = columns ? [columns] : [];
@@ -561,7 +407,8 @@ var PgDialect = class {
 					relationWhere: filter,
 					errorPath: `${currentPath.length ? `${currentPath}.` : ""}${k}`,
 					depth: currentDepth + 1,
-					throughJoin
+					throughJoin,
+					nested: true
 				});
 				selection.push({
 					field: targetTable,