Fix baseColumn type on Column

Fixes #983, #992
drizzle-team · Aug 7, 2023 · c091982 · c091982
1 parent f1c6b48
commit c091982
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/drizzle-orm/src/alias.ts b/drizzle-orm/src/alias.ts
@@ -6,7 +6,7 @@ import { SQL, sql } from './sql';
 import { Table } from './table';
 import { type View, ViewBaseConfig } from './view';
 
-export class ColumnAliasProxyHandler<TColumn extends AnyColumn> implements ProxyHandler<TColumn> {
+export class ColumnAliasProxyHandler<TColumn extends Column> implements ProxyHandler<TColumn> {
 	static readonly [entityKind]: string = 'ColumnAliasProxyHandler';
 
 	constructor(private table: Table | View) {}

diff --git a/drizzle-orm/src/column.ts b/drizzle-orm/src/column.ts
@@ -24,7 +24,7 @@ export type ColumnTypeConfig<T extends ColumnBaseConfig<ColumnDataType, string>,
 	notNull: T['notNull'];
 	hasDefault: T['hasDefault'];
 	enumValues: T['enumValues'];
-	baseColumn: T extends { baseColumn: infer U } ? U : never;
+	baseColumn: T extends { baseColumn: infer U } ? U : unknown;
 } & TTypeConfig;
 
 export type ColumnRuntimeConfig<TData, TRuntimeConfig extends object> = ColumnBuilderRuntimeConfig<

diff --git a/drizzle-orm/src/relations.ts b/drizzle-orm/src/relations.ts
@@ -189,7 +189,7 @@ export type DBQueryConfig<
 export interface TableRelationalConfig {
 	tsName: string;
 	dbName: string;
-	columns: Record<string, AnyColumn>;
+	columns: Record<string, Column>;
 	relations: Record<string, Relation>;
 	primaryKey: AnyColumn[];
 }