column.as(alias) prototype

Sukairo-02 · Sukairo-02 · commit 510b6811122e · 2025-11-14T13:03:17.000+02:00
diff --git a/drizzle-orm/src/alias.ts b/drizzle-orm/src/alias.ts
@@ -1,4 +1,5 @@
 import type * as V1 from './_relations.ts';
+import { OriginalColumn } from './column-common.ts';
 import type { AnyColumn } from './column.ts';
 import { Column } from './column.ts';
 import { entityKind, is } from './entity.ts';
@@ -7,8 +8,8 @@ import { SQL, sql } from './sql/sql.ts';
 import { Table } from './table.ts';
 import { ViewBaseConfig } from './view-common.ts';
 
-export class ColumnAliasProxyHandler<TColumn extends Column> implements ProxyHandler<TColumn> {
-	static readonly [entityKind]: string = 'ColumnAliasProxyHandler';
+export class ColumnTableAliasProxyHandler<TColumn extends Column> implements ProxyHandler<TColumn> {
+	static readonly [entityKind]: string = 'ColumnTableAliasProxyHandler';
 
 	constructor(private table: Table | View) {}
 
@@ -58,7 +59,7 @@ export class TableAliasProxyHandler<T extends Table | View> implements ProxyHand
 			Object.keys(columns).map((key) => {
 				proxiedColumns[key] = new Proxy(
 					columns[key]!,
-					new ColumnAliasProxyHandler(new Proxy(target, this)),
+					new ColumnTableAliasProxyHandler(new Proxy(target, this)),
 				);
 			});
 
@@ -67,13 +68,39 @@ export class TableAliasProxyHandler<T extends Table | View> implements ProxyHand
 
 		const value = target[prop as keyof typeof target];
 		if (is(value, Column)) {
-			return new Proxy(value as AnyColumn, new ColumnAliasProxyHandler(new Proxy(target, this)));
+			return new Proxy(value as AnyColumn, new ColumnTableAliasProxyHandler(new Proxy(target, this)));
 		}
 
 		return value;
 	}
 }
 
+export class ColumnAliasProxyHandler<T extends Column> implements ProxyHandler<T> {
+	static readonly [entityKind]: string = 'ColumnAliasProxyHandler';
+
+	constructor(private alias: string) {}
+
+	get(target: T, prop: keyof Column): any {
+		if (prop === 'isAlias') {
+			return true;
+		}
+
+		if (prop === 'name') {
+			return this.alias;
+		}
+
+		if (prop === 'keyAsName') {
+			return false;
+		}
+
+		if (prop === OriginalColumn) {
+			return () => target;
+		}
+
+		return target[prop];
+	}
+}
+
 export class RelationTableAliasProxyHandler<T extends V1.Relation> implements ProxyHandler<T> {
 	static readonly [entityKind]: string = 'RelationTableAliasProxyHandler';
 
@@ -92,14 +119,18 @@ export function aliasedTable<T extends Table | View>(table: T, tableAlias: strin
 	return new Proxy(table, new TableAliasProxyHandler(tableAlias, false));
 }
 
+export function aliasedColumn<T extends Column>(column: T, alias: string): T {
+	return new Proxy(column, new ColumnAliasProxyHandler(alias));
+}
+
 export function aliasedRelation<T extends V1.Relation>(relation: T, tableAlias: string): T {
 	return new Proxy(relation, new RelationTableAliasProxyHandler(tableAlias));
 }
 
 export function aliasedTableColumn<T extends AnyColumn>(column: T, tableAlias: string): T {
 	return new Proxy(
 		column,
-		new ColumnAliasProxyHandler(new Proxy(column.table, new TableAliasProxyHandler(tableAlias, false))),
+		new ColumnTableAliasProxyHandler(new Proxy(column.table, new TableAliasProxyHandler(tableAlias, false))),
 	);
 }
 
@@ -121,3 +152,12 @@ export function mapColumnsInSQLToAlias(query: SQL, alias: string): SQL {
 		return c;
 	}));
 }
+
+// Defined separately from the Column class to resolve circular dependency
+Column.prototype.as = function(alias: string): Column {
+	return aliasedColumn(this, alias);
+};
+
+export function getOriginalColumnFromAlias<T extends Column>(column: T): T {
+	return column[OriginalColumn]();
+}
diff --git a/drizzle-orm/src/cockroach-core/dialect.ts b/drizzle-orm/src/cockroach-core/dialect.ts
@@ -1,5 +1,11 @@
 import * as V1 from '~/_relations.ts';
