From 1a267b8d031e9504835af2ff4e78029bb9db0220 Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Fri, 13 Jan 2017 06:15:59 +1100
Subject: [PATCH] Code clean up from #2562

---
 modules/system/classes/UpdateManager.php            | 13 +++++++++++--
 .../migrations/2014_10_01_000010_Db_Jobs.php        |  9 +++++++--
 .../migrations/2015_10_01_000018_Db_FailedJobs.php  |  9 +++++++--
 .../2016_10_01_000020_Db_System_Timestamp_Fix.php   |  6 ++++--
 4 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/modules/system/classes/UpdateManager.php b/modules/system/classes/UpdateManager.php
index b95e92fac..0f1120687 100644
--- a/modules/system/classes/UpdateManager.php
+++ b/modules/system/classes/UpdateManager.php
@@ -119,7 +119,7 @@ class UpdateManager
      */
     public function update()
     {
-        $firstUp = !Schema::hasTable(Config::get('database.migrations'));
+        $firstUp = !Schema::hasTable($this->getMigrationTableName());
         if ($firstUp) {
             $this->repository->createRepository();
             $this->note('Migration table created');
@@ -337,7 +337,7 @@ class UpdateManager
             }
         }
 
-        Schema::dropIfExists(Config::get('database.migrations'));
+        Schema::dropIfExists($this->getMigrationTableName());
 
         return $this;
     }
@@ -874,4 +874,13 @@ class UpdateManager
     {
         return base64_encode(hash_hmac('sha512', http_build_query($data, '', '&'), base64_decode($secret), true));
     }
+
+    //
+    // Internals
+    //
+
+    protected function getMigrationTableName()
+    {
+        return Config::get('database.migrations', 'migrations');
+    }
 }
diff --git a/modules/system/database/migrations/2014_10_01_000010_Db_Jobs.php b/modules/system/database/migrations/2014_10_01_000010_Db_Jobs.php
index 681f61092..c04fcc96f 100644
--- a/modules/system/database/migrations/2014_10_01_000010_Db_Jobs.php
+++ b/modules/system/database/migrations/2014_10_01_000010_Db_Jobs.php
@@ -7,7 +7,7 @@ class DbJobs extends Migration
 {
     public function up()
     {
-        Schema::create(Config::get('queue.connections.database.table'), function (Blueprint $table) {
+        Schema::create($this->getTableName(), function (Blueprint $table) {
             $table->engine = 'InnoDB';
             $table->bigIncrements('id');
             $table->string('queue');
@@ -22,6 +22,11 @@ class DbJobs extends Migration
 
     public function down()
     {
-        Schema::dropIfExists(Config::get('queue.connections.database.table'));
+        Schema::dropIfExists($this->getTableName());
+    }
+
+    protected function getTableName()
+    {
+        return Config::get('queue.connections.database.table', 'jobs');
     }
 }
diff --git a/modules/system/database/migrations/2015_10_01_000018_Db_FailedJobs.php b/modules/system/database/migrations/2015_10_01_000018_Db_FailedJobs.php
index 6c7887251..ec9012d39 100644
--- a/modules/system/database/migrations/2015_10_01_000018_Db_FailedJobs.php
+++ b/modules/system/database/migrations/2015_10_01_000018_Db_FailedJobs.php
@@ -7,7 +7,7 @@ class DbFailedJobs extends Migration
 {
     public function up()
     {
-        Schema::create(Config::get('queue.failed.table'), function (Blueprint $table) {
+        Schema::create($this->getTableName(), function (Blueprint $table) {
             $table->engine = 'InnoDB';
             $table->increments('id');
             $table->text('connection');
@@ -19,6 +19,11 @@ class DbFailedJobs extends Migration
 
     public function down()
     {
-        Schema::dropIfExists(Config::get('queue.failed.table'));
+        Schema::dropIfExists($this->getTableName());
+    }
+
+    protected function getTableName()
+    {
+        return Config::get('queue.failed.table', 'failed_jobs');
     }
 }
diff --git a/modules/system/database/migrations/2016_10_01_000020_Db_System_Timestamp_Fix.php b/modules/system/database/migrations/2016_10_01_000020_Db_System_Timestamp_Fix.php
index 794182f25..c1ce81107 100644
--- a/modules/system/database/migrations/2016_10_01_000020_Db_System_Timestamp_Fix.php
+++ b/modules/system/database/migrations/2016_10_01_000020_Db_System_Timestamp_Fix.php
@@ -29,11 +29,13 @@ class DbSystemTimestampFix extends Migration
         // ...
     }
 
-    private function getCoreTables()
+    protected function getCoreTables()
     {
+        $failedJobsTable = Config::get('queue.failed.table', 'failed_jobs');
+
         return [
             'deferred_bindings',
-            Config::get('queue.failed.table') => 'failed_at',
+            $failedJobsTable => 'failed_at',
             'system_files',
             'system_event_logs',
             'system_mail_layouts',