Add fixes for types

drizzle-team · Oct 22, 2024 · 57d2372 · 57d2372
1 parent 0f8ad6a
commit 57d2372
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 20 deletions.
diff --git a/drizzle-kit/src/introspect-pg.ts b/drizzle-kit/src/introspect-pg.ts
@@ -59,6 +59,11 @@ const pgImportsList = new Set([
 	'line',
 	'geometry',
 	'geography',
+	'oid',
+	'name',
+	'compactstateagg',
+	'stateagg',
+	'heartbeatagg',
 ]);
 
 const objToStatement2 = (json: { [s: string]: unknown }) => {
@@ -1083,6 +1088,31 @@ const column = (
 		return out;
 	}
 
+	if (lowered === 'oid') {
+		let out = `${withCasing(name, casing)}: oid(${dbColumnName({ name, casing })})`;
+		return out;
+	}
+
+	if (lowered === 'name') {
+		let out = `${withCasing(name, casing)}: name(${dbColumnName({ name, casing })})`;
+		return out;
+	}
+
+	if (lowered === 'heartbeatagg') {
+		let out = `${withCasing(name, casing)}: heartbeatagg(${dbColumnName({ name, casing })})`;
+		return out;
+	}
+
+	if (lowered === 'stateagg') {
+		let out = `${withCasing(name, casing)}: stateagg(${dbColumnName({ name, casing })})`;
+		return out;
+	}
+
+	if (lowered === 'compactstateagg') {
+		let out = `${withCasing(name, casing)}: compactstateagg(${dbColumnName({ name, casing })})`;
+		return out;
+	}
+
 	let unknown = `// TODO: failed to parse database type '${type}'\n`;
 	unknown += `\t${withCasing(name, casing)}: unknown("${name}")`;
 	return unknown;

diff --git a/drizzle-orm/src/pg-core/columns/postgres_internals/name.ts b/drizzle-orm/src/pg-core/columns/postgres_internals/name.ts
@@ -50,8 +50,8 @@ export class PgNameInternal<T extends ColumnBaseConfig<'string', 'PgNameInternal
 	}
 }
 
-export function name<TName extends string>(
-	name: TName,
-): PgNameInternalBuilderInitial<TName> {
-	return new PgNameInternalBuilder(name);
+export function name(): PgNameInternalBuilderInitial<''>;
+export function name<TName extends string>(name: TName): PgNameInternalBuilderInitial<TName>;
+export function name(name?: string) {
+	return new PgNameInternalBuilder(name ?? '');
 }
diff --git a/drizzle-orm/src/pg-core/columns/postgres_internals/oid.ts b/drizzle-orm/src/pg-core/columns/postgres_internals/oid.ts
@@ -50,8 +50,8 @@ export class PgOidInternal<T extends ColumnBaseConfig<'string', 'PgOidInternal'>
 	}
 }
 
-export function oid<TName extends string>(
-	name: TName,
-): PgOidInternalBuilderInitial<TName> {
-	return new PgOidInternalBuilder(name);
+export function oid(): PgOidInternalBuilderInitial<''>;
+export function oid<TName extends string>(name: TName): PgOidInternalBuilderInitial<TName>;
+export function oid(name?: string) {
+	return new PgOidInternalBuilder(name ?? '');
 }
diff --git a/drizzle-orm/src/pg-core/columns/timescale/compactstateagg.ts b/drizzle-orm/src/pg-core/columns/timescale/compactstateagg.ts
@@ -50,8 +50,8 @@ export class PgCompactStateAgg<T extends ColumnBaseConfig<'string', 'PgCompactSt
 	}
 }
 
-export function compactStateAgg<TName extends string>(
-	name: TName,
-): PgCompactStateAggBuilderInitial<TName> {
-	return new PgCompactStateAggBuilder(name);
+export function compactstateagg(): PgCompactStateAggBuilderInitial<''>;
+export function compactstateagg<TName extends string>(name: TName): PgCompactStateAggBuilderInitial<TName>;
+export function compactstateagg(name?: string) {
+	return new PgCompactStateAggBuilder(name ?? '');
 }
diff --git a/drizzle-orm/src/pg-core/columns/timescale/heartbeatagg.ts b/drizzle-orm/src/pg-core/columns/timescale/heartbeatagg.ts
@@ -50,8 +50,8 @@ export class PgHeartBeatAgg<T extends ColumnBaseConfig<'string', 'PgHeartBeatAgg
 	}
 }
 
-export function heartBeatAgg<TName extends string>(
-	name: TName,
-): PgHeartBeatAggBuilderInitial<TName> {
-	return new PgHeartBeatAggBuilder(name);
+export function heartbeatagg(): PgHeartBeatAggBuilderInitial<''>;
+export function heartbeatagg<TName extends string>(name: TName): PgHeartBeatAggBuilderInitial<TName>;
+export function heartbeatagg(name?: string) {
+	return new PgHeartBeatAggBuilder(name ?? '');
 }
diff --git a/drizzle-orm/src/pg-core/columns/timescale/stateagg.ts b/drizzle-orm/src/pg-core/columns/timescale/stateagg.ts
@@ -48,8 +48,8 @@ export class PgStateAgg<T extends ColumnBaseConfig<'string', 'PgStateAgg'>> exte
 	}
 }
 
-export function stateAgg<TName extends string>(
-	name: TName,
-): PgStateAggBuilderInitial<TName> {
-	return new PgStateAggBuilder(name);
+export function stateagg(): PgStateAggBuilderInitial<''>;
+export function stateagg<TName extends string>(name: TName): PgStateAggBuilderInitial<TName>;
+export function stateagg(name?: string) {
+	return new PgStateAggBuilder(name ?? '');
 }