Back to 7c8d3d0 + test (#22343)

Put the payload column of jobs table to the end of insert statements.
laravel · Dec 7, 2017 · 1fa9dac · 1fa9dac
1 parent 1bc8dd9
commit 1fa9dac
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/Illuminate/Queue/DatabaseQueue.php b/src/Illuminate/Queue/DatabaseQueue.php
@@ -171,11 +171,11 @@ protected function buildDatabaseRecord($queue, $payload, $availableAt, $attempts
     {
         return [
             'queue' => $queue,
-            'payload' => $payload,
             'attempts' => $attempts,
             'reserved_at' => null,
             'available_at' => $availableAt,
             'created_at' => $this->currentTime(),
+            'payload' => $payload,
         ];
     }
 

diff --git a/tests/Queue/QueueDatabaseQueueUnitTest.php b/tests/Queue/QueueDatabaseQueueUnitTest.php
@@ -108,4 +108,12 @@ public function testBulkBatchPushesOntoDatabase()
 
         $queue->bulk(['foo', 'bar'], ['data'], 'queue');
     }
+
+    public function testBuildDatabaseRecordWithPayloadAtTheEnd()
+    {
+        $queue = m::mock('Illuminate\Queue\DatabaseQueue');
+        $record = $queue->buildDatabaseRecord('queue','any_payload',0);
+        $this->assertArrayHasKey('payload', $record);
+        $this->assertArrayHasKey('payload', array_slice($record, -1, 1, TRUE));
+    }
 }