[8.x] Delete and release database jobs inside a transaction

src/Illuminate/Queue/DatabaseQueue.php

@@ -321,6 +321,25 @@ public function deleteReserved($queue, $id)
         });
     }
 
+    /**
+     * Delete a reserved job from the reserved queue and release it.
+     *
+     * @param  string  $queue
+     * @param  \Illuminate\Queue\Jobs\DatabaseJob  $job
+     * @param  int  $delay
+     * @return void
+     */
+    public function deleteAndRelease($queue, $job, $delay)
+    {
+        $this->database->transaction(function () use ($queue, $job, $delay) {
+            if ($this->database->table($this->table)->lockForUpdate()->find($job->getJobId())) {
+                $this->database->table($this->table)->where('id', $job->getJobId())->delete();
+            }
+
+            $this->release($queue, $job->getJobRecord(), $delay);
+        });
+    }
+
     /**
      * Get the queue or return the default.
      *

src/Illuminate/Queue/Jobs/DatabaseJob.php

@@ -51,9 +51,7 @@ public function release($delay = 0)
     {
         parent::release($delay);
 
-        $this->delete();
-
-        return $this->database->release($this->queue, $this->job, $delay);
+        return $this->database->deleteAndRelease($this->queue, $this, $delay);
     }
 
     /**
@@ -97,4 +95,14 @@ public function getRawBody()
     {
         return $this->job->payload;
     }
+
+    /**
+     * Get the database job record.
+     *
+     * @return \Illuminate\Queue\Jobs\DatabaseJobRecord
+     */
+    public function getJobRecord()
+    {
+        return $this->job;
+    }
 }