@mikro-orm/postgresql 7.2.6-dev.11 → 7.2.6-dev.13

package/PostgreSqlConnection.d.ts

@@ -15,8 +15,9 @@ export declare class PostgreSqlConnection extends AbstractSqlConnection {
      * Both of the paths that emit one are unguarded by default: `pg-pool` removes its own listener
      * from a client while that client is checked out, deliberately leaving errors to whoever holds it,
      * and it re-emits errors of idle clients on the pool itself. The query in flight still rejects on
-     * its own, so there is nothing to do here beyond logging — the pool has already discarded the
-     * broken client by the time we see it.
+     * its own. An idle client is already discarded by the pool by the time we see it, a checked-out one
+     * is released here, as kysely's `ControlledTransaction` only releases after a successful
+     * commit/rollback (kysely-org/kysely#1990), which a dead connection never gets.
      */
     private handlePoolErrors;
     /** Applies the active EM's session context (or resets it) on every pooled connection acquire. */

package/PostgreSqlConnection.js

@@ -35,12 +35,24 @@ export class PostgreSqlConnection extends AbstractSqlConnection {
      * Both of the paths that emit one are unguarded by default: `pg-pool` removes its own listener
      * from a client while that client is checked out, deliberately leaving errors to whoever holds it,
      * and it re-emits errors of idle clients on the pool itself. The query in flight still rejects on
-     * its own, so there is nothing to do here beyond logging — the pool has already discarded the
-     * broken client by the time we see it.
+     * its own. An idle client is already discarded by the pool by the time we see it, a checked-out one
+     * is released here, as kysely's `ControlledTransaction` only releases after a successful
+     * commit/rollback (kysely-org/kysely#1990), which a dead connection never gets.
      */
     handlePoolErrors(pool) {
+        const checkedOut = new WeakSet();
+        pool.on('acquire', client => checkedOut.add(client));
+        pool.on('release', (_err, client) => checkedOut.delete(client));
         pool.on('connect', client => {
-            client.on('error', e => this.logger.warn('info', `PostgreSQL connection error: ${e.message}`));
+            client.on('error', e => {
+                this.logger.warn('info', `PostgreSQL connection error: ${e.message}`);
+                // kysely still releases a client whose plain query failed, and `pg-pool` throws on a second release
+                if (checkedOut.has(client)) {
+                    const release = client.release;
+                    client.release = () => undefined;
+                    release(e);
+                }
+            });
         });
         pool.on('error', e => this.logger.warn('info', `PostgreSQL pool error: ${e.message}`));
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/postgresql",
-  "version": "7.2.6-dev.11",
+  "version": "7.2.6-dev.13",
   "description": "TypeScript ORM for Node.js based on Data Mapper, Unit of Work and Identity Map patterns. Supports MongoDB, MySQL, PostgreSQL and SQLite databases as well as usage with vanilla JavaScript.",
   "keywords": [
     "data-mapper",
@@ -47,7 +47,7 @@
     "copy": "node ../../scripts/copy.mjs"
   },
   "dependencies": {
-    "@mikro-orm/sql": "7.2.6-dev.11",
+    "@mikro-orm/sql": "7.2.6-dev.13",
     "kysely": "0.29.6",
     "pg": "8.23.1",
     "pg-cursor": "2.22.1",
@@ -59,7 +59,7 @@
     "@mikro-orm/core": "^7.2.5"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.2.6-dev.11"
+    "@mikro-orm/core": "7.2.6-dev.13"
   },
   "engines": {
     "node": ">= 22.17.0"