driver-adapters: fix Transaction.dispose for pg and neon (#4295)

prisma · Sep 27, 2023 · 743c426 · 743c426
1 parent 802670c
commit 743c426
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/query-engine/driver-adapters/js/adapter-neon/package.json b/query-engine/driver-adapters/js/adapter-neon/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@prisma/adapter-neon",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "description": "Prisma's driver adapter for \"@neondatabase/serverless\"",
   "main": "dist/index.js",
   "module": "dist/index.mjs",

diff --git a/query-engine/driver-adapters/js/adapter-neon/src/neon.ts b/query-engine/driver-adapters/js/adapter-neon/src/neon.ts
@@ -80,6 +80,8 @@ class NeonWsQueryable<ClientT extends neon.Pool | neon.PoolClient> extends NeonQ
 }
 
 class NeonTransaction extends NeonWsQueryable<neon.PoolClient> implements Transaction {
+  finished = false
+
   constructor(
     client: neon.PoolClient,
     readonly options: TransactionOptions,
@@ -90,19 +92,23 @@ class NeonTransaction extends NeonWsQueryable<neon.PoolClient> implements Transa
   async commit(): Promise<Result<void>> {
     debug(`[js::commit]`)
 
+    this.finished = true
     this.client.release()
     return Promise.resolve(ok(undefined))
   }
 
   async rollback(): Promise<Result<void>> {
     debug(`[js::rollback]`)
 
+    this.finished = true
     this.client.release()
     return Promise.resolve(ok(undefined))
   }
 
   dispose(): Result<void> {
-    this.client.release()
+    if (!this.finished) {
+      this.client.release()
+    }
     return ok(undefined)
   }
 }

diff --git a/query-engine/driver-adapters/js/adapter-pg/package.json b/query-engine/driver-adapters/js/adapter-pg/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@prisma/adapter-pg",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "description": "Prisma's driver adapter for \"pg\"",
   "main": "dist/index.js",
   "module": "dist/index.mjs",

diff --git a/query-engine/driver-adapters/js/adapter-pg/src/pg.ts b/query-engine/driver-adapters/js/adapter-pg/src/pg.ts
@@ -76,26 +76,32 @@ class PgQueryable<ClientT extends StdClient | TransactionClient> implements Quer
 }
 
 class PgTransaction extends PgQueryable<TransactionClient> implements Transaction {
+  finished = false
+
   constructor(client: pg.PoolClient, readonly options: TransactionOptions) {
     super(client)
   }
 
   async commit(): Promise<Result<void>> {
     debug(`[js::commit]`)
 
+    this.finished = true
     this.client.release()
     return ok(undefined)
   }
 
   async rollback(): Promise<Result<void>> {
     debug(`[js::rollback]`)
 
+    this.finished = true
     this.client.release()
     return ok(undefined)
   }
 
   dispose(): Result<void> {
-    this.client.release()
+    if (!this.finished) {
+      this.client.release()
+    }
     return ok(undefined)
   }
 }