throw deadlock exception (#42129)

laravel · Apr 25, 2022 · 6b87641 · 6b87641
1 parent 704f275
commit 6b87641
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/src/Illuminate/Database/Concerns/ManagesTransactions.php b/src/Illuminate/Database/Concerns/ManagesTransactions.php
@@ -3,6 +3,7 @@
 namespace Illuminate\Database\Concerns;
 
 use Closure;
+use Illuminate\Database\DeadlockException;
 use RuntimeException;
 use Throwable;
 
@@ -87,7 +88,11 @@ protected function handleTransactionException(Throwable $e, $currentAttempt, $ma
                 $this->getName(), $this->transactions
             );
 
-            throw $e;
+            throw new DeadlockException(
+                $e->getMessage(),
+                $e->getCode(),
+                $e->getPrevious()
+            );
         }
 
         // If there was an exception we will rollback this transaction and then we
@@ -226,8 +231,7 @@ protected function handleCommitTransactionException(Throwable $e, $currentAttemp
     {
         $this->transactions = max(0, $this->transactions - 1);
 
-        if ($this->causedByConcurrencyError($e) &&
-            $currentAttempt < $maxAttempts) {
+        if ($this->causedByConcurrencyError($e) && $currentAttempt < $maxAttempts) {
             return;
         }
 

diff --git a/src/Illuminate/Database/DeadlockException.php b/src/Illuminate/Database/DeadlockException.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Illuminate\Database;
+
+use PDOException;
+
+class DeadlockException extends PDOException
+{
+    //
+}