@mikro-orm/sql 7.1.9-dev.14 → 7.1.9-dev.16

package/AbstractSqlConnection.js

@@ -110,7 +110,15 @@ export class AbstractSqlConnection extends Connection {
             return ret;
         }
         catch (error) {
-            await this.rollback(trx, options.eventBroadcaster, options.loggerContext);
+            // A failing rollback must not mask why the transaction failed in the first place — the
+            // `'kill session'` abort strategy tears the connection down, so the rollback that follows can
+            // only ever report the dead connection.
+            try {
+                await this.rollback(trx, options.eventBroadcaster, options.loggerContext);
+            }
+            catch (rollbackError) {
+                this.logger.warn('query', `Failed to roll back transaction: ${rollbackError.message}`);
+            }
             throw error;
         }
     }
@@ -138,18 +146,8 @@ export class AbstractSqlConnection extends Connection {
             trxBuilder = trxBuilder.setAccessMode('read only');
         }
         const trx = await trxBuilder.execute();
-        if (options.ctx) {
-            const ctx = options.ctx;
-            ctx.index ??= 0;
-            const savepointName = `trx${ctx.index + 1}`;
-            Reflect.defineProperty(trx, 'index', { value: ctx.index + 1 });
-            Reflect.defineProperty(trx, 'savepointName', { value: savepointName });
-            this.logQuery(this.platform.getSavepointSQL(savepointName), options.loggerContext);
-        }
-        else {
-            for (const query of this.platform.getBeginTransactionSQL(options)) {
-                this.logQuery(query, options.loggerContext);
-            }
+        for (const query of this.platform.getBeginTransactionSQL(options)) {
+            this.logQuery(query, options.loggerContext);
         }
         await options.eventBroadcaster?.dispatchEvent(EventType.afterTransactionStart, trx);
         return trx;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/sql",
-  "version": "7.1.9-dev.14",
+  "version": "7.1.9-dev.16",
   "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",
@@ -53,7 +53,7 @@
     "@mikro-orm/core": "^7.1.8"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.1.9-dev.14"
+    "@mikro-orm/core": "7.1.9-dev.16"
   },
   "engines": {
     "node": ">= 22.17.0"