fix transaction problems on closure transaction

laravel · Jul 24, 2020 · c4cdfc7 · c4cdfc7
1 parent 7681795
commit c4cdfc7
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/src/Illuminate/Database/Concerns/ManagesTransactions.php b/src/Illuminate/Database/Concerns/ManagesTransactions.php
@@ -45,15 +45,25 @@ public function transaction(Closure $callback, $attempts = 1)
             }
 
             try {
-                $this->commit();
+                if ($this->transactions == 1) {
+                    $this->getPdo()->commit();
+                }
+
+                $this->transactions = max(0, $this->transactions - 1);
             } catch (Exception $e) {
+                $commitFailed = true;
+
                 $this->handleCommitTransactionException(
                     $e, $currentAttempt, $attempts
                 );
 
                 continue;
             }
 
+            if (! isset($commitFailed)) {
+                $this->fireConnectionEvent('committed');
+            }
+
             return $callbackResult;
         }
     }