Merge main

Author: dankochetov

changelogs/drizzle-orm/0.23.11.md

@@ -1 +1,3 @@
-- 🐛 Fixed multi-level join results (e.g. joining a subquery with a nested join)
+- 🐛 Fix migrator function for PostgreSQL
+
+> Would suggest to upgrade to this version anyone who is using postgres dialect. `0.23.9` and `0.23.10` are broken for postgresql migrations

changelogs/drizzle-orm/0.23.12.md

@@ -0,0 +1 @@
+- 🐛 Fixed multi-level join results (e.g. joining a subquery with a nested join)

drizzle-orm/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drizzle-orm",
-  "version": "0.23.11",
+  "version": "0.23.12",
   "description": "Drizzle ORM package for SQL databases",
   "scripts": {
     "build": "tsc && resolve-tspaths && cp ../README.md package.json dist/",

drizzle-orm/src/aws-data-api/pg/session.ts

@@ -63,11 +63,15 @@ export class AwsDataApiPreparedQuery<T extends PreparedQueryConfig> extends Prep
 
 		const result = await this.client.send(this.rawQuery);
 
-		return result.records?.map((result) => {
-			const mappedResult = result.map((res) => getValueFromDataApi(res));
+		return result.records?.map((result: any) => {
+			const mappedResult = result.map((res: any) => getValueFromDataApi(res));
 			return mapResultRow<T['execute']>(fields, mappedResult, this.joinsNotNullableMap);
 		});
 	}
+
+	all(placeholderValues?: Record<string, unknown> | undefined): Promise<T['all']> {
+		return this.execute(placeholderValues)
+	}
 }
 
 export interface AwsDataApiSessionOptions {

drizzle-orm/src/pg-core/dialect.ts

@@ -25,7 +25,7 @@ export class PgDialect {
 		await session.execute(sql`CREATE SCHEMA IF NOT EXISTS "drizzle"`);
 		await session.execute(migrationTableCreate);
 
-		const dbMigrations = await session.execute<{ id: number; hash: string; created_at: string }[]>(
+		const dbMigrations = await session.all<{ id: number; hash: string; created_at: string }>(
 			sql`select id, hash, created_at from "drizzle"."__drizzle_migrations" order by created_at desc limit 1`,
 		);
 

drizzle-orm/src/pg-core/session.ts

@@ -15,6 +15,9 @@ export abstract class PreparedQuery<T extends PreparedQueryConfig> {
 	joinsNotNullableMap?: Record<string, boolean>;
 
 	abstract execute(placeholderValues?: Record<string, unknown>): Promise<T['execute']>;
+
+	/** @internal */
+	abstract all(placeholderValues?: Record<string, unknown>): Promise<T['all']>;
 }
 
 export interface PgTransactionConfig {
@@ -40,6 +43,14 @@ export abstract class PgSession<TQueryResult extends QueryResultHKT = QueryResul
 		).execute();
 	}
 
+	all<T = unknown>(query: SQL): Promise<T[]> {
+		return this.prepareQuery<PreparedQueryConfig & { all: T[] }>(
+			this.dialect.sqlToQuery(query),
+			undefined,
+			undefined,
+		).all();
+	}
+
 	abstract transaction<T>(
 		transaction: (tx: PgTransaction<TQueryResult>) => Promise<T>,
 		config?: PgTransactionConfig,