@mikro-orm/postgresql 7.2.6-dev.4 → 7.2.6-dev.40

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 commit or a rollback,
+     * which a transaction left open on a dead connection may never get.
      */
     private handlePoolErrors;
     /** Applies the active EM's session context (or resets it) on every pooled connection acquire. */

package/PostgreSqlConnection.js

@@ -1,15 +1,36 @@
-import { Pool, TypeOverrides } from 'pg';
+import { Client, Pool, TypeOverrides } from 'pg';
 import Cursor from 'pg-cursor';
 import { CompiledQuery, PostgresDialect } from 'kysely';
 import array from 'postgres-array';
 import { AbstractSqlConnection, createPostgreSqlTypeParsers, Utils } from '@mikro-orm/sql';
+/**
+ * PostgreSQL answers `COMMIT` of an aborted transaction with the command tag `ROLLBACK` instead of an error,
+ * and kysely drops the tag, so the failed commit is rejected here, like any other commit the server refused.
+ */
+class PostgreSqlClient extends Client {
+    query(...args) {
+        const res = super.query.apply(this, args);
+        // kysely sends a top-level commit as exactly `commit`, a callback-style call returns nothing
+        if (args[0] !== 'commit' || !res) {
+            return res;
+        }
+        return res.then((result) => {
+            if (result.command === 'ROLLBACK') {
+                throw Object.assign(new Error('current transaction is aborted, COMMIT was answered with ROLLBACK'), {
+                    code: '25P02',
+                });
+            }
+            return result;
+        });
+    }
+}
 /** PostgreSQL database connection using the `pg` driver. */
 export class PostgreSqlConnection extends AbstractSqlConnection {
     #pool;
     createKyselyDialect(overrides) {
         const { onPoolCreated, ...poolOverrides } = (overrides ?? {});
         const options = this.mapOptions(poolOverrides);
-        const pool = new Pool(options);
+        const pool = new Pool({ Client: PostgreSqlClient, ...options });
         this.#pool = pool;
         this.handlePoolErrors(pool);
         void onPoolCreated?.(pool);
@@ -35,12 +56,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 commit or a rollback,
+     * which a transaction left open on a dead connection may never get.
      */
     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.4",
+  "version": "7.2.6-dev.40",
   "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,8 +47,8 @@
     "copy": "node ../../scripts/copy.mjs"
   },
   "dependencies": {
-    "@mikro-orm/sql": "7.2.6-dev.4",
-    "kysely": "0.29.6",
+    "@mikro-orm/sql": "7.2.6-dev.40",
+    "kysely": "0.29.7",
     "pg": "8.23.1",
     "pg-cursor": "2.22.1",
     "postgres-array": "3.0.4",
@@ -59,7 +59,7 @@
     "@mikro-orm/core": "^7.2.5"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.2.6-dev.4"
+    "@mikro-orm/core": "7.2.6-dev.40"
   },
   "engines": {
     "node": ">= 22.17.0"