-import { aliasedTable, aliasedTableColumn, mapColumnsInAliasedSQLToAlias, mapColumnsInSQLToAlias } from '~/alias.ts';
+import {
+	aliasedTable,
+	aliasedTableColumn,
+	getOriginalColumnFromAlias,
+	mapColumnsInAliasedSQLToAlias,
+	mapColumnsInSQLToAlias,
+} from '~/alias.ts';
 import { CasingCache } from '~/casing.ts';
 import {
 	CockroachColumn,
@@ -234,9 +240,13 @@ export class CockroachDialect {
 					}
 				} else if (is(field, Column)) {
 					if (isSingleTable) {
-						chunk.push(sql.identifier(this.casing.getColumnCasing(field)));
+						chunk.push(
+							field.isAlias
+								? sql`${sql.identifier(this.casing.getColumnCasing(getOriginalColumnFromAlias(field)))} as ${field}`
+								: sql.identifier(this.casing.getColumnCasing(field)),
+						);
 					} else {
-						chunk.push(field);
+						chunk.push(field.isAlias ? sql`${getOriginalColumnFromAlias(field)} as ${field}` : field);
 					}
 				}
 
diff --git a/drizzle-orm/src/column-common.ts b/drizzle-orm/src/column-common.ts
@@ -0,0 +1 @@
+export const OriginalColumn = Symbol.for('drizzle:OriginalColumn');
diff --git a/drizzle-orm/src/column.ts b/drizzle-orm/src/column.ts
@@ -4,6 +4,7 @@ import type {
 	GeneratedColumnConfig,
 	GeneratedIdentityConfig,
 } from './column-builder.ts';
+import { OriginalColumn } from './column-common.ts';
 import { entityKind } from './entity.ts';
 import type { DriverValueMapper, SQL, SQLWrapper } from './sql/sql.ts';
 import type { Table } from './table.ts';
@@ -31,7 +32,10 @@ export interface Column<
 	TRuntimeConfig extends object = object,
 > extends DriverValueMapper<T['data'], T['driverParam']>, SQLWrapper {
 	// SQLWrapper runtime implementation is defined in 'sql/sql.ts'
+	// `as` runtime implementation is defined in 'alias.ts'
+	as(alias: string): this;
 }
+
 /*
 	`Column` only accepts a full `ColumnConfig` as its generic.
 	To infer parts of the config, use `AnyColumn` that accepts a partial config.
@@ -65,6 +69,7 @@ export abstract class Column<
 	readonly generatedIdentity: GeneratedIdentityConfig | undefined = undefined;
 	readonly length: number | undefined;
 	readonly isLengthExact: boolean | undefined;
+	readonly isAlias: boolean;
 
 	/** @internal */
 	protected config: ColumnBuilderRuntimeConfig<T['data']> & TRuntimeConfig;
@@ -84,6 +89,7 @@ export abstract class Column<
 		this.table = table;
 
 		this.name = config.name;
+		this.isAlias = false;
 		this.keyAsName = config.keyAsName;
 		this.notNull = config.notNull;
 		this.default = config.default;
@@ -116,6 +122,11 @@ export abstract class Column<
 	shouldDisableInsert(): boolean {
 		return this.config.generated !== undefined && this.config.generated.type !== 'byDefault';
 	}
+
+	/** @internal */
+	[OriginalColumn](): this {
+		return this;
+	}
 }
 
 export type UpdateColConfig<
diff --git a/drizzle-orm/src/gel-core/dialect.ts b/drizzle-orm/src/gel-core/dialect.ts
@@ -1,5 +1,11 @@
 import * as V1 from '~/_relations.ts';
-import { aliasedTable, aliasedTableColumn, mapColumnsInAliasedSQLToAlias, mapColumnsInSQLToAlias } from '~/alias.ts';
+import {
+	aliasedTable,
+	aliasedTableColumn,
+	getOriginalColumnFromAlias,
+	mapColumnsInAliasedSQLToAlias,
+	mapColumnsInSQLToAlias,
+} from '~/alias.ts';
 import { CasingCache } from '~/casing.ts';
 import { Column } from '~/column.ts';
 import { entityKind, is } from '~/entity.ts';
