Swap isNestedTransaction() for getSavepointIdentifier()

amphp · Dec 5, 2023 · 0689e04 · 0689e04
1 parent 9f57ee2
commit 0689e04
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/ConnectionTransaction.php b/src/ConnectionTransaction.php
@@ -141,9 +141,9 @@ public function getLastUsedAt(): int
         return $this->executor->getLastUsedAt();
     }
 
-    public function isNestedTransaction(): bool
+    public function getSavepointIdentifier(): ?string
     {
-        return false;
+        return null;
     }
 
     /**

diff --git a/src/NestedTransaction.php b/src/NestedTransaction.php
@@ -260,9 +260,9 @@ public function onRollback(\Closure $onRollback): void
         $this->onRollback->getFuture()->finally($onRollback);
     }
 
-    public function isNestedTransaction(): bool
+    public function getSavepointIdentifier(): string
     {
-        return true;
+        return $this->identifier;
     }
 
     public function getIsolationLevel(): TransactionIsolation

diff --git a/src/PooledTransaction.php b/src/PooledTransaction.php
@@ -59,7 +59,7 @@ abstract protected function createTransaction(Transaction $transaction, \Closure
     public function __construct(private readonly Transaction $transaction, \Closure $release)
     {
         $refCount = &$this->refCount;
-        $this->release = static function () use (&$busy, &$refCount, $release): void {
+        $this->release = static function () use (&$refCount, $release): void {
             if (--$refCount === 0) {
                 $release();
             }
@@ -167,9 +167,9 @@ public function onRollback(\Closure $onRollback): void
         $this->transaction->onRollback($onRollback);
     }
 
-    public function isNestedTransaction(): bool
+    public function getSavepointIdentifier(): ?string
     {
-        return $this->transaction->isNestedTransaction();
+        return $this->transaction->getSavepointIdentifier();
     }
 
     public function getIsolationLevel(): TransactionIsolation