keep the counter (#36892)

laravel · Apr 6, 2021 · ab3596b · ab3596b
1 parent 103261a
commit ab3596b
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/Illuminate/Database/Concerns/ManagesTransactions.php b/src/Illuminate/Database/Concerns/ManagesTransactions.php
@@ -41,11 +41,13 @@ public function transaction(Closure $callback, $attempts = 1)
             }
 
             try {
+                if ($this->transactions == 1) {
+                    $this->getPdo()->commit();
+                }
+
                 $this->transactions = max(0, $this->transactions - 1);
 
                 if ($this->transactions == 0) {
-                    $this->getPdo()->commit();
-
                     optional($this->transactionsManager)->commit($this->getName());
                 }
             } catch (Throwable $e) {
@@ -187,12 +189,14 @@ public function commit()
     {
         if ($this->transactions == 1) {
             $this->getPdo()->commit();
-
-            optional($this->transactionsManager)->commit($this->getName());
         }
 
         $this->transactions = max(0, $this->transactions - 1);
 
+        if ($this->transactions == 0) {
+            optional($this->transactionsManager)->commit($this->getName());
+        }
+
         $this->fireConnectionEvent('committed');
     }