From 0e4d05d150050564e952645595d7b930316a77e1 Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Tue, 16 May 2017 18:49:05 +1000
Subject: [PATCH] Add migrations to queue database tables

---
 composer.json                                 |  2 +-
 ...10_01_000021_Db_System_Sessions_Update.php | 31 +++++++++++
 ...10_01_000022_Db_Jobs_FailedJobs_Update.php | 51 +++++++++++++++++++
 3 files changed, 83 insertions(+), 1 deletion(-)
 create mode 100644 modules/system/database/migrations/2017_10_01_000021_Db_System_Sessions_Update.php
 create mode 100644 modules/system/database/migrations/2017_10_01_000022_Db_Jobs_FailedJobs_Update.php

diff --git a/composer.json b/composer.json
index 80dcaca8a..48596c47c 100644
--- a/composer.json
+++ b/composer.json
@@ -36,7 +36,7 @@
     },
     "require-dev": {
         "fzaninotto/faker": "~1.4",
-        "phpunit/phpunit": "~4.0",
+        "phpunit/phpunit": "~5.7",
         "phpunit/phpunit-selenium": "~1.2"
     },
     "autoload-dev": {
diff --git a/modules/system/database/migrations/2017_10_01_000021_Db_System_Sessions_Update.php b/modules/system/database/migrations/2017_10_01_000021_Db_System_Sessions_Update.php
new file mode 100644
index 000000000..b71827696
--- /dev/null
+++ b/modules/system/database/migrations/2017_10_01_000021_Db_System_Sessions_Update.php
@@ -0,0 +1,31 @@
+<?php
+
+use October\Rain\Database\Schema\Blueprint;
+use October\Rain\Database\Updates\Migration;
+
+class DbSystemSessionsUpdate extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('sessions', function (Blueprint $table) {
+            $table->unsignedInteger('user_id')->nullable();
+            $table->string('ip_address', 45)->nullable();
+            $table->text('user_agent')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        // ...
+    }
+}
diff --git a/modules/system/database/migrations/2017_10_01_000022_Db_Jobs_FailedJobs_Update.php b/modules/system/database/migrations/2017_10_01_000022_Db_Jobs_FailedJobs_Update.php
new file mode 100644
index 000000000..0defb3f6e
--- /dev/null
+++ b/modules/system/database/migrations/2017_10_01_000022_Db_Jobs_FailedJobs_Update.php
@@ -0,0 +1,51 @@
+<?php
+
+use October\Rain\Database\Schema\Blueprint;
+use October\Rain\Database\Updates\Migration;
+
+class DbJobsFailedJobsUpdate extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table($this->getTableName(), function (Blueprint $table) {
+            $table->dropColumn('reserved');
+            $table->index(['queue', 'reserved_at']);
+        });
+
+        Schema::table($this->getFailedTableName(), function (Blueprint $table) {
+            $table->longText('exception')->nullable()->after('payload');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table($this->getTableName(), function (Blueprint $table) {
+            $table->tinyInteger('reserved')->unsigned();
+            $table->dropIndex('jobs_queue_reserved_at_index');
+        });
+
+        Schema::table($this->getFailedTableName(), function (Blueprint $table) {
+            $table->dropColumn('exception');
+        });
+    }
+
+    protected function getTableName()
+    {
+        return Config::get('queue.connections.database.table', 'jobs');
+    }
+
+    protected function getFailedTableName()
+    {
+        return Config::get('queue.failed.table', 'failed_jobs');
+    }
+}