fx: Ensure own connection is always released even if exception occurs.

rogerpadilla · Sep 27, 2024 · 17e5128 · 17e5128
1 parent 8b288fe
commit 17e5128
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 31 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@ date format is [yyyy-mm-dd]
 
 ## [1.4.4] - 2024-09-26
 
+- Ensure own connection is always released even if exception occurs.
 - Correct issue when empty or null list is passed to `insertMany` operations.
 
 ## [1.4.3] - 2024-09-25

diff --git a/packages/core/src/querier/abstractSqlQuerier.ts b/packages/core/src/querier/abstractSqlQuerier.ts
@@ -98,17 +98,23 @@ export abstract class AbstractSqlQuerier extends AbstractQuerier {
     if (!this.hasPendingTransaction) {
       throw TypeError('not a pending transaction');
     }
-    await this.run('COMMIT');
-    this.hasPendingTransaction = undefined;
-    await this.release();
+    try {
+      await this.run('COMMIT');
+    } finally {
+      this.hasPendingTransaction = undefined;
+      await this.release();
+    }
   }
 
   override async rollbackTransaction() {
     if (!this.hasPendingTransaction) {
       throw TypeError('not a pending transaction');
     }
-    await this.run('ROLLBACK');
-    this.hasPendingTransaction = undefined;
-    await this.release();
+    try {
+      await this.run('ROLLBACK');
+    } finally {
+      this.hasPendingTransaction = undefined;
+      await this.release();
+    }
   }
 }
diff --git a/packages/maria/src/mariadbQuerier.ts b/packages/maria/src/mariadbQuerier.ts
@@ -16,18 +16,24 @@ export class MariadbQuerier extends AbstractSqlQuerier {
   override async all<T>(query: string) {
     this.extra?.logger?.(query);
     await this.lazyConnect();
-    const res: T[] = await this.conn.query(query);
-    await this.releaseIfFree();
-    return res.slice(0, res.length);
+    try {
+      const res: T[] = await this.conn.query(query);
+      return res.slice(0, res.length);
+    } finally {
+      await this.releaseIfFree();
+    }
   }
 
   override async run(query: string) {
     this.extra?.logger?.(query);
     await this.lazyConnect();
-    const res = await this.conn.query(query);
-    await this.releaseIfFree();
-    const ids = res.length ? res.map((r: any) => r.id) : [];
-    return { changes: res.affectedRows, ids, firstId: ids[0] } satisfies QueryUpdateResult;
+    try {
+      const res = await this.conn.query(query);
+      const ids = res.length ? res.map((r: any) => r.id) : [];
+      return { changes: res.affectedRows, ids, firstId: ids[0] } satisfies QueryUpdateResult;
+    } finally {
+      await this.releaseIfFree();
+    }
   }
 
   async lazyConnect() {

diff --git a/packages/mysql/src/mysql2Querier.ts b/packages/mysql/src/mysql2Querier.ts
@@ -16,22 +16,28 @@ export class MySql2Querier extends AbstractSqlQuerier {
   override async all<T>(query: string) {
     this.extra?.logger?.(query);
     await this.lazyConnect();
-    const [res] = await this.conn.query(query);
-    await this.releaseIfFree();
-    return res as T[];
+    try {
+      const [res] = await this.conn.query(query);
+      return res as T[];
+    } finally {
+      await this.releaseIfFree();
+    }
   }
 
   override async run(query: string) {
     this.extra?.logger?.(query);
     await this.lazyConnect();
-    const [res]: any = await this.conn.query(query);
-    await this.releaseIfFree();
-    const ids = res.insertId
-      ? Array(res.affectedRows)
-          .fill(res.insertId)
-          .map((i, index) => i + index)
-      : [];
-    return { changes: res.affectedRows, ids, firstId: ids[0] } satisfies QueryUpdateResult;
+    try {
+      const [res]: any = await this.conn.query(query);
+      const ids = res.insertId
+        ? Array(res.affectedRows)
+            .fill(res.insertId)
+            .map((i, index) => i + index)
+        : [];
+      return { changes: res.affectedRows, ids, firstId: ids[0] } satisfies QueryUpdateResult;
+    } finally {
+      await this.releaseIfFree();
+    }
   }
 
   async lazyConnect() {

diff --git a/packages/postgres/src/pgQuerier.ts b/packages/postgres/src/pgQuerier.ts
@@ -16,18 +16,24 @@ export class PgQuerier extends AbstractSqlQuerier {
   override async all<T>(query: string) {
     this.extra?.logger?.(query);
     await this.lazyConnect();
-    const res = await this.conn.query<T>(query);
-    await this.releaseIfFree();
-    return res.rows;
+    try {
+      const res = await this.conn.query<T>(query);
+      return res.rows;
+    } finally {
+      await this.releaseIfFree();
+    }
   }
 
   override async run(query: string) {
     this.extra?.logger?.(query);
     await this.lazyConnect();
-    const { rowCount: changes, rows = [] }: any = await this.conn.query(query);
-    await this.releaseIfFree();
-    const ids = rows.map((r: any) => r.id);
-    return { changes, ids, firstId: ids[0] } satisfies QueryUpdateResult;
+    try {
+      const { rowCount: changes, rows = [] }: any = await this.conn.query(query);
+      const ids = rows.map((r: any) => r.id);
+      return { changes, ids, firstId: ids[0] } satisfies QueryUpdateResult;
+    } finally {
+      await this.releaseIfFree();
+    }
   }
 
   async lazyConnect() {