TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Code clean up from #2562

This commit is contained in:
Samuel Georges 2017-01-13 06:15:59 +11:00
parent 17d0d5dc6b
commit 1a267b8d03
4 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
modules/system/classes/UpdateManager.php
View File

@ -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');
}
}

9
modules/system/database/migrations/2014_10_01_000010_Db_Jobs.php
View File

@ -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');
}
}

9
modules/system/database/migrations/2015_10_01_000018_Db_FailedJobs.php
View File

@ -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');
}
}

6
modules/system/database/migrations/2016_10_01_000020_Db_System_Timestamp_Fix.php
View File

@ -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',