Build fix

Author: Sukairo-02

drizzle-kit/src/ext/api-postgres.ts

@@ -1,6 +1,7 @@
 import type { PGlite } from '@electric-sql/pglite';
 import type { Relations } from 'drizzle-orm/_relations';
-import type { AnyPgTable, PgDatabase } from 'drizzle-orm/pg-core';
+import type { AnyPgTable } from 'drizzle-orm/pg-core';
+import type { PgAsyncDatabase } from 'drizzle-orm/pg-core/async';
 import type { EntitiesFilterConfig } from 'src/cli/validations/cli';
 import { upToV8 } from 'src/dialects/postgres/versions';
 import type { CasingType } from '../cli/validations/common';
@@ -110,7 +111,7 @@ export const generateMigration = async (
 
 export const pushSchema = async (
 	imports: Record<string, unknown>,
-	drizzleInstance: PgDatabase<any>,
+	drizzleInstance: PgAsyncDatabase<any>,
 	casing?: CasingType,
 	entitiesConfig?: EntitiesFilterConfig,
 ) => {

drizzle-seed/src/SeedService.ts

@@ -3,7 +3,7 @@ import { entityKind, eq, is, sql } from 'drizzle-orm';
 import type { MySqlTable, MySqlTableWithColumns } from 'drizzle-orm/mysql-core';
 import { MySqlDatabase } from 'drizzle-orm/mysql-core';
 import type { PgTable, PgTableWithColumns } from 'drizzle-orm/pg-core';
-import { PgDatabase } from 'drizzle-orm/pg-core';
+import { PgAsyncDatabase } from 'drizzle-orm/pg-core/async';
 import type { SQLiteTable, SQLiteTableWithColumns } from 'drizzle-orm/sqlite-core';
 import { BaseSQLiteDatabase } from 'drizzle-orm/sqlite-core';
 import { generatorsMap } from './generators/GeneratorFuncs.ts';
@@ -919,7 +919,7 @@ export class SeedService {
 			// }
 		}
 		let maxParametersNumber: number;
-		if (is(db, PgDatabase<any>)) {
+		if (is(db, PgAsyncDatabase<any>)) {
 			// @ts-ignore
 			maxParametersNumber = db.constructor[entityKind] === 'PgliteDatabase'
 				? this.postgresPgLiteMaxParametersNumber
@@ -1040,7 +1040,7 @@ export class SeedService {
 		tableName: string;
 		override: boolean;
 	}) => {
-		if (is(db, PgDatabase<any>)) {
+		if (is(db, PgAsyncDatabase<any>)) {
 			const query = db.insert((schema as { [key: string]: PgTable })[tableName]!);
 			if (override === true) {
 				return await query.overridingSystemValue().values(generatedValues);
@@ -1105,7 +1105,7 @@ export class SeedService {
 		const uniqueNotNullColValue = values[uniqueNotNullColName];
 		values = Object.fromEntries(Object.entries(values).filter(([colName]) => colName !== uniqueNotNullColName));
 
-		if (is(db, PgDatabase<any>)) {
+		if (is(db, PgAsyncDatabase<any>)) {
 			const table = (schema as { [key: string]: PgTableWithColumns<any> })[tableName]!;
 			const uniqueNotNullCol = table[uniqueNotNullColName];
 			await db.update(table).set(values).where(

drizzle-seed/src/index.ts

@@ -6,7 +6,7 @@ import type { MySqlColumn, MySqlSchema, MySqlTable } from 'drizzle-orm/mysql-cor
 import { MySqlDatabase } from 'drizzle-orm/mysql-core';
 
 import type { PgColumn, PgSchema, PgTable } from 'drizzle-orm/pg-core';
-import { PgDatabase } from 'drizzle-orm/pg-core';
+import { PgAsyncDatabase } from 'drizzle-orm/pg-core/async';
 
 import type { SQLiteColumn, SQLiteTable } from 'drizzle-orm/sqlite-core';
 import { BaseSQLiteDatabase } from 'drizzle-orm/sqlite-core';
@@ -81,7 +81,7 @@ export type InferCallbackType<
 	SCHEMA extends {
 		[key: string]: SchemaValuesType;
 	},
-> = DB extends PgDatabase<any, any> ? RefineTypes<SCHEMA, PgTable, PgColumn>
+> = DB extends PgAsyncDatabase<any, any> ? RefineTypes<SCHEMA, PgTable, PgColumn>
 	: DB extends MySqlDatabase<any, any> ? RefineTypes<SCHEMA, MySqlTable, MySqlColumn>
 	: DB extends BaseSQLiteDatabase<any, any> ? RefineTypes<SCHEMA, SQLiteTable, SQLiteColumn>
 	: DB extends MsSqlDatabase<any, any> ? RefineTypes<SCHEMA, MsSqlTable, MsSqlColumn>
@@ -326,7 +326,7 @@ const seedFunc = async (
 		version = Number(options?.version);
 	}
 
-	if (is(db, PgDatabase<any, any>)) {
+	if (is(db, PgAsyncDatabase<any, any>)) {
 		await seedPostgres(db, schema, { ...options, version }, refinements);
 	} else if (is(db, MySqlDatabase<any, any>)) {
 		await seedMySql(db, schema, { ...options, version }, refinements);
@@ -393,7 +393,7 @@ export async function reset<
 		[key: string]: SchemaValuesType;
 	},
 >(db: DB, schema: SCHEMA) {
-	if (is(db, PgDatabase<any, any>)) {
+	if (is(db, PgAsyncDatabase<any, any>)) {
 		const { pgTables } = filterPgSchema(schema);
 
 		if (Object.entries(pgTables).length > 0) {

drizzle-seed/src/pg-core/index.ts

@@ -1,15 +1,16 @@
 import { is, sql } from 'drizzle-orm';
 import { Relations } from 'drizzle-orm/_relations';
-import type { PgArray, PgDatabase, PgSchema } from 'drizzle-orm/pg-core';
+import type { PgArray, PgSchema } from 'drizzle-orm/pg-core';
 import { getTableConfig, PgTable } from 'drizzle-orm/pg-core';
+import type { PgAsyncDatabase } from 'drizzle-orm/pg-core/async';
 import { getSchemaInfo } from '../common.ts';
 import { SeedService } from '../SeedService.ts';
 import type { RefinementsType } from '../types/seedService.ts';
 import type { Column, TableConfigT } from '../types/tables.ts';
 
 // Postgres-----------------------------------------------------------------------------------------------------------
 export const resetPostgres = async (
-	db: PgDatabase<any, any>,
+	db: PgAsyncDatabase<any, any>,
 	pgTables: { [key: string]: PgTable },
 ) => {
 	const tablesToTruncate = Object.entries(pgTables).map(([_, table]) => {
@@ -43,7 +44,7 @@ export const filterPgSchema = (schema: {
 };
 
 export const seedPostgres = async (
-	db: PgDatabase<any, any>,
+	db: PgAsyncDatabase<any, any>,
 	schema: {
 		[key: string]:
 			| PgTable

drizzle-seed/src/types/seedService.ts

@@ -1,7 +1,8 @@
 import type { CockroachDatabase, CockroachTable } from 'drizzle-orm/cockroach-core';
 import type { MsSqlDatabase, MsSqlTable } from 'drizzle-orm/mssql-core';
 import type { MySqlDatabase, MySqlTable } from 'drizzle-orm/mysql-core';
-import type { PgDatabase, PgTable } from 'drizzle-orm/pg-core';
+import type { PgTable } from 'drizzle-orm/pg-core';
+import type { PgAsyncDatabase } from 'drizzle-orm/pg-core/async';
 import type { SingleStoreDatabase, SingleStoreTable } from 'drizzle-orm/singlestore-core';
 import type { BaseSQLiteDatabase, SQLiteTable } from 'drizzle-orm/sqlite-core';
 import type { AbstractGenerator } from '../generators/Generators.ts';
@@ -10,7 +11,7 @@ import type { Prettify } from './tables.ts';
 export type GeneratedValueType = number | bigint | string | Buffer | boolean | undefined;
 
 export type DbType =
-	| PgDatabase<any, any, any>
+	| PgAsyncDatabase<any, any, any>
 	| MySqlDatabase<any, any, any, any>
 	| BaseSQLiteDatabase<any, any, any, any>
 	| MsSqlDatabase<any, any, any, any>

drizzle-seed/tests/pg/instrumentation.ts

@@ -1,5 +1,5 @@
 import { drizzle } from 'drizzle-orm/node-postgres';
-import type { PgDatabase } from 'drizzle-orm/pg-core';
+import type { PgAsyncDatabase } from 'drizzle-orm/pg-core/async';
 import { Client } from 'pg';
 import { test as base } from 'vitest';
 
@@ -27,7 +27,7 @@ const prepareTest = () => {
 				query: (sql: string, params: any[]) => Promise<any[]>;
 				batch: (statements: string[]) => Promise<void>;
 			};
-			db: PgDatabase<any, any, any>;
+			db: PgAsyncDatabase<any, any, any>;
 			push: (schema: any) => Promise<void>;
 		}
 	>({