From 04161678b6b69d2f157de641f18cb0d0e122df32 Mon Sep 17 00:00:00 2001 From: Chase Coney Date: Tue, 30 Jun 2015 09:53:29 -0500 Subject: [PATCH 1/2] Fixes 768. php artisan migrate will work regardless of mysql version or default_database_engine. --- .../migrations/2015_01_05_201324_CreateComponentGroupsTable.php | 2 ++ database/migrations/2015_01_05_201444_CreateComponentsTable.php | 2 ++ .../2015_01_05_202446_CreateIncidentTemplatesTable.php | 2 ++ database/migrations/2015_01_05_202609_CreateIncidentsTable.php | 2 ++ .../migrations/2015_01_05_202730_CreateMetricPointsTable.php | 2 ++ database/migrations/2015_01_05_202826_CreateMetricsTable.php | 2 ++ database/migrations/2015_01_05_203014_CreateSettingsTable.php | 2 ++ .../migrations/2015_01_05_203235_CreateSubscribersTable.php | 2 ++ database/migrations/2015_01_05_203341_CreateUsersTable.php | 2 ++ database/migrations/2015_01_16_083825_CreateTagsTable.php | 2 ++ .../migrations/2015_01_16_084030_CreateComponentTagTable.php | 2 ++ database/migrations/2015_05_24_210939_create_jobs_table.php | 2 ++ .../migrations/2015_05_24_210948_create_failed_jobs_table.php | 2 ++ 13 files changed, 26 insertions(+) diff --git a/database/migrations/2015_01_05_201324_CreateComponentGroupsTable.php b/database/migrations/2015_01_05_201324_CreateComponentGroupsTable.php index 1f6daf83..8c45bc96 100644 --- a/database/migrations/2015_01_05_201324_CreateComponentGroupsTable.php +++ b/database/migrations/2015_01_05_201324_CreateComponentGroupsTable.php @@ -21,6 +21,8 @@ class CreateComponentGroupsTable extends Migration public function up() { Schema::create('component_groups', function (Blueprint $table) { + $table->engine = 'InnoDB'; + $table->increments('id'); $table->string('name'); $table->timestamps(); diff --git a/database/migrations/2015_01_05_201444_CreateComponentsTable.php b/database/migrations/2015_01_05_201444_CreateComponentsTable.php index a8737f7c..eeb8f692 100644 --- a/database/migrations/2015_01_05_201444_CreateComponentsTable.php +++ b/database/migrations/2015_01_05_201444_CreateComponentsTable.php @@ -21,6 +21,8 @@ class CreateComponentsTable extends Migration public function up() { Schema::create('components', function (Blueprint $table) { + $table->engine = 'InnoDB'; + $table->increments('id'); $table->string('name'); $table->text('description'); diff --git a/database/migrations/2015_01_05_202446_CreateIncidentTemplatesTable.php b/database/migrations/2015_01_05_202446_CreateIncidentTemplatesTable.php index 7ad0e57e..8d6efd03 100644 --- a/database/migrations/2015_01_05_202446_CreateIncidentTemplatesTable.php +++ b/database/migrations/2015_01_05_202446_CreateIncidentTemplatesTable.php @@ -21,6 +21,8 @@ class CreateIncidentTemplatesTable extends Migration public function up() { Schema::create('incident_templates', function (Blueprint $table) { + $table->engine = 'InnoDB'; + $table->increments('id'); $table->string('name'); $table->string('slug'); diff --git a/database/migrations/2015_01_05_202609_CreateIncidentsTable.php b/database/migrations/2015_01_05_202609_CreateIncidentsTable.php index 826fb694..5633a557 100644 --- a/database/migrations/2015_01_05_202609_CreateIncidentsTable.php +++ b/database/migrations/2015_01_05_202609_CreateIncidentsTable.php @@ -21,6 +21,8 @@ class CreateIncidentsTable extends Migration public function up() { Schema::create('incidents', function (Blueprint $table) { + $table->engine = 'InnoDB'; + $table->increments('id'); $table->integer('component_id')->default(0); $table->string('name'); diff --git a/database/migrations/2015_01_05_202730_CreateMetricPointsTable.php b/database/migrations/2015_01_05_202730_CreateMetricPointsTable.php index da001e1c..db0736c1 100644 --- a/database/migrations/2015_01_05_202730_CreateMetricPointsTable.php +++ b/database/migrations/2015_01_05_202730_CreateMetricPointsTable.php @@ -21,6 +21,8 @@ class CreateMetricPointsTable extends Migration public function up() { Schema::create('metric_points', function (Blueprint $table) { + $table->engine = 'InnoDB'; + $table->increments('id'); $table->integer('metric_id'); $table->decimal('value', 10, 3); diff --git a/database/migrations/2015_01_05_202826_CreateMetricsTable.php b/database/migrations/2015_01_05_202826_CreateMetricsTable.php index 0e3355b6..852bc2fb 100644 --- a/database/migrations/2015_01_05_202826_CreateMetricsTable.php +++ b/database/migrations/2015_01_05_202826_CreateMetricsTable.php @@ -21,6 +21,8 @@ class CreateMetricsTable extends Migration public function up() { Schema::create('metrics', function (Blueprint $table) { + $table->engine = 'InnoDB'; + $table->increments('id'); $table->string('name'); $table->string('suffix'); diff --git a/database/migrations/2015_01_05_203014_CreateSettingsTable.php b/database/migrations/2015_01_05_203014_CreateSettingsTable.php index 49895179..d84e1329 100644 --- a/database/migrations/2015_01_05_203014_CreateSettingsTable.php +++ b/database/migrations/2015_01_05_203014_CreateSettingsTable.php @@ -21,6 +21,8 @@ class CreateSettingsTable extends Migration public function up() { Schema::create('settings', function (Blueprint $table) { + $table->engine = 'InnoDB'; + $table->increments('id'); $table->string('name'); $table->longText('value'); diff --git a/database/migrations/2015_01_05_203235_CreateSubscribersTable.php b/database/migrations/2015_01_05_203235_CreateSubscribersTable.php index 4827529f..6a4736fe 100644 --- a/database/migrations/2015_01_05_203235_CreateSubscribersTable.php +++ b/database/migrations/2015_01_05_203235_CreateSubscribersTable.php @@ -21,6 +21,8 @@ class CreateSubscribersTable extends Migration public function up() { Schema::create('subscribers', function (Blueprint $table) { + $table->engine = 'InnoDB'; + $table->increments('id'); $table->string('email'); $table->string('verify_code'); diff --git a/database/migrations/2015_01_05_203341_CreateUsersTable.php b/database/migrations/2015_01_05_203341_CreateUsersTable.php index dd97f94f..e0803ce5 100644 --- a/database/migrations/2015_01_05_203341_CreateUsersTable.php +++ b/database/migrations/2015_01_05_203341_CreateUsersTable.php @@ -21,6 +21,8 @@ class CreateUsersTable extends Migration public function up() { Schema::create('users', function (Blueprint $table) { + $table->engine = 'InnoDB'; + $table->increments('id'); $table->string('username'); $table->string('password'); diff --git a/database/migrations/2015_01_16_083825_CreateTagsTable.php b/database/migrations/2015_01_16_083825_CreateTagsTable.php index 4a94f39f..9d951cc2 100644 --- a/database/migrations/2015_01_16_083825_CreateTagsTable.php +++ b/database/migrations/2015_01_16_083825_CreateTagsTable.php @@ -21,6 +21,8 @@ class CreateTagsTable extends Migration public function up() { Schema::create('tags', function (Blueprint $table) { + $table->engine = 'InnoDB'; + $table->increments('id'); $table->string('name'); $table->string('slug'); diff --git a/database/migrations/2015_01_16_084030_CreateComponentTagTable.php b/database/migrations/2015_01_16_084030_CreateComponentTagTable.php index eff429e3..7eee33af 100644 --- a/database/migrations/2015_01_16_084030_CreateComponentTagTable.php +++ b/database/migrations/2015_01_16_084030_CreateComponentTagTable.php @@ -21,6 +21,8 @@ class CreateComponentTagTable extends Migration public function up() { Schema::create('component_tag', function (Blueprint $table) { + $table->engine = 'InnoDB'; + $table->increments('id'); $table->integer('component_id'); $table->integer('tag_id'); diff --git a/database/migrations/2015_05_24_210939_create_jobs_table.php b/database/migrations/2015_05_24_210939_create_jobs_table.php index 1efeeb5d..368d6215 100644 --- a/database/migrations/2015_05_24_210939_create_jobs_table.php +++ b/database/migrations/2015_05_24_210939_create_jobs_table.php @@ -20,6 +20,8 @@ class CreateJobsTable extends Migration public function up() { Schema::create('jobs', function (Blueprint $table) { + $table->engine = 'InnoDB'; + $table->bigIncrements('id'); $table->string('queue'); $table->text('payload'); diff --git a/database/migrations/2015_05_24_210948_create_failed_jobs_table.php b/database/migrations/2015_05_24_210948_create_failed_jobs_table.php index 15447f83..8632c822 100644 --- a/database/migrations/2015_05_24_210948_create_failed_jobs_table.php +++ b/database/migrations/2015_05_24_210948_create_failed_jobs_table.php @@ -20,6 +20,8 @@ class CreateFailedJobsTable extends Migration public function up() { Schema::create('failed_jobs', function (Blueprint $table) { + $table->engine = 'InnoDB'; + $table->increments('id'); $table->text('connection'); $table->text('queue'); From 977cac091c543f2e5f64e5c1a59e0fc8685c7031 Mon Sep 17 00:00:00 2001 From: Chase Coney Date: Tue, 30 Jun 2015 11:35:34 -0500 Subject: [PATCH 2/2] Fix spacing issue. --- .../migrations/2015_01_05_201324_CreateComponentGroupsTable.php | 2 +- database/migrations/2015_01_05_201444_CreateComponentsTable.php | 2 +- .../2015_01_05_202446_CreateIncidentTemplatesTable.php | 2 +- database/migrations/2015_01_05_202609_CreateIncidentsTable.php | 2 +- .../migrations/2015_01_05_202730_CreateMetricPointsTable.php | 2 +- database/migrations/2015_01_05_202826_CreateMetricsTable.php | 2 +- database/migrations/2015_01_05_203014_CreateSettingsTable.php | 2 +- .../migrations/2015_01_05_203235_CreateSubscribersTable.php | 2 +- database/migrations/2015_01_05_203341_CreateUsersTable.php | 2 +- database/migrations/2015_01_16_083825_CreateTagsTable.php | 2 +- .../migrations/2015_01_16_084030_CreateComponentTagTable.php | 2 +- database/migrations/2015_05_24_210939_create_jobs_table.php | 2 +- .../migrations/2015_05_24_210948_create_failed_jobs_table.php | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/database/migrations/2015_01_05_201324_CreateComponentGroupsTable.php b/database/migrations/2015_01_05_201324_CreateComponentGroupsTable.php index 8c45bc96..70c44cab 100644 --- a/database/migrations/2015_01_05_201324_CreateComponentGroupsTable.php +++ b/database/migrations/2015_01_05_201324_CreateComponentGroupsTable.php @@ -22,7 +22,7 @@ class CreateComponentGroupsTable extends Migration { Schema::create('component_groups', function (Blueprint $table) { $table->engine = 'InnoDB'; - + $table->increments('id'); $table->string('name'); $table->timestamps(); diff --git a/database/migrations/2015_01_05_201444_CreateComponentsTable.php b/database/migrations/2015_01_05_201444_CreateComponentsTable.php index eeb8f692..f3d5cbea 100644 --- a/database/migrations/2015_01_05_201444_CreateComponentsTable.php +++ b/database/migrations/2015_01_05_201444_CreateComponentsTable.php @@ -22,7 +22,7 @@ class CreateComponentsTable extends Migration { Schema::create('components', function (Blueprint $table) { $table->engine = 'InnoDB'; - + $table->increments('id'); $table->string('name'); $table->text('description'); diff --git a/database/migrations/2015_01_05_202446_CreateIncidentTemplatesTable.php b/database/migrations/2015_01_05_202446_CreateIncidentTemplatesTable.php index 8d6efd03..3858c7a2 100644 --- a/database/migrations/2015_01_05_202446_CreateIncidentTemplatesTable.php +++ b/database/migrations/2015_01_05_202446_CreateIncidentTemplatesTable.php @@ -22,7 +22,7 @@ class CreateIncidentTemplatesTable extends Migration { Schema::create('incident_templates', function (Blueprint $table) { $table->engine = 'InnoDB'; - + $table->increments('id'); $table->string('name'); $table->string('slug'); diff --git a/database/migrations/2015_01_05_202609_CreateIncidentsTable.php b/database/migrations/2015_01_05_202609_CreateIncidentsTable.php index 5633a557..a7910be2 100644 --- a/database/migrations/2015_01_05_202609_CreateIncidentsTable.php +++ b/database/migrations/2015_01_05_202609_CreateIncidentsTable.php @@ -22,7 +22,7 @@ class CreateIncidentsTable extends Migration { Schema::create('incidents', function (Blueprint $table) { $table->engine = 'InnoDB'; - + $table->increments('id'); $table->integer('component_id')->default(0); $table->string('name'); diff --git a/database/migrations/2015_01_05_202730_CreateMetricPointsTable.php b/database/migrations/2015_01_05_202730_CreateMetricPointsTable.php index db0736c1..90c5bc9d 100644 --- a/database/migrations/2015_01_05_202730_CreateMetricPointsTable.php +++ b/database/migrations/2015_01_05_202730_CreateMetricPointsTable.php @@ -22,7 +22,7 @@ class CreateMetricPointsTable extends Migration { Schema::create('metric_points', function (Blueprint $table) { $table->engine = 'InnoDB'; - + $table->increments('id'); $table->integer('metric_id'); $table->decimal('value', 10, 3); diff --git a/database/migrations/2015_01_05_202826_CreateMetricsTable.php b/database/migrations/2015_01_05_202826_CreateMetricsTable.php index 852bc2fb..ab66a25d 100644 --- a/database/migrations/2015_01_05_202826_CreateMetricsTable.php +++ b/database/migrations/2015_01_05_202826_CreateMetricsTable.php @@ -22,7 +22,7 @@ class CreateMetricsTable extends Migration { Schema::create('metrics', function (Blueprint $table) { $table->engine = 'InnoDB'; - + $table->increments('id'); $table->string('name'); $table->string('suffix'); diff --git a/database/migrations/2015_01_05_203014_CreateSettingsTable.php b/database/migrations/2015_01_05_203014_CreateSettingsTable.php index d84e1329..003b855e 100644 --- a/database/migrations/2015_01_05_203014_CreateSettingsTable.php +++ b/database/migrations/2015_01_05_203014_CreateSettingsTable.php @@ -22,7 +22,7 @@ class CreateSettingsTable extends Migration { Schema::create('settings', function (Blueprint $table) { $table->engine = 'InnoDB'; - + $table->increments('id'); $table->string('name'); $table->longText('value'); diff --git a/database/migrations/2015_01_05_203235_CreateSubscribersTable.php b/database/migrations/2015_01_05_203235_CreateSubscribersTable.php index 6a4736fe..445d4712 100644 --- a/database/migrations/2015_01_05_203235_CreateSubscribersTable.php +++ b/database/migrations/2015_01_05_203235_CreateSubscribersTable.php @@ -22,7 +22,7 @@ class CreateSubscribersTable extends Migration { Schema::create('subscribers', function (Blueprint $table) { $table->engine = 'InnoDB'; - + $table->increments('id'); $table->string('email'); $table->string('verify_code'); diff --git a/database/migrations/2015_01_05_203341_CreateUsersTable.php b/database/migrations/2015_01_05_203341_CreateUsersTable.php index e0803ce5..d236e368 100644 --- a/database/migrations/2015_01_05_203341_CreateUsersTable.php +++ b/database/migrations/2015_01_05_203341_CreateUsersTable.php @@ -22,7 +22,7 @@ class CreateUsersTable extends Migration { Schema::create('users', function (Blueprint $table) { $table->engine = 'InnoDB'; - + $table->increments('id'); $table->string('username'); $table->string('password'); diff --git a/database/migrations/2015_01_16_083825_CreateTagsTable.php b/database/migrations/2015_01_16_083825_CreateTagsTable.php index 9d951cc2..cebc72ad 100644 --- a/database/migrations/2015_01_16_083825_CreateTagsTable.php +++ b/database/migrations/2015_01_16_083825_CreateTagsTable.php @@ -22,7 +22,7 @@ class CreateTagsTable extends Migration { Schema::create('tags', function (Blueprint $table) { $table->engine = 'InnoDB'; - + $table->increments('id'); $table->string('name'); $table->string('slug'); diff --git a/database/migrations/2015_01_16_084030_CreateComponentTagTable.php b/database/migrations/2015_01_16_084030_CreateComponentTagTable.php index 7eee33af..47f2068b 100644 --- a/database/migrations/2015_01_16_084030_CreateComponentTagTable.php +++ b/database/migrations/2015_01_16_084030_CreateComponentTagTable.php @@ -22,7 +22,7 @@ class CreateComponentTagTable extends Migration { Schema::create('component_tag', function (Blueprint $table) { $table->engine = 'InnoDB'; - + $table->increments('id'); $table->integer('component_id'); $table->integer('tag_id'); diff --git a/database/migrations/2015_05_24_210939_create_jobs_table.php b/database/migrations/2015_05_24_210939_create_jobs_table.php index 368d6215..ea62b29e 100644 --- a/database/migrations/2015_05_24_210939_create_jobs_table.php +++ b/database/migrations/2015_05_24_210939_create_jobs_table.php @@ -21,7 +21,7 @@ class CreateJobsTable extends Migration { Schema::create('jobs', function (Blueprint $table) { $table->engine = 'InnoDB'; - + $table->bigIncrements('id'); $table->string('queue'); $table->text('payload'); diff --git a/database/migrations/2015_05_24_210948_create_failed_jobs_table.php b/database/migrations/2015_05_24_210948_create_failed_jobs_table.php index 8632c822..56d3efa8 100644 --- a/database/migrations/2015_05_24_210948_create_failed_jobs_table.php +++ b/database/migrations/2015_05_24_210948_create_failed_jobs_table.php @@ -21,7 +21,7 @@ class CreateFailedJobsTable extends Migration { Schema::create('failed_jobs', function (Blueprint $table) { $table->engine = 'InnoDB'; - + $table->increments('id'); $table->text('connection'); $table->text('queue');