[12.x] Don't fail database queue jobs on deadlock

src/Illuminate/Queue/DatabaseQueue.php

@@ -5,6 +5,7 @@
 use Illuminate\Contracts\Queue\ClearableQueue;
 use Illuminate\Contracts\Queue\Queue as QueueContract;
 use Illuminate\Database\Connection;
+use Illuminate\Database\DetectsConcurrencyErrors;
 use Illuminate\Queue\Jobs\DatabaseJob;
 use Illuminate\Queue\Jobs\DatabaseJobRecord;
 use Illuminate\Support\Carbon;
@@ -16,6 +17,7 @@
 
 class DatabaseQueue extends Queue implements QueueContract, ClearableQueue
 {
+    use DetectsConcurrencyErrors;
     /**
      * The database connection instance.
      *
@@ -295,6 +297,10 @@ public function pop($queue = null)
                 }
             });
         } catch (Throwable $e) {
+            if ($this->causedByConcurrencyError($e)) {
+                return null;
+            }
+
             // Potentially invalid job that we need to fail (#58978)...
             if ($jobRecord) {
                 try {

tests/Queue/QueueDatabaseQueueUnitTest.php

@@ -6,10 +6,13 @@
 use Illuminate\Bus\Batchable;
 use Illuminate\Container\Container;
 use Illuminate\Database\Connection;
+use Illuminate\Database\QueryException;
 use Illuminate\Queue\DatabaseQueue;
+use Illuminate\Queue\Jobs\DatabaseJobRecord;
 use Illuminate\Queue\Queue;
 use Illuminate\Support\Str;
 use Mockery as m;
+use PDOException;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use ReflectionClass;
@@ -196,6 +199,27 @@ public function testBuildDatabaseRecordWithPayloadAtTheEnd()
         $this->assertArrayHasKey('payload', $record);
         $this->assertArrayHasKey('payload', array_slice($record, -1, 1, true));
     }
+
+    public function testPopReturnsNullOnDeadlock()
+    {
+        $queue = $this->getMockBuilder(DatabaseQueue::class)
+            ->onlyMethods(['getNextAvailableJob', 'marshalJob', 'deleteReserved'])
+            ->setConstructorArgs([$database = m::mock(Connection::class), 'table', 'default'])
+            ->getMock();
+
+        $queue->setContainer(m::mock(Container::class));
+        $queue->method('getNextAvailableJob')->willReturn(m::mock(DatabaseJobRecord::class));
+        $queue->method('marshalJob')->willThrowException(
+            new QueryException('mysql', '', [], new PDOException('SQLSTATE[40001]: Serialization failure: 1213 Deadlock found when trying to get lock; try restarting transaction'))
+        );
+        $queue->expects($this->never())->method('deleteReserved');
+
+        $database->shouldReceive('transaction')->andReturnUsing(function ($callback) {
+            return $callback();
+        });
+
+        $this->assertNull($queue->pop('default'));
+    }
 }
 
 class MyTestJob