drizzle-orm 1.0.0-beta.12-b5a187e → 1.0.0-beta.12-18d8bfb

package/alias.cjs

@@ -3,6 +3,7 @@ const require_table = require('./table.cjs');
 const require_column_common = require('./column-common.cjs');
 const require_column = require('./column.cjs');
 const require_sql_sql = require('./sql/sql.cjs');
+const require_subquery = require('./subquery.cjs');
 const require_view_common = require('./view-common.cjs');
 
 //#region src/alias.ts
@@ -18,6 +19,20 @@ var ColumnTableAliasProxyHandler = class {
 		return columnObj[prop];
 	}
 };
+var ViewSelectionAliasProxyHandler = class {
+	static [require_entity.entityKind] = "ViewSelectionAliasProxyHandler";
+	constructor(view, selection, ignoreColumnAlias) {
+		this.view = view;
+		this.selection = selection;
+		this.ignoreColumnAlias = ignoreColumnAlias;
+	}
+	get(selection, prop) {
+		const value = selection[prop];
+		if (require_entity.is(value, require_column.Column)) return new Proxy(value, new ColumnTableAliasProxyHandler(this.view, this.ignoreColumnAlias));
+		if (require_entity.is(value, require_subquery.Subquery) || require_entity.is(value, require_sql_sql.SQL) || require_entity.is(value, require_sql_sql.SQL.Aliased) || require_sql_sql.isSQLWrapper(value) || typeof value !== "object" || value === null) return value;
+		return new Proxy(value, this);
+	}
+};
 var TableAliasProxyHandler = class {
 	static [require_entity.entityKind] = "TableAliasProxyHandler";
 	constructor(alias, replaceOriginalName, ignoreColumnAlias) {
@@ -32,11 +47,13 @@ var TableAliasProxyHandler = class {
 		if (prop === require_view_common.ViewBaseConfig) return {
 			...target[require_view_common.ViewBaseConfig],
 			name: this.alias,
-			isAlias: true
+			isAlias: true,
+			selectedFields: new Proxy(target[require_view_common.ViewBaseConfig].selectedFields, new ViewSelectionAliasProxyHandler(new Proxy(target, this), target[require_view_common.ViewBaseConfig].selectedFields, this.ignoreColumnAlias))
 		};
 		if (prop === require_table.Table.Symbol.Columns) {
 			const columns = target[require_table.Table.Symbol.Columns];
 			if (!columns) return columns;
+			if (require_entity.is(target, require_sql_sql.View)) return new Proxy(target[require_table.Table.Symbol.Columns], new ViewSelectionAliasProxyHandler(new Proxy(target, this), target[require_table.Table.Symbol.Columns], this.ignoreColumnAlias));
 			const proxiedColumns = {};
 			Object.keys(columns).map((key) => {
 				proxiedColumns[key] = new Proxy(columns[key], new ColumnTableAliasProxyHandler(new Proxy(target, this), this.ignoreColumnAlias));
@@ -106,6 +123,7 @@ exports.ColumnAliasProxyHandler = ColumnAliasProxyHandler;
 exports.ColumnTableAliasProxyHandler = ColumnTableAliasProxyHandler;
 exports.RelationTableAliasProxyHandler = RelationTableAliasProxyHandler;
 exports.TableAliasProxyHandler = TableAliasProxyHandler;
+exports.ViewSelectionAliasProxyHandler = ViewSelectionAliasProxyHandler;
 exports.aliasedColumn = aliasedColumn;
 exports.aliasedRelation = aliasedRelation;
 exports.aliasedTable = aliasedTable;

package/alias.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"alias.cjs","names":["entityKind","table: Table | View","ignoreColumnAlias?: boolean","alias: string","replaceOriginalName: boolean","Table","ViewBaseConfig","proxiedColumns: { [key: string]: any }","is","Column","OriginalColumn","SQL","sql"],"sources":["../src/alias.ts"],"sourcesContent":["import type * as V1 from './_relations.ts';\nimport { OriginalColumn } from './column-common.ts';\nimport type { AnyColumn } from './column.ts';\nimport { Column } from './column.ts';\nimport { entityKind, is } from './entity.ts';\nimport type { View } from './sql/sql.ts';\nimport { SQL, sql } from './sql/sql.ts';\nimport { Table } from './table.ts';\nimport { ViewBaseConfig } from './view-common.ts';\n\nexport class ColumnTableAliasProxyHandler<TColumn extends Column> implements ProxyHandler<TColumn> {\n\tstatic readonly [entityKind]: string = 'ColumnTableAliasProxyHandler';\n\n\tconstructor(private table: Table | View, private ignoreColumnAlias?: boolean) {}\n\n\tget(columnObj: TColumn, prop: string | symbol): any {\n\t\tif (prop === 'table') {\n\t\t\treturn this.table;\n\t\t}\n\n\t\tif (prop === 'isAlias' && this.ignoreColumnAlias) {\n\t\t\treturn false;\n\t\t}\n\n\t\treturn columnObj[prop as keyof TColumn];\n\t}\n}\n\nexport class TableAliasProxyHandler<T extends Table | View> implements ProxyHandler<T> {\n\tstatic readonly [entityKind]: string = 'TableAliasProxyHandler';\n\n\tconstructor(private alias: string, private replaceOriginalName: boolean, private ignoreColumnAlias?: boolean) {}\n\n\tget(target: T, prop: string | symbol): any {\n\t\tif (prop === Table.Symbol.IsAlias) {\n\t\t\treturn true;\n\t\t}\n\n\t\tif (prop === Table.Symbol.Name) {\n\t\t\treturn this.alias;\n\t\t}\n\n\t\tif (this.replaceOriginalName && prop === Table.Symbol.OriginalName) {\n\t\t\treturn this.alias;\n\t\t}\n\n\t\tif (prop === ViewBaseConfig) {\n\t\t\treturn {\n\t\t\t\t...target[ViewBaseConfig as keyof typeof target],\n\t\t\t\tname: this.alias,\n\t\t\t\tisAlias: true,\n\t\t\t};\n\t\t}\n\n\t\tif (prop === Table.Symbol.Columns) {\n\t\t\tconst columns = (target as Table)[Table.Symbol.Columns];\n\t\t\tif (!columns) {\n\t\t\t\treturn columns;\n\t\t\t}\n\n\t\t\tconst proxiedColumns: { [key: string]: any } = {};\n\n\t\t\tObject.keys(columns).map((key) => {\n\t\t\t\tproxiedColumns[key] = new Proxy(\n\t\t\t\t\tcolumns[key]!,\n\t\t\t\t\tnew ColumnTableAliasProxyHandler(new Proxy(target, this), this.ignoreColumnAlias),\n\t\t\t\t);\n\t\t\t});\n\n\t\t\treturn proxiedColumns;\n\t\t}\n\n\t\tconst value = target[prop as keyof typeof target];\n\t\tif (is(value, Column)) {\n\t\t\treturn new Proxy(\n\t\t\t\tvalue as AnyColumn,\n\t\t\t\tnew ColumnTableAliasProxyHandler(new Proxy(target, this), this.ignoreColumnAlias),\n\t\t\t);\n\t\t}\n\n\t\treturn value;\n\t}\n}\n\nexport class ColumnAliasProxyHandler<T extends Column> implements ProxyHandler<T> {\n\tstatic readonly [entityKind]: string = 'ColumnAliasProxyHandler';\n\n\tconstructor(private alias: string) {}\n\n\tget(target: T, prop: keyof Column): any {\n\t\tif (prop === 'isAlias') {\n\t\t\treturn true;\n\t\t}\n\n\t\tif (prop === 'name') {\n\t\t\treturn this.alias;\n\t\t}\n\n\t\tif (prop === 'keyAsName') {\n\t\t\treturn false;\n\t\t}\n\n\t\tif (prop === OriginalColumn) {\n\t\t\treturn () => target;\n\t\t}\n\n\t\treturn target[prop];\n\t}\n}\n\nexport class RelationTableAliasProxyHandler<T extends V1.Relation> implements ProxyHandler<T> {\n\tstatic readonly [entityKind]: string = 'RelationTableAliasProxyHandler';\n\n\tconstructor(private alias: string) {}\n\n\tget(target: T, prop: string | symbol): any {\n\t\tif (prop === 'sourceTable') {\n\t\t\treturn aliasedTable(target.sourceTable, this.alias);\n\t\t}\n\n\t\treturn target[prop as keyof typeof target];\n\t}\n}\n\nexport function aliasedTable<T extends Table | View>(table: T, tableAlias: string): T {\n\treturn new Proxy(table, new TableAliasProxyHandler(tableAlias, false, false));\n}\n\nexport function aliasedColumn<T extends Column>(column: T, alias: string): T {\n\treturn new Proxy(column, new ColumnAliasProxyHandler(alias));\n}\n\nexport function aliasedRelation<T extends V1.Relation>(relation: T, tableAlias: string): T {\n\treturn new Proxy(relation, new RelationTableAliasProxyHandler(tableAlias));\n}\n\nexport function aliasedTableColumn<T extends AnyColumn>(column: T, tableAlias: string): T {\n\treturn new Proxy(\n\t\tcolumn,\n\t\tnew ColumnTableAliasProxyHandler(\n\t\t\tnew Proxy(column.table, new TableAliasProxyHandler(tableAlias, false, false)),\n\t\t\tfalse,\n\t\t),\n\t);\n}\n\nexport function mapColumnsInAliasedSQLToAlias(query: SQL.Aliased, alias: string): SQL.Aliased {\n\treturn new SQL.Aliased(mapColumnsInSQLToAlias(query.sql, alias), query.fieldAlias);\n}\n\nexport function mapColumnsInSQLToAlias(query: SQL, alias: string): SQL {\n\treturn sql.join(query.queryChunks.map((c) => {\n\t\tif (is(c, Column)) {\n\t\t\treturn aliasedTableColumn(c, alias);\n\t\t}\n\t\tif (is(c, SQL)) {\n\t\t\treturn mapColumnsInSQLToAlias(c, alias);\n\t\t}\n\t\tif (is(c, SQL.Aliased)) {\n\t\t\treturn mapColumnsInAliasedSQLToAlias(c, alias);\n\t\t}\n\t\treturn c;\n\t}));\n}\n\n// Defined separately from the Column class to resolve circular dependency\nColumn.prototype.as = function(alias: string): Column {\n\treturn aliasedColumn(this, alias);\n};\n\nexport function getOriginalColumnFromAlias<T extends Column>(column: T): T {\n\treturn column[OriginalColumn]();\n}\n"],"mappings":";;;;;;;;AAUA,IAAa,+BAAb,MAAmG;CAClG,QAAiBA,6BAAsB;CAEvC,YAAY,AAAQC,OAAqB,AAAQC,mBAA6B;EAA1D;EAA6B;;CAEjD,IAAI,WAAoB,MAA4B;AACnD,MAAI,SAAS,QACZ,QAAO,KAAK;AAGb,MAAI,SAAS,aAAa,KAAK,kBAC9B,QAAO;AAGR,SAAO,UAAU;;;AAInB,IAAa,yBAAb,MAAuF;CACtF,QAAiBF,6BAAsB;CAEvC,YAAY,AAAQG,OAAe,AAAQC,qBAA8B,AAAQF,mBAA6B;EAA1F;EAAuB;EAAsC;;CAEjF,IAAI,QAAW,MAA4B;AAC1C,MAAI,SAASG,oBAAM,OAAO,QACzB,QAAO;AAGR,MAAI,SAASA,oBAAM,OAAO,KACzB,QAAO,KAAK;AAGb,MAAI,KAAK,uBAAuB,SAASA,oBAAM,OAAO,aACrD,QAAO,KAAK;AAGb,MAAI,SAASC,mCACZ,QAAO;GACN,GAAG,OAAOA;GACV,MAAM,KAAK;GACX,SAAS;GACT;AAGF,MAAI,SAASD,oBAAM,OAAO,SAAS;GAClC,MAAM,UAAW,OAAiBA,oBAAM,OAAO;AAC/C,OAAI,CAAC,QACJ,QAAO;GAGR,MAAME,iBAAyC,EAAE;AAEjD,UAAO,KAAK,QAAQ,CAAC,KAAK,QAAQ;AACjC,mBAAe,OAAO,IAAI,MACzB,QAAQ,MACR,IAAI,6BAA6B,IAAI,MAAM,QAAQ,KAAK,EAAE,KAAK,kBAAkB,CACjF;KACA;AAEF,UAAO;;EAGR,MAAM,QAAQ,OAAO;AACrB,MAAIC,kBAAG,OAAOC,sBAAO,CACpB,QAAO,IAAI,MACV,OACA,IAAI,6BAA6B,IAAI,MAAM,QAAQ,KAAK,EAAE,KAAK,kBAAkB,CACjF;AAGF,SAAO;;;AAIT,IAAa,0BAAb,MAAkF;CACjF,QAAiBT,6BAAsB;CAEvC,YAAY,AAAQG,OAAe;EAAf;;CAEpB,IAAI,QAAW,MAAyB;AACvC,MAAI,SAAS,UACZ,QAAO;AAGR,MAAI,SAAS,OACZ,QAAO,KAAK;AAGb,MAAI,SAAS,YACZ,QAAO;AAGR,MAAI,SAASO,qCACZ,cAAa;AAGd,SAAO,OAAO;;;AAIhB,IAAa,iCAAb,MAA8F;CAC7F,QAAiBV,6BAAsB;CAEvC,YAAY,AAAQG,OAAe;EAAf;;CAEpB,IAAI,QAAW,MAA4B;AAC1C,MAAI,SAAS,cACZ,QAAO,aAAa,OAAO,aAAa,KAAK,MAAM;AAGpD,SAAO,OAAO;;;AAIhB,SAAgB,aAAqC,OAAU,YAAuB;AACrF,QAAO,IAAI,MAAM,OAAO,IAAI,uBAAuB,YAAY,OAAO,MAAM,CAAC;;AAG9E,SAAgB,cAAgC,QAAW,OAAkB;AAC5E,QAAO,IAAI,MAAM,QAAQ,IAAI,wBAAwB,MAAM,CAAC;;AAG7D,SAAgB,gBAAuC,UAAa,YAAuB;AAC1F,QAAO,IAAI,MAAM,UAAU,IAAI,+BAA+B,WAAW,CAAC;;AAG3E,SAAgB,mBAAwC,QAAW,YAAuB;AACzF,QAAO,IAAI,MACV,QACA,IAAI,6BACH,IAAI,MAAM,OAAO,OAAO,IAAI,uBAAuB,YAAY,OAAO,MAAM,CAAC,EAC7E,MACA,CACD;;AAGF,SAAgB,8BAA8B,OAAoB,OAA4B;AAC7F,QAAO,IAAIQ,oBAAI,QAAQ,uBAAuB,MAAM,KAAK,MAAM,EAAE,MAAM,WAAW;;AAGnF,SAAgB,uBAAuB,OAAY,OAAoB;AACtE,QAAOC,oBAAI,KAAK,MAAM,YAAY,KAAK,MAAM;AAC5C,MAAIJ,kBAAG,GAAGC,sBAAO,CAChB,QAAO,mBAAmB,GAAG,MAAM;AAEpC,MAAID,kBAAG,GAAGG,oBAAI,CACb,QAAO,uBAAuB,GAAG,MAAM;AAExC,MAAIH,kBAAG,GAAGG,oBAAI,QAAQ,CACrB,QAAO,8BAA8B,GAAG,MAAM;AAE/C,SAAO;GACN,CAAC;;AAIJ,sBAAO,UAAU,KAAK,SAAS,OAAuB;AACrD,QAAO,cAAc,MAAM,MAAM;;AAGlC,SAAgB,2BAA6C,QAAc;AAC1E,QAAO,OAAOD,uCAAiB"}
+{"version":3,"file":"alias.cjs","names":["entityKind","table: Table | View","ignoreColumnAlias?: boolean","view: View","selection: TSelection","is","Column","Subquery","SQL","isSQLWrapper","alias: string","replaceOriginalName: boolean","Table","ViewBaseConfig","View","proxiedColumns: { [key: string]: any }","OriginalColumn","sql"],"sources":["../src/alias.ts"],"sourcesContent":["import type * as V1 from './_relations.ts';\nimport { OriginalColumn } from './column-common.ts';\nimport type { AnyColumn } from './column.ts';\nimport { Column } from './column.ts';\nimport { entityKind, is } from './entity.ts';\nimport { View } from './sql/sql.ts';\nimport { isSQLWrapper, SQL, sql } from './sql/sql.ts';\nimport { Subquery } from './subquery.ts';\nimport { Table } from './table.ts';\nimport { ViewBaseConfig } from './view-common.ts';\n\nexport class ColumnTableAliasProxyHandler<TColumn extends Column> implements ProxyHandler<TColumn> {\n\tstatic readonly [entityKind]: string = 'ColumnTableAliasProxyHandler';\n\n\tconstructor(private table: Table | View, private ignoreColumnAlias?: boolean) {}\n\n\tget(columnObj: TColumn, prop: string | symbol): any {\n\t\tif (prop === 'table') {\n\t\t\treturn this.table;\n\t\t}\n\n\t\tif (prop === 'isAlias' && this.ignoreColumnAlias) {\n\t\t\treturn false;\n\t\t}\n\n\t\treturn columnObj[prop as keyof TColumn];\n\t}\n}\n\nexport class ViewSelectionAliasProxyHandler<TSelection extends Record<string, unknown>>\n\timplements ProxyHandler<TSelection>\n{\n\tstatic readonly [entityKind]: string = 'ViewSelectionAliasProxyHandler';\n\n\tconstructor(protected view: View, protected selection: TSelection, private ignoreColumnAlias?: boolean) {}\n\n\tget(selection: TSelection, prop: string | symbol): any {\n\t\tconst value = selection[prop as keyof TSelection];\n\n\t\tif (is(value, Column)) return new Proxy(value, new ColumnTableAliasProxyHandler(this.view, this.ignoreColumnAlias));\n\t\tif (\n\t\t\tis(value, Subquery) || is(value, SQL) || is(value, SQL.Aliased) || isSQLWrapper(value)\n\t\t\t|| (typeof value !== 'object' || value === null)\n\t\t) return value;\n\n\t\treturn new Proxy(value as Record<string, unknown>, this);\n\t}\n}\n\nexport class TableAliasProxyHandler<T extends Table | View> implements ProxyHandler<T> {\n\tstatic readonly [entityKind]: string = 'TableAliasProxyHandler';\n\n\tconstructor(private alias: string, private replaceOriginalName: boolean, private ignoreColumnAlias?: boolean) {}\n\n\tget(target: T, prop: string | symbol): any {\n\t\tif (prop === Table.Symbol.IsAlias) {\n\t\t\treturn true;\n\t\t}\n\n\t\tif (prop === Table.Symbol.Name) {\n\t\t\treturn this.alias;\n\t\t}\n\n\t\tif (this.replaceOriginalName && prop === Table.Symbol.OriginalName) {\n\t\t\treturn this.alias;\n\t\t}\n\n\t\tif (prop === ViewBaseConfig) {\n\t\t\treturn {\n\t\t\t\t...target[ViewBaseConfig as keyof typeof target],\n\t\t\t\tname: this.alias,\n\t\t\t\tisAlias: true,\n\t\t\t\tselectedFields: new Proxy(\n\t\t\t\t\t(<View> target)[ViewBaseConfig].selectedFields,\n\t\t\t\t\tnew ViewSelectionAliasProxyHandler(\n\t\t\t\t\t\tnew Proxy(target, this) as View,\n\t\t\t\t\t\t(<View> target)[ViewBaseConfig].selectedFields,\n\t\t\t\t\t\tthis.ignoreColumnAlias,\n\t\t\t\t\t),\n\t\t\t\t),\n\t\t\t};\n\t\t}\n\n\t\tif (prop === Table.Symbol.Columns) {\n\t\t\tconst columns = (target as Table)[Table.Symbol.Columns];\n\t\t\tif (!columns) {\n\t\t\t\treturn columns;\n\t\t\t}\n\n\t\t\tif (is(target, View)) {\n\t\t\t\treturn new Proxy(\n\t\t\t\t\t(<View> target)[Table.Symbol.Columns],\n\t\t\t\t\tnew ViewSelectionAliasProxyHandler(\n\t\t\t\t\t\tnew Proxy(target, this) as View,\n\t\t\t\t\t\t(<View> target)[Table.Symbol.Columns],\n\t\t\t\t\t\tthis.ignoreColumnAlias,\n\t\t\t\t\t),\n\t\t\t\t);\n\t\t\t}\n\n\t\t\tconst proxiedColumns: { [key: string]: any } = {};\n\n\t\t\tObject.keys(columns).map((key) => {\n\t\t\t\tproxiedColumns[key] = new Proxy(\n\t\t\t\t\tcolumns[key]!,\n\t\t\t\t\tnew ColumnTableAliasProxyHandler(new Proxy(target, this), this.ignoreColumnAlias),\n\t\t\t\t);\n\t\t\t});\n\n\t\t\treturn proxiedColumns;\n\t\t}\n\n\t\tconst value = target[prop as keyof typeof target];\n\t\tif (is(value, Column)) {\n\t\t\treturn new Proxy(\n\t\t\t\tvalue as AnyColumn,\n\t\t\t\tnew ColumnTableAliasProxyHandler(new Proxy(target, this), this.ignoreColumnAlias),\n\t\t\t);\n\t\t}\n\n\t\treturn value;\n\t}\n}\n\nexport class ColumnAliasProxyHandler<T extends Column> implements ProxyHandler<T> {\n\tstatic readonly [entityKind]: string = 'ColumnAliasProxyHandler';\n\n\tconstructor(private alias: string) {}\n\n\tget(target: T, prop: keyof Column): any {\n\t\tif (prop === 'isAlias') {\n\t\t\treturn true;\n\t\t}\n\n\t\tif (prop === 'name') {\n\t\t\treturn this.alias;\n\t\t}\n\n\t\tif (prop === 'keyAsName') {\n\t\t\treturn false;\n\t\t}\n\n\t\tif (prop === OriginalColumn) {\n\t\t\treturn () => target;\n\t\t}\n\n\t\treturn target[prop];\n\t}\n}\n\nexport class RelationTableAliasProxyHandler<T extends V1.Relation> implements ProxyHandler<T> {\n\tstatic readonly [entityKind]: string = 'RelationTableAliasProxyHandler';\n\n\tconstructor(private alias: string) {}\n\n\tget(target: T, prop: string | symbol): any {\n\t\tif (prop === 'sourceTable') {\n\t\t\treturn aliasedTable(target.sourceTable, this.alias);\n\t\t}\n\n\t\treturn target[prop as keyof typeof target];\n\t}\n}\n\nexport function aliasedTable<T extends Table | View>(table: T, tableAlias: string): T {\n\treturn new Proxy(table, new TableAliasProxyHandler(tableAlias, false, false));\n}\n\nexport function aliasedColumn<T extends Column>(column: T, alias: string): T {\n\treturn new Proxy(column, new ColumnAliasProxyHandler(alias));\n}\n\nexport function aliasedRelation<T extends V1.Relation>(relation: T, tableAlias: string): T {\n\treturn new Proxy(relation, new RelationTableAliasProxyHandler(tableAlias));\n}\n\nexport function aliasedTableColumn<T extends AnyColumn>(column: T, tableAlias: string): T {\n\treturn new Proxy(\n\t\tcolumn,\n\t\tnew ColumnTableAliasProxyHandler(\n\t\t\tnew Proxy(column.table, new TableAliasProxyHandler(tableAlias, false, false)),\n\t\t\tfalse,\n\t\t),\n\t);\n}\n\nexport function mapColumnsInAliasedSQLToAlias(query: SQL.Aliased, alias: string): SQL.Aliased {\n\treturn new SQL.Aliased(mapColumnsInSQLToAlias(query.sql, alias), query.fieldAlias);\n}\n\nexport function mapColumnsInSQLToAlias(query: SQL, alias: string): SQL {\n\treturn sql.join(query.queryChunks.map((c) => {\n\t\tif (is(c, Column)) {\n\t\t\treturn aliasedTableColumn(c, alias);\n\t\t}\n\t\tif (is(c, SQL)) {\n\t\t\treturn mapColumnsInSQLToAlias(c, alias);\n\t\t}\n\t\tif (is(c, SQL.Aliased)) {\n\t\t\treturn mapColumnsInAliasedSQLToAlias(c, alias);\n\t\t}\n\t\treturn c;\n\t}));\n}\n\n// Defined separately from the Column class to resolve circular dependency\nColumn.prototype.as = function(alias: string): Column {\n\treturn aliasedColumn(this, alias);\n};\n\nexport function getOriginalColumnFromAlias<T extends Column>(column: T): T {\n\treturn column[OriginalColumn]();\n}\n"],"mappings":";;;;;;;;;AAWA,IAAa,+BAAb,MAAmG;CAClG,QAAiBA,6BAAsB;CAEvC,YAAY,AAAQC,OAAqB,AAAQC,mBAA6B;EAA1D;EAA6B;;CAEjD,IAAI,WAAoB,MAA4B;AACnD,MAAI,SAAS,QACZ,QAAO,KAAK;AAGb,MAAI,SAAS,aAAa,KAAK,kBAC9B,QAAO;AAGR,SAAO,UAAU;;;AAInB,IAAa,iCAAb,MAEA;CACC,QAAiBF,6BAAsB;CAEvC,YAAY,AAAUG,MAAY,AAAUC,WAAuB,AAAQF,mBAA6B;EAAlF;EAAsB;EAA+B;;CAE3E,IAAI,WAAuB,MAA4B;EACtD,MAAM,QAAQ,UAAU;AAExB,MAAIG,kBAAG,OAAOC,sBAAO,CAAE,QAAO,IAAI,MAAM,OAAO,IAAI,6BAA6B,KAAK,MAAM,KAAK,kBAAkB,CAAC;AACnH,MACCD,kBAAG,OAAOE,0BAAS,IAAIF,kBAAG,OAAOG,oBAAI,IAAIH,kBAAG,OAAOG,oBAAI,QAAQ,IAAIC,6BAAa,MAAM,IAClF,OAAO,UAAU,YAAY,UAAU,KAC1C,QAAO;AAET,SAAO,IAAI,MAAM,OAAkC,KAAK;;;AAI1D,IAAa,yBAAb,MAAuF;CACtF,QAAiBT,6BAAsB;CAEvC,YAAY,AAAQU,OAAe,AAAQC,qBAA8B,AAAQT,mBAA6B;EAA1F;EAAuB;EAAsC;;CAEjF,IAAI,QAAW,MAA4B;AAC1C,MAAI,SAASU,oBAAM,OAAO,QACzB,QAAO;AAGR,MAAI,SAASA,oBAAM,OAAO,KACzB,QAAO,KAAK;AAGb,MAAI,KAAK,uBAAuB,SAASA,oBAAM,OAAO,aACrD,QAAO,KAAK;AAGb,MAAI,SAASC,mCACZ,QAAO;GACN,GAAG,OAAOA;GACV,MAAM,KAAK;GACX,SAAS;GACT,gBAAgB,IAAI,MACX,OAAQA,oCAAgB,gBAChC,IAAI,+BACH,IAAI,MAAM,QAAQ,KAAK,EACf,OAAQA,oCAAgB,gBAChC,KAAK,kBACL,CACD;GACD;AAGF,MAAI,SAASD,oBAAM,OAAO,SAAS;GAClC,MAAM,UAAW,OAAiBA,oBAAM,OAAO;AAC/C,OAAI,CAAC,QACJ,QAAO;AAGR,OAAIP,kBAAG,QAAQS,qBAAK,CACnB,QAAO,IAAI,MACF,OAAQF,oBAAM,OAAO,UAC7B,IAAI,+BACH,IAAI,MAAM,QAAQ,KAAK,EACf,OAAQA,oBAAM,OAAO,UAC7B,KAAK,kBACL,CACD;GAGF,MAAMG,iBAAyC,EAAE;AAEjD,UAAO,KAAK,QAAQ,CAAC,KAAK,QAAQ;AACjC,mBAAe,OAAO,IAAI,MACzB,QAAQ,MACR,IAAI,6BAA6B,IAAI,MAAM,QAAQ,KAAK,EAAE,KAAK,kBAAkB,CACjF;KACA;AAEF,UAAO;;EAGR,MAAM,QAAQ,OAAO;AACrB,MAAIV,kBAAG,OAAOC,sBAAO,CACpB,QAAO,IAAI,MACV,OACA,IAAI,6BAA6B,IAAI,MAAM,QAAQ,KAAK,EAAE,KAAK,kBAAkB,CACjF;AAGF,SAAO;;;AAIT,IAAa,0BAAb,MAAkF;CACjF,QAAiBN,6BAAsB;CAEvC,YAAY,AAAQU,OAAe;EAAf;;CAEpB,IAAI,QAAW,MAAyB;AACvC,MAAI,SAAS,UACZ,QAAO;AAGR,MAAI,SAAS,OACZ,QAAO,KAAK;AAGb,MAAI,SAAS,YACZ,QAAO;AAGR,MAAI,SAASM,qCACZ,cAAa;AAGd,SAAO,OAAO;;;AAIhB,IAAa,iCAAb,MAA8F;CAC7F,QAAiBhB,6BAAsB;CAEvC,YAAY,AAAQU,OAAe;EAAf;;CAEpB,IAAI,QAAW,MAA4B;AAC1C,MAAI,SAAS,cACZ,QAAO,aAAa,OAAO,aAAa,KAAK,MAAM;AAGpD,SAAO,OAAO;;;AAIhB,SAAgB,aAAqC,OAAU,YAAuB;AACrF,QAAO,IAAI,MAAM,OAAO,IAAI,uBAAuB,YAAY,OAAO,MAAM,CAAC;;AAG9E,SAAgB,cAAgC,QAAW,OAAkB;AAC5E,QAAO,IAAI,MAAM,QAAQ,IAAI,wBAAwB,MAAM,CAAC;;AAG7D,SAAgB,gBAAuC,UAAa,YAAuB;AAC1F,QAAO,IAAI,MAAM,UAAU,IAAI,+BAA+B,WAAW,CAAC;;AAG3E,SAAgB,mBAAwC,QAAW,YAAuB;AACzF,QAAO,IAAI,MACV,QACA,IAAI,6BACH,IAAI,MAAM,OAAO,OAAO,IAAI,uBAAuB,YAAY,OAAO,MAAM,CAAC,EAC7E,MACA,CACD;;AAGF,SAAgB,8BAA8B,OAAoB,OAA4B;AAC7F,QAAO,IAAIF,oBAAI,QAAQ,uBAAuB,MAAM,KAAK,MAAM,EAAE,MAAM,WAAW;;AAGnF,SAAgB,uBAAuB,OAAY,OAAoB;AACtE,QAAOS,oBAAI,KAAK,MAAM,YAAY,KAAK,MAAM;AAC5C,MAAIZ,kBAAG,GAAGC,sBAAO,CAChB,QAAO,mBAAmB,GAAG,MAAM;AAEpC,MAAID,kBAAG,GAAGG,oBAAI,CACb,QAAO,uBAAuB,GAAG,MAAM;AAExC,MAAIH,kBAAG,GAAGG,oBAAI,QAAQ,CACrB,QAAO,8BAA8B,GAAG,MAAM;AAE/C,SAAO;GACN,CAAC;;AAIJ,sBAAO,UAAU,KAAK,SAAS,OAAuB;AACrD,QAAO,cAAc,MAAM,MAAM;;AAGlC,SAAgB,2BAA6C,QAAc;AAC1E,QAAO,OAAOQ,uCAAiB"}

package/alias.d.cts

@@ -12,6 +12,14 @@ declare class ColumnTableAliasProxyHandler<TColumn extends Column> implements Pr
   constructor(table: Table | View, ignoreColumnAlias?: boolean | undefined);
   get(columnObj: TColumn, prop: string | symbol): any;
 }
+declare class ViewSelectionAliasProxyHandler<TSelection extends Record<string, unknown>> implements ProxyHandler<TSelection> {
+  protected view: View;
+  protected selection: TSelection;
+  private ignoreColumnAlias?;
+  static readonly [entityKind]: string;
+  constructor(view: View, selection: TSelection, ignoreColumnAlias?: boolean | undefined);
+  get(selection: TSelection, prop: string | symbol): any;
+}
 declare class TableAliasProxyHandler<T extends Table | View> implements ProxyHandler<T> {
   private alias;
   private replaceOriginalName;
@@ -40,5 +48,5 @@ declare function mapColumnsInAliasedSQLToAlias(query: SQL.Aliased, alias: string
 declare function mapColumnsInSQLToAlias(query: SQL, alias: string): SQL;
 declare function getOriginalColumnFromAlias<T extends Column>(column: T): T;
 //#endregion
-export { ColumnAliasProxyHandler, ColumnTableAliasProxyHandler, RelationTableAliasProxyHandler, TableAliasProxyHandler, aliasedColumn, aliasedRelation, aliasedTable, aliasedTableColumn, getOriginalColumnFromAlias, mapColumnsInAliasedSQLToAlias, mapColumnsInSQLToAlias };
+export { ColumnAliasProxyHandler, ColumnTableAliasProxyHandler, RelationTableAliasProxyHandler, TableAliasProxyHandler, ViewSelectionAliasProxyHandler, aliasedColumn, aliasedRelation, aliasedTable, aliasedTableColumn, getOriginalColumnFromAlias, mapColumnsInAliasedSQLToAlias, mapColumnsInSQLToAlias };
 //# sourceMappingURL=alias.d.cts.map

package/alias.d.ts

@@ -12,6 +12,14 @@ declare class ColumnTableAliasProxyHandler<TColumn extends Column> implements Pr
   constructor(table: Table | View, ignoreColumnAlias?: boolean | undefined);
   get(columnObj: TColumn, prop: string | symbol): any;
 }
+declare class ViewSelectionAliasProxyHandler<TSelection extends Record<string, unknown>> implements ProxyHandler<TSelection> {
+  protected view: View;
+  protected selection: TSelection;
+  private ignoreColumnAlias?;
+  static readonly [entityKind]: string;
+  constructor(view: View, selection: TSelection, ignoreColumnAlias?: boolean | undefined);
+  get(selection: TSelection, prop: string | symbol): any;
+}
 declare class TableAliasProxyHandler<T extends Table | View> implements ProxyHandler<T> {
   private alias;
   private replaceOriginalName;
@@ -40,5 +48,5 @@ declare function mapColumnsInAliasedSQLToAlias(query: SQL.Aliased, alias: string
 declare function mapColumnsInSQLToAlias(query: SQL, alias: string): SQL;
 declare function getOriginalColumnFromAlias<T extends Column>(column: T): T;
 //#endregion
-export { ColumnAliasProxyHandler, ColumnTableAliasProxyHandler, RelationTableAliasProxyHandler, TableAliasProxyHandler, aliasedColumn, aliasedRelation, aliasedTable, aliasedTableColumn, getOriginalColumnFromAlias, mapColumnsInAliasedSQLToAlias, mapColumnsInSQLToAlias };
+export { ColumnAliasProxyHandler, ColumnTableAliasProxyHandler, RelationTableAliasProxyHandler, TableAliasProxyHandler, ViewSelectionAliasProxyHandler, aliasedColumn, aliasedRelation, aliasedTable, aliasedTableColumn, getOriginalColumnFromAlias, mapColumnsInAliasedSQLToAlias, mapColumnsInSQLToAlias };
 //# sourceMappingURL=alias.d.ts.map

package/alias.js

@@ -2,7 +2,8 @@ import { entityKind, is } from "./entity.js";
 import { Table } from "./table.js";
 import { OriginalColumn } from "./column-common.js";
 import { Column } from "./column.js";
-import { SQL, sql } from "./sql/sql.js";
+import { SQL, View, isSQLWrapper, sql } from "./sql/sql.js";
+import { Subquery } from "./subquery.js";
 import { ViewBaseConfig } from "./view-common.js";
 
 //#region src/alias.ts
@@ -18,6 +19,20 @@ var ColumnTableAliasProxyHandler = class {
 		return columnObj[prop];
 	}
 };
+var ViewSelectionAliasProxyHandler = class {
+	static [entityKind] = "ViewSelectionAliasProxyHandler";
+	constructor(view, selection, ignoreColumnAlias) {
+		this.view = view;
+		this.selection = selection;
+		this.ignoreColumnAlias = ignoreColumnAlias;
+	}
+	get(selection, prop) {
+		const value = selection[prop];
+		if (is(value, Column)) return new Proxy(value, new ColumnTableAliasProxyHandler(this.view, this.ignoreColumnAlias));
+		if (is(value, Subquery) || is(value, SQL) || is(value, SQL.Aliased) || isSQLWrapper(value) || typeof value !== "object" || value === null) return value;
+		return new Proxy(value, this);
+	}
+};
 var TableAliasProxyHandler = class {
 	static [entityKind] = "TableAliasProxyHandler";
 	constructor(alias, replaceOriginalName, ignoreColumnAlias) {
@@ -32,11 +47,13 @@ var TableAliasProxyHandler = class {
 		if (prop === ViewBaseConfig) return {
 			...target[ViewBaseConfig],
 			name: this.alias,
-			isAlias: true
+			isAlias: true,
+			selectedFields: new Proxy(target[ViewBaseConfig].selectedFields, new ViewSelectionAliasProxyHandler(new Proxy(target, this), target[ViewBaseConfig].selectedFields, this.ignoreColumnAlias))
 		};
 		if (prop === Table.Symbol.Columns) {
 			const columns = target[Table.Symbol.Columns];
 			if (!columns) return columns;
+			if (is(target, View)) return new Proxy(target[Table.Symbol.Columns], new ViewSelectionAliasProxyHandler(new Proxy(target, this), target[Table.Symbol.Columns], this.ignoreColumnAlias));
 			const proxiedColumns = {};
 			Object.keys(columns).map((key) => {
 				proxiedColumns[key] = new Proxy(columns[key], new ColumnTableAliasProxyHandler(new Proxy(target, this), this.ignoreColumnAlias));
@@ -102,5 +119,5 @@ function getOriginalColumnFromAlias(column) {
 }
 
 //#endregion
-export { ColumnAliasProxyHandler, ColumnTableAliasProxyHandler, RelationTableAliasProxyHandler, TableAliasProxyHandler, aliasedColumn, aliasedRelation, aliasedTable, aliasedTableColumn, getOriginalColumnFromAlias, mapColumnsInAliasedSQLToAlias, mapColumnsInSQLToAlias };
+export { ColumnAliasProxyHandler, ColumnTableAliasProxyHandler, RelationTableAliasProxyHandler, TableAliasProxyHandler, ViewSelectionAliasProxyHandler, aliasedColumn, aliasedRelation, aliasedTable, aliasedTableColumn, getOriginalColumnFromAlias, mapColumnsInAliasedSQLToAlias, mapColumnsInSQLToAlias };
 //# sourceMappingURL=alias.js.map

package/alias.js.map

@@ -1 +1 @@
-{"version":3,"file":"alias.js","names":["table: Table | View","ignoreColumnAlias?: boolean","alias: string","replaceOriginalName: boolean","proxiedColumns: { [key: string]: any }"],"sources":["../src/alias.ts"],"sourcesContent":["import type * as V1 from './_relations.ts';\nimport { OriginalColumn } from './column-common.ts';\nimport type { AnyColumn } from './column.ts';\nimport { Column } from './column.ts';\nimport { entityKind, is } from './entity.ts';\nimport type { View } from './sql/sql.ts';\nimport { SQL, sql } from './sql/sql.ts';\nimport { Table } from './table.ts';\nimport { ViewBaseConfig } from './view-common.ts';\n\nexport class ColumnTableAliasProxyHandler<TColumn extends Column> implements ProxyHandler<TColumn> {\n\tstatic readonly [entityKind]: string = 'ColumnTableAliasProxyHandler';\n\n\tconstructor(private table: Table | View, private ignoreColumnAlias?: boolean) {}\n\n\tget(columnObj: TColumn, prop: string | symbol): any {\n\t\tif (prop === 'table') {\n\t\t\treturn this.table;\n\t\t}\n\n\t\tif (prop === 'isAlias' && this.ignoreColumnAlias) {\n\t\t\treturn false;\n\t\t}\n\n\t\treturn columnObj[prop as keyof TColumn];\n\t}\n}\n\nexport class TableAliasProxyHandler<T extends Table | View> implements ProxyHandler<T> {\n\tstatic readonly [entityKind]: string = 'TableAliasProxyHandler';\n\n\tconstructor(private alias: string, private replaceOriginalName: boolean, private ignoreColumnAlias?: boolean) {}\n\n\tget(target: T, prop: string | symbol): any {\n\t\tif (prop === Table.Symbol.IsAlias) {\n\t\t\treturn true;\n\t\t}\n\n\t\tif (prop === Table.Symbol.Name) {\n\t\t\treturn this.alias;\n\t\t}\n\n\t\tif (this.replaceOriginalName && prop === Table.Symbol.OriginalName) {\n\t\t\treturn this.alias;\n\t\t}\n\n\t\tif (prop === ViewBaseConfig) {\n\t\t\treturn {\n\t\t\t\t...target[ViewBaseConfig as keyof typeof target],\n\t\t\t\tname: this.alias,\n\t\t\t\tisAlias: true,\n\t\t\t};\n\t\t}\n\n\t\tif (prop === Table.Symbol.Columns) {\n\t\t\tconst columns = (target as Table)[Table.Symbol.Columns];\n\t\t\tif (!columns) {\n\t\t\t\treturn columns;\n\t\t\t}\n\n\t\t\tconst proxiedColumns: { [key: string]: any } = {};\n\n\t\t\tObject.keys(columns).map((key) => {\n\t\t\t\tproxiedColumns[key] = new Proxy(\n\t\t\t\t\tcolumns[key]!,\n\t\t\t\t\tnew ColumnTableAliasProxyHandler(new Proxy(target, this), this.ignoreColumnAlias),\n\t\t\t\t);\n\t\t\t});\n\n\t\t\treturn proxiedColumns;\n\t\t}\n\n\t\tconst value = target[prop as keyof typeof target];\n\t\tif (is(value, Column)) {\n\t\t\treturn new Proxy(\n\t\t\t\tvalue as AnyColumn,\n\t\t\t\tnew ColumnTableAliasProxyHandler(new Proxy(target, this), this.ignoreColumnAlias),\n\t\t\t);\n\t\t}\n\n\t\treturn value;\n\t}\n}\n\nexport class ColumnAliasProxyHandler<T extends Column> implements ProxyHandler<T> {\n\tstatic readonly [entityKind]: string = 'ColumnAliasProxyHandler';\n\n\tconstructor(private alias: string) {}\n\n\tget(target: T, prop: keyof Column): any {\n\t\tif (prop === 'isAlias') {\n\t\t\treturn true;\n\t\t}\n\n\t\tif (prop === 'name') {\n\t\t\treturn this.alias;\n\t\t}\n\n\t\tif (prop === 'keyAsName') {\n\t\t\treturn false;\n\t\t}\n\n\t\tif (prop === OriginalColumn) {\n\t\t\treturn () => target;\n\t\t}\n\n\t\treturn target[prop];\n\t}\n}\n\nexport class RelationTableAliasProxyHandler<T extends V1.Relation> implements ProxyHandler<T> {\n\tstatic readonly [entityKind]: string = 'RelationTableAliasProxyHandler';\n\n\tconstructor(private alias: string) {}\n\n\tget(target: T, prop: string | symbol): any {\n\t\tif (prop === 'sourceTable') {\n\t\t\treturn aliasedTable(target.sourceTable, this.alias);\n\t\t}\n\n\t\treturn target[prop as keyof typeof target];\n\t}\n}\n\nexport function aliasedTable<T extends Table | View>(table: T, tableAlias: string): T {\n\treturn new Proxy(table, new TableAliasProxyHandler(tableAlias, false, false));\n}\n\nexport function aliasedColumn<T extends Column>(column: T, alias: string): T {\n\treturn new Proxy(column, new ColumnAliasProxyHandler(alias));\n}\n\nexport function aliasedRelation<T extends V1.Relation>(relation: T, tableAlias: string): T {\n\treturn new Proxy(relation, new RelationTableAliasProxyHandler(tableAlias));\n}\n\nexport function aliasedTableColumn<T extends AnyColumn>(column: T, tableAlias: string): T {\n\treturn new Proxy(\n\t\tcolumn,\n\t\tnew ColumnTableAliasProxyHandler(\n\t\t\tnew Proxy(column.table, new TableAliasProxyHandler(tableAlias, false, false)),\n\t\t\tfalse,\n\t\t),\n\t);\n}\n\nexport function mapColumnsInAliasedSQLToAlias(query: SQL.Aliased, alias: string): SQL.Aliased {\n\treturn new SQL.Aliased(mapColumnsInSQLToAlias(query.sql, alias), query.fieldAlias);\n}\n\nexport function mapColumnsInSQLToAlias(query: SQL, alias: string): SQL {\n\treturn sql.join(query.queryChunks.map((c) => {\n\t\tif (is(c, Column)) {\n\t\t\treturn aliasedTableColumn(c, alias);\n\t\t}\n\t\tif (is(c, SQL)) {\n\t\t\treturn mapColumnsInSQLToAlias(c, alias);\n\t\t}\n\t\tif (is(c, SQL.Aliased)) {\n\t\t\treturn mapColumnsInAliasedSQLToAlias(c, alias);\n\t\t}\n\t\treturn c;\n\t}));\n}\n\n// Defined separately from the Column class to resolve circular dependency\nColumn.prototype.as = function(alias: string): Column {\n\treturn aliasedColumn(this, alias);\n};\n\nexport function getOriginalColumnFromAlias<T extends Column>(column: T): T {\n\treturn column[OriginalColumn]();\n}\n"],"mappings":"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"}
+{"version":3,"file":"alias.js","names":["table: Table | View","ignoreColumnAlias?: boolean","view: View","selection: TSelection","alias: string","replaceOriginalName: boolean","proxiedColumns: { [key: string]: any }"],"sources":["../src/alias.ts"],"sourcesContent":["import type * as V1 from './_relations.ts';\nimport { OriginalColumn } from './column-common.ts';\nimport type { AnyColumn } from './column.ts';\nimport { Column } from './column.ts';\nimport { entityKind, is } from './entity.ts';\nimport { View } from './sql/sql.ts';\nimport { isSQLWrapper, SQL, sql } from './sql/sql.ts';\nimport { Subquery } from './subquery.ts';\nimport { Table } from './table.ts';\nimport { ViewBaseConfig } from './view-common.ts';\n\nexport class ColumnTableAliasProxyHandler<TColumn extends Column> implements ProxyHandler<TColumn> {\n\tstatic readonly [entityKind]: string = 'ColumnTableAliasProxyHandler';\n\n\tconstructor(private table: Table | View, private ignoreColumnAlias?: boolean) {}\n\n\tget(columnObj: TColumn, prop: string | symbol): any {\n\t\tif (prop === 'table') {\n\t\t\treturn this.table;\n\t\t}\n\n\t\tif (prop === 'isAlias' && this.ignoreColumnAlias) {\n\t\t\treturn false;\n\t\t}\n\n\t\treturn columnObj[prop as keyof TColumn];\n\t}\n}\n\nexport class ViewSelectionAliasProxyHandler<TSelection extends Record<string, unknown>>\n\timplements ProxyHandler<TSelection>\n{\n\tstatic readonly [entityKind]: string = 'ViewSelectionAliasProxyHandler';\n\n\tconstructor(protected view: View, protected selection: TSelection, private ignoreColumnAlias?: boolean) {}\n\n\tget(selection: TSelection, prop: string | symbol): any {\n\t\tconst value = selection[prop as keyof TSelection];\n\n\t\tif (is(value, Column)) return new Proxy(value, new ColumnTableAliasProxyHandler(this.view, this.ignoreColumnAlias));\n\t\tif (\n\t\t\tis(value, Subquery) || is(value, SQL) || is(value, SQL.Aliased) || isSQLWrapper(value)\n\t\t\t|| (typeof value !== 'object' || value === null)\n\t\t) return value;\n\n\t\treturn new Proxy(value as Record<string, unknown>, this);\n\t}\n}\n\nexport class TableAliasProxyHandler<T extends Table | View> implements ProxyHandler<T> {\n\tstatic readonly [entityKind]: string = 'TableAliasProxyHandler';\n\n\tconstructor(private alias: string, private replaceOriginalName: boolean, private ignoreColumnAlias?: boolean) {}\n\n\tget(target: T, prop: string | symbol): any {\n\t\tif (prop === Table.Symbol.IsAlias) {\n\t\t\treturn true;\n\t\t}\n\n\t\tif (prop === Table.Symbol.Name) {\n\t\t\treturn this.alias;\n\t\t}\n\n\t\tif (this.replaceOriginalName && prop === Table.Symbol.OriginalName) {\n\t\t\treturn this.alias;\n\t\t}\n\n\t\tif (prop === ViewBaseConfig) {\n\t\t\treturn {\n\t\t\t\t...target[ViewBaseConfig as keyof typeof target],\n\t\t\t\tname: this.alias,\n\t\t\t\tisAlias: true,\n\t\t\t\tselectedFields: new Proxy(\n\t\t\t\t\t(<View> target)[ViewBaseConfig].selectedFields,\n\t\t\t\t\tnew ViewSelectionAliasProxyHandler(\n\t\t\t\t\t\tnew Proxy(target, this) as View,\n\t\t\t\t\t\t(<View> target)[ViewBaseConfig].selectedFields,\n\t\t\t\t\t\tthis.ignoreColumnAlias,\n\t\t\t\t\t),\n\t\t\t\t),\n\t\t\t};\n\t\t}\n\n\t\tif (prop === Table.Symbol.Columns) {\n\t\t\tconst columns = (target as Table)[Table.Symbol.Columns];\n\t\t\tif (!columns) {\n\t\t\t\treturn columns;\n\t\t\t}\n\n\t\t\tif (is(target, View)) {\n\t\t\t\treturn new Proxy(\n\t\t\t\t\t(<View> target)[Table.Symbol.Columns],\n\t\t\t\t\tnew ViewSelectionAliasProxyHandler(\n\t\t\t\t\t\tnew Proxy(target, this) as View,\n\t\t\t\t\t\t(<View> target)[Table.Symbol.Columns],\n\t\t\t\t\t\tthis.ignoreColumnAlias,\n\t\t\t\t\t),\n\t\t\t\t);\n\t\t\t}\n\n\t\t\tconst proxiedColumns: { [key: string]: any } = {};\n\n\t\t\tObject.keys(columns).map((key) => {\n\t\t\t\tproxiedColumns[key] = new Proxy(\n\t\t\t\t\tcolumns[key]!,\n\t\t\t\t\tnew ColumnTableAliasProxyHandler(new Proxy(target, this), this.ignoreColumnAlias),\n\t\t\t\t);\n\t\t\t});\n\n\t\t\treturn proxiedColumns;\n\t\t}\n\n\t\tconst value = target[prop as keyof typeof target];\n\t\tif (is(value, Column)) {\n\t\t\treturn new Proxy(\n\t\t\t\tvalue as AnyColumn,\n\t\t\t\tnew ColumnTableAliasProxyHandler(new Proxy(target, this), this.ignoreColumnAlias),\n\t\t\t);\n\t\t}\n\n\t\treturn value;\n\t}\n}\n\nexport class ColumnAliasProxyHandler<T extends Column> implements ProxyHandler<T> {\n\tstatic readonly [entityKind]: string = 'ColumnAliasProxyHandler';\n\n\tconstructor(private alias: string) {}\n\n\tget(target: T, prop: keyof Column): any {\n\t\tif (prop === 'isAlias') {\n\t\t\treturn true;\n\t\t}\n\n\t\tif (prop === 'name') {\n\t\t\treturn this.alias;\n\t\t}\n\n\t\tif (prop === 'keyAsName') {\n\t\t\treturn false;\n\t\t}\n\n\t\tif (prop === OriginalColumn) {\n\t\t\treturn () => target;\n\t\t}\n\n\t\treturn target[prop];\n\t}\n}\n\nexport class RelationTableAliasProxyHandler<T extends V1.Relation> implements ProxyHandler<T> {\n\tstatic readonly [entityKind]: string = 'RelationTableAliasProxyHandler';\n\n\tconstructor(private alias: string) {}\n\n\tget(target: T, prop: string | symbol): any {\n\t\tif (prop === 'sourceTable') {\n\t\t\treturn aliasedTable(target.sourceTable, this.alias);\n\t\t}\n\n\t\treturn target[prop as keyof typeof target];\n\t}\n}\n\nexport function aliasedTable<T extends Table | View>(table: T, tableAlias: string): T {\n\treturn new Proxy(table, new TableAliasProxyHandler(tableAlias, false, false));\n}\n\nexport function aliasedColumn<T extends Column>(column: T, alias: string): T {\n\treturn new Proxy(column, new ColumnAliasProxyHandler(alias));\n}\n\nexport function aliasedRelation<T extends V1.Relation>(relation: T, tableAlias: string): T {\n\treturn new Proxy(relation, new RelationTableAliasProxyHandler(tableAlias));\n}\n\nexport function aliasedTableColumn<T extends AnyColumn>(column: T, tableAlias: string): T {\n\treturn new Proxy(\n\t\tcolumn,\n\t\tnew ColumnTableAliasProxyHandler(\n\t\t\tnew Proxy(column.table, new TableAliasProxyHandler(tableAlias, false, false)),\n\t\t\tfalse,\n\t\t),\n\t);\n}\n\nexport function mapColumnsInAliasedSQLToAlias(query: SQL.Aliased, alias: string): SQL.Aliased {\n\treturn new SQL.Aliased(mapColumnsInSQLToAlias(query.sql, alias), query.fieldAlias);\n}\n\nexport function mapColumnsInSQLToAlias(query: SQL, alias: string): SQL {\n\treturn sql.join(query.queryChunks.map((c) => {\n\t\tif (is(c, Column)) {\n\t\t\treturn aliasedTableColumn(c, alias);\n\t\t}\n\t\tif (is(c, SQL)) {\n\t\t\treturn mapColumnsInSQLToAlias(c, alias);\n\t\t}\n\t\tif (is(c, SQL.Aliased)) {\n\t\t\treturn mapColumnsInAliasedSQLToAlias(c, alias);\n\t\t}\n\t\treturn c;\n\t}));\n}\n\n// Defined separately from the Column class to resolve circular dependency\nColumn.prototype.as = function(alias: string): Column {\n\treturn aliasedColumn(this, alias);\n};\n\nexport function getOriginalColumnFromAlias<T extends Column>(column: T): T {\n\treturn column[OriginalColumn]();\n}\n"],"mappings":"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"}

package/aws-data-api/pg/migrator.d.cts

@@ -1,10 +1,10 @@
 import { AwsDataApiPgDatabase } from "./driver.cjs";
-import * as __migrator_ts11 from "../../migrator.cjs";
+import * as __migrator_ts0 from "../../migrator.cjs";
 import { MigrationConfig } from "../../migrator.cjs";
 import { AnyRelations } from "../../relations.cjs";
 
 //#region src/aws-data-api/pg/migrator.d.ts
-declare function migrate<TSchema extends Record<string, unknown>, TRelations extends AnyRelations>(db: AwsDataApiPgDatabase<TSchema, TRelations>, config: MigrationConfig): Promise<void | __migrator_ts11.MigratorInitFailResponse>;
+declare function migrate<TSchema extends Record<string, unknown>, TRelations extends AnyRelations>(db: AwsDataApiPgDatabase<TSchema, TRelations>, config: MigrationConfig): Promise<void | __migrator_ts0.MigratorInitFailResponse>;
 //#endregion
 export { migrate };
 //# sourceMappingURL=migrator.d.cts.map

package/aws-data-api/pg/migrator.d.ts

@@ -1,10 +1,10 @@
 import { AwsDataApiPgDatabase } from "./driver.js";
-import * as __migrator_ts10 from "../../migrator.js";
+import * as __migrator_ts4 from "../../migrator.js";
 import { MigrationConfig } from "../../migrator.js";
 import { AnyRelations } from "../../relations.js";
 
 //#region src/aws-data-api/pg/migrator.d.ts
-declare function migrate<TSchema extends Record<string, unknown>, TRelations extends AnyRelations>(db: AwsDataApiPgDatabase<TSchema, TRelations>, config: MigrationConfig): Promise<void | __migrator_ts10.MigratorInitFailResponse>;
+declare function migrate<TSchema extends Record<string, unknown>, TRelations extends AnyRelations>(db: AwsDataApiPgDatabase<TSchema, TRelations>, config: MigrationConfig): Promise<void | __migrator_ts4.MigratorInitFailResponse>;
 //#endregion
 export { migrate };
 //# sourceMappingURL=migrator.d.ts.map

package/better-sqlite3/migrator.d.cts

@@ -1,10 +1,10 @@
 import { BetterSQLite3Database } from "./driver.cjs";
-import * as __migrator_ts9 from "../migrator.cjs";
+import * as __migrator_ts22 from "../migrator.cjs";
 import { MigrationConfig } from "../migrator.cjs";
 import { AnyRelations } from "../relations.cjs";
 
 //#region src/better-sqlite3/migrator.d.ts
-declare function migrate<TSchema extends Record<string, unknown>, TRelations extends AnyRelations>(db: BetterSQLite3Database<TSchema, TRelations>, config: MigrationConfig): void | __migrator_ts9.MigratorInitFailResponse;
+declare function migrate<TSchema extends Record<string, unknown>, TRelations extends AnyRelations>(db: BetterSQLite3Database<TSchema, TRelations>, config: MigrationConfig): void | __migrator_ts22.MigratorInitFailResponse;
 //#endregion
 export { migrate };
 //# sourceMappingURL=migrator.d.cts.map

package/better-sqlite3/migrator.d.ts

@@ -1,10 +1,10 @@
 import { BetterSQLite3Database } from "./driver.js";
-import * as __migrator_ts9 from "../migrator.js";
+import * as __migrator_ts16 from "../migrator.js";
 import { MigrationConfig } from "../migrator.js";
 import { AnyRelations } from "../relations.js";
 
 //#region src/better-sqlite3/migrator.d.ts
-declare function migrate<TSchema extends Record<string, unknown>, TRelations extends AnyRelations>(db: BetterSQLite3Database<TSchema, TRelations>, config: MigrationConfig): void | __migrator_ts9.MigratorInitFailResponse;
+declare function migrate<TSchema extends Record<string, unknown>, TRelations extends AnyRelations>(db: BetterSQLite3Database<TSchema, TRelations>, config: MigrationConfig): void | __migrator_ts16.MigratorInitFailResponse;
 //#endregion
 export { migrate };
 //# sourceMappingURL=migrator.d.ts.map

package/bun-sql/migrator.d.ts

@@ -1,16 +1,16 @@
 import { BunMySqlDatabase } from "./mysql/driver.js";
 import { BunSQLDatabase } from "./postgres/driver.js";
 import { BunSQLiteDatabase } from "./sqlite/driver.js";
-import * as __migrator_ts13 from "../migrator.js";
+import * as __migrator_ts17 from "../migrator.js";
 import { MigrationConfig } from "../migrator.js";
 import { AnyRelations } from "../relations.js";
 
 //#region src/bun-sql/migrator.d.ts
-declare function migrate<TSchema extends Record<string, unknown>, TRelations extends AnyRelations>(db: BunSQLDatabase<TSchema, TRelations>, config: MigrationConfig): Promise<void | __migrator_ts13.MigratorInitFailResponse>;
+declare function migrate<TSchema extends Record<string, unknown>, TRelations extends AnyRelations>(db: BunSQLDatabase<TSchema, TRelations>, config: MigrationConfig): Promise<void | __migrator_ts17.MigratorInitFailResponse>;
 declare namespace migrate {
-  function postgres<TSchema extends Record<string, unknown>, TRelations extends AnyRelations>(db: BunSQLDatabase<TSchema, TRelations>, config: MigrationConfig): Promise<void | __migrator_ts13.MigratorInitFailResponse>;
-  function sqlite<TSchema extends Record<string, unknown>, TRelations extends AnyRelations>(db: BunSQLiteDatabase<TSchema, TRelations>, config: MigrationConfig): Promise<void | __migrator_ts13.MigratorInitFailResponse>;
-  function mysql<TSchema extends Record<string, unknown>, TRelations extends AnyRelations>(db: BunMySqlDatabase<TSchema, TRelations>, config: MigrationConfig): Promise<void | __migrator_ts13.MigratorInitFailResponse>;
+  function postgres<TSchema extends Record<string, unknown>, TRelations extends AnyRelations>(db: BunSQLDatabase<TSchema, TRelations>, config: MigrationConfig): Promise<void | __migrator_ts17.MigratorInitFailResponse>;
+  function sqlite<TSchema extends Record<string, unknown>, TRelations extends AnyRelations>(db: BunSQLiteDatabase<TSchema, TRelations>, config: MigrationConfig): Promise<void | __migrator_ts17.MigratorInitFailResponse>;
+  function mysql<TSchema extends Record<string, unknown>, TRelations extends AnyRelations>(db: BunMySqlDatabase<TSchema, TRelations>, config: MigrationConfig): Promise<void | __migrator_ts17.MigratorInitFailResponse>;
 }
 //#endregion
 export { migrate };

package/bun-sql/mysql/migrator.d.cts

@@ -1,10 +1,10 @@
 import { BunMySqlDatabase } from "./driver.cjs";
-import * as __migrator_ts20 from "../../migrator.cjs";
+import * as __migrator_ts2 from "../../migrator.cjs";
 import { MigrationConfig } from "../../migrator.cjs";
 import { AnyRelations } from "../../relations.cjs";
 
 //#region src/bun-sql/mysql/migrator.d.ts
-declare function migrate<TSchema extends Record<string, unknown>, TRelations extends AnyRelations>(db: BunMySqlDatabase<TSchema, TRelations>, config: MigrationConfig): Promise<void | __migrator_ts20.MigratorInitFailResponse>;
+declare function migrate<TSchema extends Record<string, unknown>, TRelations extends AnyRelations>(db: BunMySqlDatabase<TSchema, TRelations>, config: MigrationConfig): Promise<void | __migrator_ts2.MigratorInitFailResponse>;
 //#endregion
 export { migrate };
 //# sourceMappingURL=migrator.d.cts.map

package/bun-sql/mysql/migrator.d.ts

@@ -1,10 +1,10 @@
 import { BunMySqlDatabase } from "./driver.js";
-import * as __migrator_ts12 from "../../migrator.js";
+import * as __migrator_ts6 from "../../migrator.js";
 import { MigrationConfig } from "../../migrator.js";
 import { AnyRelations } from "../../relations.js";
 
 //#region src/bun-sql/mysql/migrator.d.ts
-declare function migrate<TSchema extends Record<string, unknown>, TRelations extends AnyRelations>(db: BunMySqlDatabase<TSchema, TRelations>, config: MigrationConfig): Promise<void | __migrator_ts12.MigratorInitFailResponse>;
+declare function migrate<TSchema extends Record<string, unknown>, TRelations extends AnyRelations>(db: BunMySqlDatabase<TSchema, TRelations>, config: MigrationConfig): Promise<void | __migrator_ts6.MigratorInitFailResponse>;
 //#endregion
 export { migrate };
 //# sourceMappingURL=migrator.d.ts.map

package/bun-sql/postgres/migrator.d.ts

@@ -1,10 +1,10 @@
 import { BunSQLDatabase } from "./driver.js";
-import * as __migrator_ts20 from "../../migrator.js";
+import * as __migrator_ts21 from "../../migrator.js";
 import { MigrationConfig } from "../../migrator.js";
 import { AnyRelations } from "../../relations.js";
 
 //#region src/bun-sql/postgres/migrator.d.ts
-declare function migrate<TSchema extends Record<string, unknown>, TRelations extends AnyRelations>(db: BunSQLDatabase<TSchema, TRelations>, config: MigrationConfig): Promise<void | __migrator_ts20.MigratorInitFailResponse>;
+declare function migrate<TSchema extends Record<string, unknown>, TRelations extends AnyRelations>(db: BunSQLDatabase<TSchema, TRelations>, config: MigrationConfig): Promise<void | __migrator_ts21.MigratorInitFailResponse>;
 //#endregion
 export { migrate };
 //# sourceMappingURL=migrator.d.ts.map

package/bun-sql/sqlite/migrator.d.ts

@@ -1,10 +1,10 @@
 import { BunSQLiteDatabase } from "./driver.js";
-import * as __migrator_ts11 from "../../migrator.js";
+import * as __migrator_ts22 from "../../migrator.js";
 import { MigrationConfig } from "../../migrator.js";
 import { AnyRelations } from "../../relations.js";
 
 //#region src/bun-sql/sqlite/migrator.d.ts
-declare function migrate<TSchema extends Record<string, unknown>, TRelations extends AnyRelations>(db: BunSQLiteDatabase<TSchema, TRelations>, config: MigrationConfig): Promise<void | __migrator_ts11.MigratorInitFailResponse>;
+declare function migrate<TSchema extends Record<string, unknown>, TRelations extends AnyRelations>(db: BunSQLiteDatabase<TSchema, TRelations>, config: MigrationConfig): Promise<void | __migrator_ts22.MigratorInitFailResponse>;
 //#endregion
 export { migrate };
 //# sourceMappingURL=migrator.d.ts.map

package/bun-sqlite/migrator.cjs

@@ -3,9 +3,9 @@ let __migrator_ts = require("../migrator.cjs");
 
 //#region src/bun-sqlite/migrator.ts
 function migrate(db, config) {
-	if ("migrationsJournal" in config) {
-		const journal = config.migrationsJournal;
-		const migrationsTable = config.migrationsTable;
+	if (Array.isArray(config) || "migrationsJournal" in config) {
+		const journal = Array.isArray(config) ? config : config.migrationsJournal;
+		const migrationsTable = Array.isArray(config) ? void 0 : config.migrationsTable;
 		const migrations$1 = journal.map((d) => ({
 			sql: d.sql.split("--> statement-breakpoint"),
 			folderMillis: d.timestamp,

package/bun-sqlite/migrator.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"migrator.cjs","names":["migrations: MigrationMeta[]","migrations"],"sources":["../../src/bun-sqlite/migrator.ts"],"sourcesContent":["import type {\n\tMigrationConfig,\n\tMigrationFromJournalConfig,\n\tMigrationMeta,\n\tMigrationsJournal,\n\tMigratorInitFailResponse,\n} from '~/migrator.ts';\nimport { readMigrationFiles } from '~/migrator.ts';\nimport type { AnyRelations, EmptyRelations } from '~/relations.ts';\nimport type { SQLiteBunDatabase } from './driver.ts';\n\nexport function migrate<TSchema extends Record<string, unknown>, TRelations extends AnyRelations = EmptyRelations>(\n\tdb: SQLiteBunDatabase<TSchema, TRelations>,\n\tconfig: MigrationConfig,\n): void | MigratorInitFailResponse;\nexport function migrate<\n\tTSchema extends Record<string, unknown>,\n\tTRelations extends AnyRelations = EmptyRelations,\n>(\n\tdb: SQLiteBunDatabase<TSchema, TRelations>,\n\tconfig: MigrationFromJournalConfig | MigrationsJournal,\n): void;\nexport function migrate<TSchema extends Record<string, unknown>, TRelations extends AnyRelations = EmptyRelations>(\n\tdb: SQLiteBunDatabase<TSchema, TRelations>,\n\tconfig: MigrationConfig | MigrationFromJournalConfig | MigrationsJournal,\n): void | MigratorInitFailResponse {\n\tif ('migrationsJournal' in config) {\n\t\tconst journal = config.migrationsJournal;\n\t\tconst migrationsTable = config.migrationsTable;\n\n\t\tconst migrations: MigrationMeta[] = journal.map((d) => ({\n\t\t\tsql: d.sql.split('--> statement-breakpoint'),\n\t\t\tfolderMillis: d.timestamp,\n\t\t\thash: '',\n\t\t\tbps: true,\n\t\t}));\n\n\t\treturn db.dialect.migrate(migrations, db.session, {\n\t\t\tmigrationsTable,\n\t\t});\n\t}\n\n\tconst migrations = readMigrationFiles(config as MigrationConfig);\n\treturn db.dialect.migrate(migrations, db.session, config as MigrationConfig);\n}\n"],"mappings":";;;;AAsBA,SAAgB,QACf,IACA,QACkC;AAClC,KAAI,uBAAuB,QAAQ;EAClC,MAAM,UAAU,OAAO;EACvB,MAAM,kBAAkB,OAAO;EAE/B,MAAMA,eAA8B,QAAQ,KAAK,OAAO;GACvD,KAAK,EAAE,IAAI,MAAM,2BAA2B;GAC5C,cAAc,EAAE;GAChB,MAAM;GACN,KAAK;GACL,EAAE;AAEH,SAAO,GAAG,QAAQ,QAAQC,cAAY,GAAG,SAAS,EACjD,iBACA,CAAC;;CAGH,MAAM,mDAAgC,OAA0B;AAChE,QAAO,GAAG,QAAQ,QAAQ,YAAY,GAAG,SAAS,OAA0B"}
+{"version":3,"file":"migrator.cjs","names":["migrations: MigrationMeta[]","migrations"],"sources":["../../src/bun-sqlite/migrator.ts"],"sourcesContent":["import type {\n\tMigrationConfig,\n\tMigrationFromJournalConfig,\n\tMigrationMeta,\n\tMigrationsJournal,\n\tMigratorInitFailResponse,\n} from '~/migrator.ts';\nimport { readMigrationFiles } from '~/migrator.ts';\nimport type { AnyRelations, EmptyRelations } from '~/relations.ts';\nimport type { SQLiteBunDatabase } from './driver.ts';\n\nexport function migrate<TSchema extends Record<string, unknown>, TRelations extends AnyRelations = EmptyRelations>(\n\tdb: SQLiteBunDatabase<TSchema, TRelations>,\n\tconfig: MigrationConfig,\n): void | MigratorInitFailResponse;\nexport function migrate<\n\tTSchema extends Record<string, unknown>,\n\tTRelations extends AnyRelations = EmptyRelations,\n>(\n\tdb: SQLiteBunDatabase<TSchema, TRelations>,\n\tconfig: MigrationFromJournalConfig | MigrationsJournal,\n): void;\nexport function migrate<TSchema extends Record<string, unknown>, TRelations extends AnyRelations = EmptyRelations>(\n\tdb: SQLiteBunDatabase<TSchema, TRelations>,\n\tconfig: MigrationConfig | MigrationFromJournalConfig | MigrationsJournal,\n): void | MigratorInitFailResponse {\n\tif (Array.isArray(config) || 'migrationsJournal' in config) {\n\t\tconst journal = Array.isArray(config) ? config : config.migrationsJournal;\n\t\tconst migrationsTable = Array.isArray(config) ? undefined : config.migrationsTable;\n\n\t\tconst migrations: MigrationMeta[] = journal.map((d) => ({\n\t\t\tsql: d.sql.split('--> statement-breakpoint'),\n\t\t\tfolderMillis: d.timestamp,\n\t\t\thash: '',\n\t\t\tbps: true,\n\t\t}));\n\n\t\treturn db.dialect.migrate(migrations, db.session, {\n\t\t\tmigrationsTable,\n\t\t});\n\t}\n\n\tconst migrations = readMigrationFiles(config as MigrationConfig);\n\treturn db.dialect.migrate(migrations, db.session, config as MigrationConfig);\n}\n"],"mappings":";;;;AAsBA,SAAgB,QACf,IACA,QACkC;AAClC,KAAI,MAAM,QAAQ,OAAO,IAAI,uBAAuB,QAAQ;EAC3D,MAAM,UAAU,MAAM,QAAQ,OAAO,GAAG,SAAS,OAAO;EACxD,MAAM,kBAAkB,MAAM,QAAQ,OAAO,GAAG,SAAY,OAAO;EAEnE,MAAMA,eAA8B,QAAQ,KAAK,OAAO;GACvD,KAAK,EAAE,IAAI,MAAM,2BAA2B;GAC5C,cAAc,EAAE;GAChB,MAAM;GACN,KAAK;GACL,EAAE;AAEH,SAAO,GAAG,QAAQ,QAAQC,cAAY,GAAG,SAAS,EACjD,iBACA,CAAC;;CAGH,MAAM,mDAAgC,OAA0B;AAChE,QAAO,GAAG,QAAQ,QAAQ,YAAY,GAAG,SAAS,OAA0B"}

package/bun-sqlite/migrator.js

@@ -2,9 +2,9 @@ import { readMigrationFiles } from "../migrator.js";
 
 //#region src/bun-sqlite/migrator.ts
 function migrate(db, config) {
-	if ("migrationsJournal" in config) {
-		const journal = config.migrationsJournal;
-		const migrationsTable = config.migrationsTable;
+	if (Array.isArray(config) || "migrationsJournal" in config) {
+		const journal = Array.isArray(config) ? config : config.migrationsJournal;
+		const migrationsTable = Array.isArray(config) ? void 0 : config.migrationsTable;
 		const migrations$1 = journal.map((d) => ({
 			sql: d.sql.split("--> statement-breakpoint"),
 			folderMillis: d.timestamp,

package/bun-sqlite/migrator.js.map

@@ -1 +1 @@
-{"version":3,"file":"migrator.js","names":["migrations: MigrationMeta[]","migrations"],"sources":["../../src/bun-sqlite/migrator.ts"],"sourcesContent":["import type {\n\tMigrationConfig,\n\tMigrationFromJournalConfig,\n\tMigrationMeta,\n\tMigrationsJournal,\n\tMigratorInitFailResponse,\n} from '~/migrator.ts';\nimport { readMigrationFiles } from '~/migrator.ts';\nimport type { AnyRelations, EmptyRelations } from '~/relations.ts';\nimport type { SQLiteBunDatabase } from './driver.ts';\n\nexport function migrate<TSchema extends Record<string, unknown>, TRelations extends AnyRelations = EmptyRelations>(\n\tdb: SQLiteBunDatabase<TSchema, TRelations>,\n\tconfig: MigrationConfig,\n): void | MigratorInitFailResponse;\nexport function migrate<\n\tTSchema extends Record<string, unknown>,\n\tTRelations extends AnyRelations = EmptyRelations,\n>(\n\tdb: SQLiteBunDatabase<TSchema, TRelations>,\n\tconfig: MigrationFromJournalConfig | MigrationsJournal,\n): void;\nexport function migrate<TSchema extends Record<string, unknown>, TRelations extends AnyRelations = EmptyRelations>(\n\tdb: SQLiteBunDatabase<TSchema, TRelations>,\n\tconfig: MigrationConfig | MigrationFromJournalConfig | MigrationsJournal,\n): void | MigratorInitFailResponse {\n\tif ('migrationsJournal' in config) {\n\t\tconst journal = config.migrationsJournal;\n\t\tconst migrationsTable = config.migrationsTable;\n\n\t\tconst migrations: MigrationMeta[] = journal.map((d) => ({\n\t\t\tsql: d.sql.split('--> statement-breakpoint'),\n\t\t\tfolderMillis: d.timestamp,\n\t\t\thash: '',\n\t\t\tbps: true,\n\t\t}));\n\n\t\treturn db.dialect.migrate(migrations, db.session, {\n\t\t\tmigrationsTable,\n\t\t});\n\t}\n\n\tconst migrations = readMigrationFiles(config as MigrationConfig);\n\treturn db.dialect.migrate(migrations, db.session, config as MigrationConfig);\n}\n"],"mappings":";;;AAsBA,SAAgB,QACf,IACA,QACkC;AAClC,KAAI,uBAAuB,QAAQ;EAClC,MAAM,UAAU,OAAO;EACvB,MAAM,kBAAkB,OAAO;EAE/B,MAAMA,eAA8B,QAAQ,KAAK,OAAO;GACvD,KAAK,EAAE,IAAI,MAAM,2BAA2B;GAC5C,cAAc,EAAE;GAChB,MAAM;GACN,KAAK;GACL,EAAE;AAEH,SAAO,GAAG,QAAQ,QAAQC,cAAY,GAAG,SAAS,EACjD,iBACA,CAAC;;CAGH,MAAM,aAAa,mBAAmB,OAA0B;AAChE,QAAO,GAAG,QAAQ,QAAQ,YAAY,GAAG,SAAS,OAA0B"}
+{"version":3,"file":"migrator.js","names":["migrations: MigrationMeta[]","migrations"],"sources":["../../src/bun-sqlite/migrator.ts"],"sourcesContent":["import type {\n\tMigrationConfig,\n\tMigrationFromJournalConfig,\n\tMigrationMeta,\n\tMigrationsJournal,\n\tMigratorInitFailResponse,\n} from '~/migrator.ts';\nimport { readMigrationFiles } from '~/migrator.ts';\nimport type { AnyRelations, EmptyRelations } from '~/relations.ts';\nimport type { SQLiteBunDatabase } from './driver.ts';\n\nexport function migrate<TSchema extends Record<string, unknown>, TRelations extends AnyRelations = EmptyRelations>(\n\tdb: SQLiteBunDatabase<TSchema, TRelations>,\n\tconfig: MigrationConfig,\n): void | MigratorInitFailResponse;\nexport function migrate<\n\tTSchema extends Record<string, unknown>,\n\tTRelations extends AnyRelations = EmptyRelations,\n>(\n\tdb: SQLiteBunDatabase<TSchema, TRelations>,\n\tconfig: MigrationFromJournalConfig | MigrationsJournal,\n): void;\nexport function migrate<TSchema extends Record<string, unknown>, TRelations extends AnyRelations = EmptyRelations>(\n\tdb: SQLiteBunDatabase<TSchema, TRelations>,\n\tconfig: MigrationConfig | MigrationFromJournalConfig | MigrationsJournal,\n): void | MigratorInitFailResponse {\n\tif (Array.isArray(config) || 'migrationsJournal' in config) {\n\t\tconst journal = Array.isArray(config) ? config : config.migrationsJournal;\n\t\tconst migrationsTable = Array.isArray(config) ? undefined : config.migrationsTable;\n\n\t\tconst migrations: MigrationMeta[] = journal.map((d) => ({\n\t\t\tsql: d.sql.split('--> statement-breakpoint'),\n\t\t\tfolderMillis: d.timestamp,\n\t\t\thash: '',\n\t\t\tbps: true,\n\t\t}));\n\n\t\treturn db.dialect.migrate(migrations, db.session, {\n\t\t\tmigrationsTable,\n\t\t});\n\t}\n\n\tconst migrations = readMigrationFiles(config as MigrationConfig);\n\treturn db.dialect.migrate(migrations, db.session, config as MigrationConfig);\n}\n"],"mappings":";;;AAsBA,SAAgB,QACf,IACA,QACkC;AAClC,KAAI,MAAM,QAAQ,OAAO,IAAI,uBAAuB,QAAQ;EAC3D,MAAM,UAAU,MAAM,QAAQ,OAAO,GAAG,SAAS,OAAO;EACxD,MAAM,kBAAkB,MAAM,QAAQ,OAAO,GAAG,SAAY,OAAO;EAEnE,MAAMA,eAA8B,QAAQ,KAAK,OAAO;GACvD,KAAK,EAAE,IAAI,MAAM,2BAA2B;GAC5C,cAAc,EAAE;GAChB,MAAM;GACN,KAAK;GACL,EAAE;AAEH,SAAO,GAAG,QAAQ,QAAQC,cAAY,GAAG,SAAS,EACjD,iBACA,CAAC;;CAGH,MAAM,aAAa,mBAAmB,OAA0B;AAChE,QAAO,GAAG,QAAQ,QAAQ,YAAY,GAAG,SAAS,OAA0B"}

package/cockroach/migrator.d.cts

@@ -1,9 +1,9 @@
 import { NodeCockroachDatabase } from "./driver.cjs";
-import * as __migrator_ts21 from "../migrator.cjs";
+import * as __migrator_ts10 from "../migrator.cjs";
 import { MigrationConfig } from "../migrator.cjs";
 
 //#region src/cockroach/migrator.d.ts
-declare function migrate<TSchema extends Record<string, unknown>>(db: NodeCockroachDatabase<TSchema>, config: MigrationConfig): Promise<void | __migrator_ts21.MigratorInitFailResponse>;
+declare function migrate<TSchema extends Record<string, unknown>>(db: NodeCockroachDatabase<TSchema>, config: MigrationConfig): Promise<void | __migrator_ts10.MigratorInitFailResponse>;
 //#endregion
 export { migrate };
 //# sourceMappingURL=migrator.d.cts.map

package/cockroach/migrator.d.ts

@@ -1,9 +1,9 @@
 import { NodeCockroachDatabase } from "./driver.js";
-import * as __migrator_ts22 from "../migrator.js";
+import * as __migrator_ts5 from "../migrator.js";
 import { MigrationConfig } from "../migrator.js";
 
 //#region src/cockroach/migrator.d.ts
-declare function migrate<TSchema extends Record<string, unknown>>(db: NodeCockroachDatabase<TSchema>, config: MigrationConfig): Promise<void | __migrator_ts22.MigratorInitFailResponse>;
+declare function migrate<TSchema extends Record<string, unknown>>(db: NodeCockroachDatabase<TSchema>, config: MigrationConfig): Promise<void | __migrator_ts5.MigratorInitFailResponse>;
 //#endregion
 export { migrate };
 //# sourceMappingURL=migrator.d.ts.map

package/cockroach-core/columns/date.common.d.cts

@@ -1,12 +1,12 @@
 import { CockroachColumnWithArrayBuilder } from "./common.cjs";
 import { entityKind } from "../../entity.cjs";
-import * as __column_builder_ts1 from "../../column-builder.cjs";
+import * as __column_builder_ts0 from "../../column-builder.cjs";
 import { ColumnBuilderBaseConfig, ColumnType } from "../../column-builder.cjs";
 
 //#region src/cockroach-core/columns/date.common.d.ts
 declare abstract class CockroachDateColumnBaseBuilder<T extends ColumnBuilderBaseConfig<ColumnType>, TRuntimeConfig extends object = object> extends CockroachColumnWithArrayBuilder<T, TRuntimeConfig> {
   static readonly [entityKind]: string;
-  defaultNow(): __column_builder_ts1.HasDefault<this>;
+  defaultNow(): __column_builder_ts0.HasDefault<this>;
 }
 //#endregion
 export { CockroachDateColumnBaseBuilder };

package/cockroach-core/dialect.cjs

@@ -174,6 +174,11 @@ var CockroachDialect = class {
 			if (table[__table_ts.Table.Symbol.Schema]) fullName = __sql_sql_ts.sql`${__sql_sql_ts.sql.identifier(table[__table_ts.Table.Symbol.Schema])}.${fullName}`;
 			return __sql_sql_ts.sql`${fullName} ${__sql_sql_ts.sql.identifier(table[__table_ts.Table.Symbol.Name])}`;
 		}
+		if ((0, __entity_ts.is)(table, __sql_index_ts.View) && table[__view_common_ts.ViewBaseConfig].isAlias) {
+			let fullName = __sql_sql_ts.sql`${__sql_sql_ts.sql.identifier(table[__view_common_ts.ViewBaseConfig].originalName)}`;
+			if (table[__view_common_ts.ViewBaseConfig].schema) fullName = __sql_sql_ts.sql`${__sql_sql_ts.sql.identifier(table[__view_common_ts.ViewBaseConfig].schema)}.${fullName}`;
+			return __sql_sql_ts.sql`${fullName} ${__sql_sql_ts.sql.identifier(table[__view_common_ts.ViewBaseConfig].name)}`;
+		}
 		return table;
 	}
 	buildSelectQuery({ withList, fields, fieldsFlat, where, having, table, joins, orderBy, groupBy, limit, offset, lockingClause, distinct, setOperators }) {