f

Author: killagu

src/connection.ts

@@ -1,3 +1,4 @@
+import assert from 'node:assert';
 import { promisify } from 'node:util';
 import { Operator } from './operator';
 import type { PoolConnectionPromisify } from './types';
@@ -6,8 +7,11 @@ const kWrapToRDS = Symbol('kWrapToRDS');
 
 export class RDSConnection extends Operator {
   conn: PoolConnectionPromisify;
+  #released: boolean;
+
   constructor(conn: PoolConnectionPromisify) {
     super(conn);
+    this.#released = false;
     this.conn = conn;
     if (!this.conn[kWrapToRDS]) {
       [
@@ -23,6 +27,8 @@ export class RDSConnection extends Operator {
   }
 
   release() {
+    assert(!this.#released, 'connection was released');
+    this.#released = true;
     return this.conn.release();
   }
 

src/transaction.ts

@@ -1,12 +1,16 @@
 import type { RDSConnection } from './connection';
 import { Operator } from './operator';
 
+let id = 0;
 export class RDSTransaction extends Operator {
   isCommit = false;
   isRollback = false;
   conn: RDSConnection | null;
+  id: number;
+
   constructor(conn: RDSConnection) {
     super(conn.conn);
+    this.id = id++;
     this.conn = conn;
   }
 

test/client.test.ts

@@ -299,8 +299,9 @@ describe('test/client.test.ts', () => {
         // recovered after unlock.
         await conn.query('select * from `myrds-test-user` limit 1;');
       } catch (err) {
-        conn.release();
         throw err;
+      } finally {
+        conn.release();
       }
     });
 
@@ -354,7 +355,8 @@ describe('test/client.test.ts', () => {
     });
 
     it('should throw rollback error with cause error when rollback failed', async () => {
-      mm(RDSTransaction.prototype, 'rollback', async () => {
+      mm(RDSTransaction.prototype, 'rollback', async function(this: RDSTransaction) {
+        this.conn!.release();
         throw new Error('fake rollback error');
       });
       await assert.rejects(
@@ -502,7 +504,9 @@ describe('test/client.test.ts', () => {
         });
       };
 
-      const [ p1Res, p2Res ] = await Promise.all([ p1(), p2().catch(err => err) ]);
+      const [ p1Res, p2Res ] = await Promise.all([ p1(), p2().catch(err => {
+        return err;
+      }) ]);
       assert.strictEqual(p1Res, true);
       assert.strictEqual(p2Res.code, 'ER_PARSE_ERROR');
       const rows = await db.query('select * from ?? where email=? order by id',
@@ -681,6 +685,7 @@ describe('test/client.test.ts', () => {
         });
         return db;
       });
+      conn.release();
       assert(connQuerySql);
       assert(!transactionQuerySql);
     });
@@ -1508,10 +1513,11 @@ describe('test/client.test.ts', () => {
       for (let i = 0; i < 10; i++) {
         tasks.push(longQuery());
       }
+      const tasksPromise = Promise.all(tasks);
       await assert.rejects(async () => {
         await longQuery();
       }, /get connection timeout after/);
-      await Promise.all(tasks);
+      await tasksPromise;
     });
 
     it('should release conn to pool', async () => {