From 94cebe8d0d81da56fad66a08012c83c805717c53 Mon Sep 17 00:00:00 2001 From: "Aaron C. de Bruyn" Date: Wed, 24 Dec 2014 13:00:34 -0800 Subject: [PATCH 1/5] Remove incompatible backticks from migration. Closes GH-90 --- ...12_13_121410_AlterTableIncidentsRemoveDefaultComponent.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/database/migrations/2014_12_13_121410_AlterTableIncidentsRemoveDefaultComponent.php b/app/database/migrations/2014_12_13_121410_AlterTableIncidentsRemoveDefaultComponent.php index 87fbb64b..cbf60714 100644 --- a/app/database/migrations/2014_12_13_121410_AlterTableIncidentsRemoveDefaultComponent.php +++ b/app/database/migrations/2014_12_13_121410_AlterTableIncidentsRemoveDefaultComponent.php @@ -14,7 +14,7 @@ class AlterTableIncidentsRemoveDefaultComponent extends Migration public function up() { Schema::table('incidents', function (Blueprint $table) { - DB::statement("ALTER TABLE `incidents` CHANGE `component_id` `component_id` TINYINT(4) NOT NULL DEFAULT '0';"); + DB::statement("ALTER TABLE incidents CHANGE component_id component_id TINYINT(4) NOT NULL DEFAULT '0';"); }); } @@ -26,7 +26,7 @@ class AlterTableIncidentsRemoveDefaultComponent extends Migration public function down() { Schema::table('incidents', function (Blueprint $table) { - DB::statement("ALTER TABLE `incidents` CHANGE `component_id` `component_id` TINYINT(4) NOT NULL DEFAULT '1';"); + DB::statement("ALTER TABLE incidents CHANGE component_id component_id TINYINT(4) NOT NULL DEFAULT '1';"); }); } } From f81e54e49301b41e5feb1f34fe6447ec4ac9530c Mon Sep 17 00:00:00 2001 From: "Aaron C. de Bruyn" Date: Wed, 24 Dec 2014 14:31:39 -0800 Subject: [PATCH 2/5] fix rename -> renameColumn introduced in 072f5885a --- ..._12_01_121947_AlterTableIncidentsRenameComponentColumn.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/database/migrations/2014_12_01_121947_AlterTableIncidentsRenameComponentColumn.php b/app/database/migrations/2014_12_01_121947_AlterTableIncidentsRenameComponentColumn.php index 1142f2c3..63c97378 100644 --- a/app/database/migrations/2014_12_01_121947_AlterTableIncidentsRenameComponentColumn.php +++ b/app/database/migrations/2014_12_01_121947_AlterTableIncidentsRenameComponentColumn.php @@ -14,7 +14,7 @@ class AlterTableIncidentsRenameComponentColumn extends Migration public function up() { Schema::table('incidents', function (Blueprint $table) { - $table->rename('component', 'component_id'); + $table->renameColumn('component', 'component_id'); }); } @@ -26,7 +26,7 @@ class AlterTableIncidentsRenameComponentColumn extends Migration public function down() { Schema::table('incidents', function (Blueprint $table) { - $table->rename('component_id', 'component'); + $table->renameColumn('component_id', 'component'); }); } } From 593cb915ffc1948d9e05386f6e7678b0da9d8e38 Mon Sep 17 00:00:00 2001 From: "Aaron C. de Bruyn" Date: Wed, 24 Dec 2014 14:31:54 -0800 Subject: [PATCH 3/5] Account for differences between mysql and postgresql. Closes GH-89 --- ..._AlterTableIncidentsRemoveDefaultComponent.php | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/app/database/migrations/2014_12_13_121410_AlterTableIncidentsRemoveDefaultComponent.php b/app/database/migrations/2014_12_13_121410_AlterTableIncidentsRemoveDefaultComponent.php index cbf60714..6f49f1e8 100644 --- a/app/database/migrations/2014_12_13_121410_AlterTableIncidentsRemoveDefaultComponent.php +++ b/app/database/migrations/2014_12_13_121410_AlterTableIncidentsRemoveDefaultComponent.php @@ -14,7 +14,11 @@ class AlterTableIncidentsRemoveDefaultComponent extends Migration public function up() { Schema::table('incidents', function (Blueprint $table) { - DB::statement("ALTER TABLE incidents CHANGE component_id component_id TINYINT(4) NOT NULL DEFAULT '0';"); + if (Config::get('database')['default'] === 'mysql'){ + DB::statement("ALTER TABLE incidents CHANGE component_id component_id TINYINT(4) NOT NULL DEFAULT '0';"); + } else if (Config::get('database')['default'] === 'pgsql'){ + DB::statement("ALTER TABLE incidents ALTER COLUMN component_id SET DEFAULT '0';"); + } }); } @@ -22,11 +26,16 @@ class AlterTableIncidentsRemoveDefaultComponent extends Migration * Reverse the migrations. * * @return void - */ + */ public function down() { Schema::table('incidents', function (Blueprint $table) { - DB::statement("ALTER TABLE incidents CHANGE component_id component_id TINYINT(4) NOT NULL DEFAULT '1';"); + if (Config::get('database')['default'] === 'mysql'){ + DB::statement("ALTER TABLE incidents CHANGE component_id component_id TINYINT(4) NOT NULL DEFAULT '1';"); + } else if (Config::get('database')['default'] === 'pgsql'){ + DB::statement("ALTER TABLE incidents ALTER COLUMN component_id SET DEFAULT '1';"); + } }); } } + From 8d67cfad8ee40cf09c0d2c5b8226dd9336ca6a60 Mon Sep 17 00:00:00 2001 From: "Aaron C. de Bruyn" Date: Wed, 24 Dec 2014 14:56:32 -0800 Subject: [PATCH 4/5] Style cleanup --- ...3_121410_AlterTableIncidentsRemoveDefaultComponent.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/database/migrations/2014_12_13_121410_AlterTableIncidentsRemoveDefaultComponent.php b/app/database/migrations/2014_12_13_121410_AlterTableIncidentsRemoveDefaultComponent.php index 6f49f1e8..1c9773f2 100644 --- a/app/database/migrations/2014_12_13_121410_AlterTableIncidentsRemoveDefaultComponent.php +++ b/app/database/migrations/2014_12_13_121410_AlterTableIncidentsRemoveDefaultComponent.php @@ -14,9 +14,9 @@ class AlterTableIncidentsRemoveDefaultComponent extends Migration public function up() { Schema::table('incidents', function (Blueprint $table) { - if (Config::get('database')['default'] === 'mysql'){ + if (Config::get('database')['default'] === 'mysql') { DB::statement("ALTER TABLE incidents CHANGE component_id component_id TINYINT(4) NOT NULL DEFAULT '0';"); - } else if (Config::get('database')['default'] === 'pgsql'){ + } else if (Config::get('database')['default'] === 'pgsql') { DB::statement("ALTER TABLE incidents ALTER COLUMN component_id SET DEFAULT '0';"); } }); @@ -30,9 +30,9 @@ class AlterTableIncidentsRemoveDefaultComponent extends Migration public function down() { Schema::table('incidents', function (Blueprint $table) { - if (Config::get('database')['default'] === 'mysql'){ + if (Config::get('database')['default'] === 'mysql') { DB::statement("ALTER TABLE incidents CHANGE component_id component_id TINYINT(4) NOT NULL DEFAULT '1';"); - } else if (Config::get('database')['default'] === 'pgsql'){ + } else if (Config::get('database')['default'] === 'pgsql') { DB::statement("ALTER TABLE incidents ALTER COLUMN component_id SET DEFAULT '1';"); } }); From 4b5cc5a4a130f2eb3a8f75b07c39d5832a6033ae Mon Sep 17 00:00:00 2001 From: "Aaron C. de Bruyn" Date: Wed, 24 Dec 2014 17:02:51 -0800 Subject: [PATCH 5/5] More style fixes --- ...12_13_121410_AlterTableIncidentsRemoveDefaultComponent.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/database/migrations/2014_12_13_121410_AlterTableIncidentsRemoveDefaultComponent.php b/app/database/migrations/2014_12_13_121410_AlterTableIncidentsRemoveDefaultComponent.php index 1c9773f2..2f8dc9f4 100644 --- a/app/database/migrations/2014_12_13_121410_AlterTableIncidentsRemoveDefaultComponent.php +++ b/app/database/migrations/2014_12_13_121410_AlterTableIncidentsRemoveDefaultComponent.php @@ -16,7 +16,7 @@ class AlterTableIncidentsRemoveDefaultComponent extends Migration Schema::table('incidents', function (Blueprint $table) { if (Config::get('database')['default'] === 'mysql') { DB::statement("ALTER TABLE incidents CHANGE component_id component_id TINYINT(4) NOT NULL DEFAULT '0';"); - } else if (Config::get('database')['default'] === 'pgsql') { + } elseif (Config::get('database')['default'] === 'pgsql') { DB::statement("ALTER TABLE incidents ALTER COLUMN component_id SET DEFAULT '0';"); } }); @@ -32,7 +32,7 @@ class AlterTableIncidentsRemoveDefaultComponent extends Migration Schema::table('incidents', function (Blueprint $table) { if (Config::get('database')['default'] === 'mysql') { DB::statement("ALTER TABLE incidents CHANGE component_id component_id TINYINT(4) NOT NULL DEFAULT '1';"); - } else if (Config::get('database')['default'] === 'pgsql') { + } elseif (Config::get('database')['default'] === 'pgsql') { DB::statement("ALTER TABLE incidents ALTER COLUMN component_id SET DEFAULT '1';"); } });