Merge pull request #432 from drizzle-team/beta

Author: dankochetov

changelogs/drizzle-orm/0.23.10.md

@@ -0,0 +1,2 @@
+- 🐛 Add missing config argument to transactions API
+- 🐛 Fix Postgres and MySQL schema declaration (#427)

drizzle-orm/package.json

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

drizzle-orm/src/mysql-core/db.ts

@@ -85,7 +85,8 @@ export class MySqlDatabase<TQueryResult extends QueryResultHKT> {
 
 	transaction<T>(
 		transaction: (tx: MySqlTransaction<TQueryResult>, config?: MySqlTransactionConfig) => Promise<T>,
+		config?: MySqlTransactionConfig,
 	): Promise<T> {
-		return this.session.transaction(transaction);
+		return this.session.transaction(transaction, config);
 	}
 }

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

@@ -1,7 +1,7 @@
 import type { PgDialect } from '~/pg-core/dialect';
 import type { QueryBuilderInstance } from '~/pg-core/query-builders';
 import { PgDelete, PgInsertBuilder, PgSelectBuilder, PgUpdateBuilder, queryBuilder } from '~/pg-core/query-builders';
-import type { PgSession, PgTransaction, QueryResultHKT, QueryResultKind } from '~/pg-core/session';
+import type { PgSession, PgTransaction, PgTransactionConfig, QueryResultHKT, QueryResultKind } from '~/pg-core/session';
 import type { AnyPgTable } from '~/pg-core/table';
 import type { QueryBuilder } from '~/query-builders/query-builder';
 import { type SQLWrapper } from '~/sql';
@@ -78,7 +78,8 @@ export class PgDatabase<TQueryResult extends QueryResultHKT> {
 
 	transaction<T>(
 		transaction: (tx: PgTransaction<TQueryResult>) => Promise<T>,
+		config?: PgTransactionConfig,
 	): Promise<T> {
-		return this.session.transaction(transaction);
+		return this.session.transaction(transaction, config);
 	}
 }

drizzle-orm/src/sqlite-core/db.ts

@@ -10,7 +10,7 @@ import {
 	SQLiteSelectBuilder,
 	SQLiteUpdateBuilder,
 } from '~/sqlite-core/query-builders';
-import type { ResultKind, SQLiteSession } from '~/sqlite-core/session';
+import type { ResultKind, SQLiteSession, SQLiteTransactionConfig } from '~/sqlite-core/session';
 import type { AnySQLiteTable } from '~/sqlite-core/table';
 import { SelectionProxyHandler, WithSubquery } from '~/subquery';
 import type { SelectedFields } from './query-builders/select.types';
@@ -93,8 +93,9 @@ export class BaseSQLiteDatabase<TResultKind extends 'sync' | 'async', TRunResult
 
 	transaction<T>(
 		transaction: (tx: SQLiteTransaction<TResultKind, TRunResult>) => ResultKind<TResultKind, T>,
+		config?: SQLiteTransactionConfig,
 	): ResultKind<TResultKind, T> {
-		return this.session.transaction(transaction);
+		return this.session.transaction(transaction, config);
 	}
 }