@@ -241,9 +247,13 @@ export class GelDialect {
 					// Gel throws an error when more than one similarly named columns exist within context instead of preferring the closest one
 					// thus forcing us to be explicit about column's source
 					// if (isSingleTable) {
-					// 	chunk.push(sql.identifier(this.casing.getColumnCasing(field)));
+					// chunk.push(
+					// 	field.isAlias
+					// 		? sql`${sql.identifier(this.casing.getColumnCasing(getOriginalColumnFromAlias(field)))} as ${field}`
+					// 		: sql.identifier(this.casing.getColumnCasing(field)),
+					// );
 					// } else {
-					chunk.push(field);
+					chunk.push(field.isAlias ? sql`${getOriginalColumnFromAlias(field)} as ${field}` : field);
 					// }
 				}
 
diff --git a/drizzle-orm/src/mssql-core/dialect.ts b/drizzle-orm/src/mssql-core/dialect.ts
@@ -1,5 +1,11 @@
 import * as V1 from '~/_relations.ts';
-import { aliasedTable, aliasedTableColumn, mapColumnsInAliasedSQLToAlias, mapColumnsInSQLToAlias } from '~/alias.ts';
+import {
+	aliasedTable,
+	aliasedTableColumn,
+	getOriginalColumnFromAlias,
+	mapColumnsInAliasedSQLToAlias,
+	mapColumnsInSQLToAlias,
+} from '~/alias.ts';
 import { CasingCache } from '~/casing.ts';
 import { Column } from '~/column.ts';
 import { entityKind, is } from '~/entity.ts';
@@ -215,9 +221,13 @@ export class MsSqlDialect {
 					}
 				} else if (is(field, Column)) {
 					if (isSingleTable) {
-						chunk.push(sql.identifier(this.casing.getColumnCasing(field)));
+						chunk.push(
+							field.isAlias
+								? sql`${sql.identifier(this.casing.getColumnCasing(getOriginalColumnFromAlias(field)))} as ${field}`
+								: sql.identifier(this.casing.getColumnCasing(field)),
+						);
 					} else {
-						chunk.push(field);
+						chunk.push(field.isAlias ? sql`${getOriginalColumnFromAlias(field)} as ${field}` : field);
 					}
 				}
 
@@ -261,7 +271,14 @@ export class MsSqlDialect {
 						chunk.push(sql` as ${sql.identifier(field.fieldAlias)}`);
 					}
 				} else if (is(field, Column)) {
-					chunk.push(sql.join([sql.raw(`${type}.`), sql.identifier(this.casing.getColumnCasing(field))]));
+					chunk.push(
+						sql.join([
+							sql.raw(`${type}.`),
+							field.isAlias
+								? sql`${sql.identifier(this.casing.getColumnCasing(getOriginalColumnFromAlias(field)))} as ${field}`
+								: sql.identifier(this.casing.getColumnCasing(field)),
+						]),
+					);
 				}
 
 				if (i < columnsLen - 1) {
diff --git a/drizzle-orm/src/mysql-core/dialect.ts b/drizzle-orm/src/mysql-core/dialect.ts
@@ -1,5 +1,11 @@
 import * as V1 from '~/_relations.ts';
-import { aliasedTable, aliasedTableColumn, mapColumnsInAliasedSQLToAlias, mapColumnsInSQLToAlias } from '~/alias.ts';
+import {
+	aliasedTable,
+	aliasedTableColumn,
+	getOriginalColumnFromAlias,
+	mapColumnsInAliasedSQLToAlias,
+	mapColumnsInSQLToAlias,
+} from '~/alias.ts';
 import { CasingCache } from '~/casing.ts';
 import { Column } from '~/column.ts';
 import { entityKind, is } from '~/entity.ts';
@@ -233,9 +239,13 @@ export class MySqlDialect {
 					}
 				} else if (is(field, Column)) {
 					if (isSingleTable) {
-						chunk.push(sql.identifier(this.casing.getColumnCasing(field)));
+						chunk.push(
+							field.isAlias
+								? sql`${sql.identifier(this.casing.getColumnCasing(getOriginalColumnFromAlias(field)))} as ${field}`
+								: sql.identifier(this.casing.getColumnCasing(field)),
+						);
 					} else {
-						chunk.push(field);
+						chunk.push(field.isAlias ? sql`${getOriginalColumnFromAlias(field)} as ${field}` : field);
 					}
 				}
 
diff --git a/drizzle-orm/src/pg-core/dialect.ts b/drizzle-orm/src/pg-core/dialect.ts
@@ -1,5 +1,11 @@
 import * as V1 from '~/_relations.ts';
