Use parentTransaction instead of baseExecutionPromise

knex · Nov 29, 2023 · 7c318f7 · 7c318f7
1 parent 2fd15ba
commit 7c318f7
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 15 deletions.
diff --git a/lib/execution/transaction.js b/lib/execution/transaction.js
@@ -219,11 +219,11 @@ class Transaction extends EventEmitter {
           return makeTransactor(this, connection, trxClient);
         })
         .then((transactor) => {
+          this.transactor = transactor;
+          if (this.outerTx) {
+            transactor.parentTransaction = this.outerTx.transactor;
+          }
           transactor.executionPromise = executionPromise;
-          transactor.baseExecutionPromise = this.baseExecutionPromise = this
-            .outerTx
-            ? this.outerTx.baseExecutionPromise
-            : executionPromise;
 
           // If we've returned a "thenable" from the transaction container, assume
           // the rollback and commit are chained to this object's success / failure.

diff --git a/test/integration/execution/transaction.js b/test/integration/execution/transaction.js
@@ -811,23 +811,26 @@ module.exports = function (knex) {
       });
     });
 
-    it('exposes baseExecutionPromise', async () => {
-      let committed = false;
+    it('exposes the parent transaction', async () => {
       await knex.transaction(async (trx1) => {
-        expect(trx1.baseExecutionPromise).to.equal(trx1.executionPromise);
+        expect(trx1.parentTransaction).to.equal(undefined);
+
         await trx1.transaction(async (trx2) => {
-          expect(trx2.baseExecutionPromise).to.equal(trx1.executionPromise);
+          expect(trx2.parentTransaction).to.equal(trx1);
+        });
+
+        await trx1.transaction(async (trx2) => {
+          expect(trx2.parentTransaction).to.equal(trx1);
+
           await trx2.transaction(async (trx3) => {
-            expect(trx3.baseExecutionPromise).to.equal(trx1.executionPromise);
-            trx3.baseExecutionPromise.then(() => {
-              committed = true;
-            });
+            expect(trx3.parentTransaction).to.equal(trx2);
+          });
+
+          await trx2.transaction(async (trx3) => {
+            expect(trx3.parentTransaction).to.equal(trx2);
           });
-          expect(committed).to.be.false;
         });
-        expect(committed).to.be.false;
       });
-      expect(committed).to.be.true;
     });
   });
 };
diff --git a/types/index.d.ts b/types/index.d.ts
@@ -2323,6 +2323,7 @@ declare namespace Knex {
   interface Transaction<TRecord extends {} = any, TResult = any[]>
     extends Knex<TRecord, TResult> {
     executionPromise: Promise<TResult>;
+    parentTransaction?: Transaction;
     isCompleted: () => boolean;
 
     query<TRecord extends {} = any, TResult = void>(