-import { aliasedTable, aliasedTableColumn, mapColumnsInAliasedSQLToAlias, mapColumnsInSQLToAlias } from '~/alias.ts';
+import {
+	aliasedTable,
+	aliasedTableColumn,
+	getOriginalColumnFromAlias,
+	mapColumnsInAliasedSQLToAlias,
+	mapColumnsInSQLToAlias,
+} from '~/alias.ts';
 import { CasingCache } from '~/casing.ts';
 import { Column } from '~/column.ts';
 import { entityKind, is } from '~/entity.ts';
@@ -249,9 +255,13 @@ export class PgDialect {
 					}
 				} else if (is(field, Column)) {
 					if (isSingleTable) {
-						chunk.push(sql.identifier(this.casing.getColumnCasing(field)));
+						chunk.push(
+							field.isAlias
+								? sql`${sql.identifier(this.casing.getColumnCasing(getOriginalColumnFromAlias(field)))} as ${field}`
+								: sql.identifier(this.casing.getColumnCasing(field)),
+						);
 					} else {
-						chunk.push(field);
+						chunk.push(field.isAlias ? sql`${getOriginalColumnFromAlias(field)} as ${field}` : field);
 					}
 				}
 
diff --git a/drizzle-orm/src/selection-proxy.ts b/drizzle-orm/src/selection-proxy.ts
@@ -1,4 +1,4 @@
-import { ColumnAliasProxyHandler, TableAliasProxyHandler } from './alias.ts';
+import { ColumnTableAliasProxyHandler, TableAliasProxyHandler } from './alias.ts';
 import { Column } from './column.ts';
 import { entityKind, is } from './entity.ts';
 import { SQL, View } from './sql/sql.ts';
@@ -101,7 +101,7 @@ export class SelectionProxyHandler<T extends Subquery | Record<string, unknown>
 			if (this.config.alias) {
 				return new Proxy(
 					value,
-					new ColumnAliasProxyHandler(
+					new ColumnTableAliasProxyHandler(
 						new Proxy(
 							value.table,
 							new TableAliasProxyHandler(this.config.alias, this.config.replaceOriginalName ?? false),
diff --git a/drizzle-orm/src/singlestore-core/dialect.ts b/drizzle-orm/src/singlestore-core/dialect.ts
@@ -1,5 +1,11 @@
 import * as V1 from '~/_relations.ts';
-import { aliasedTable, aliasedTableColumn, mapColumnsInAliasedSQLToAlias, mapColumnsInSQLToAlias } from '~/alias.ts';
+import {
+	aliasedTable,
+	aliasedTableColumn,
+	getOriginalColumnFromAlias,
+	mapColumnsInAliasedSQLToAlias,
+	mapColumnsInSQLToAlias,
+} from '~/alias.ts';
 import { CasingCache } from '~/casing.ts';
 import { Column } from '~/column.ts';
 import { entityKind, is } from '~/entity.ts';
@@ -229,9 +235,13 @@ export class SingleStoreDialect {
 					}
 				} else if (is(field, Column)) {
 					if (isSingleTable) {
-						chunk.push(sql.identifier(this.casing.getColumnCasing(field)));
+						chunk.push(
+							field.isAlias
+								? sql`${sql.identifier(this.casing.getColumnCasing(getOriginalColumnFromAlias(field)))} as ${field}`
+								: sql.identifier(this.casing.getColumnCasing(field)),
+						);
 					} else {
-						chunk.push(field);
+						chunk.push(field.isAlias ? sql`${getOriginalColumnFromAlias(field)} as ${field}` : field);
 					}
 				}
 
diff --git a/drizzle-orm/src/sql/sql.ts b/drizzle-orm/src/sql/sql.ts
@@ -222,7 +222,7 @@ export class SQL<T = unknown> implements SQLWrapper<T> {
 
 				const schemaName = invokeSource === 'mssql-check' ? undefined : chunk.table[Table.Symbol.Schema];
 				return {
-					sql: chunk.table[IsAlias] || schemaName === undefined
+					sql: chunk.isAlias ? escapeName(chunk.name) : chunk.table[IsAlias] || schemaName === undefined
 						? escapeName(chunk.table[Table.Symbol.Name]) + '.' + escapeName(columnName)
 						: escapeName(schemaName) + '.' + escapeName(chunk.table[Table.Symbol.Name]) + '.'
 							+ escapeName(columnName),
diff --git a/drizzle-orm/src/sqlite-core/dialect.ts b/drizzle-orm/src/sqlite-core/dialect.ts

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+export const OriginalColumn = Symbol.for('drizzle:OriginalColumn');`