From 1511f75a805f395309ea5e00bf1bf418221153ed Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 22 Jun 2015 22:04:46 +0200 Subject: [PATCH] Fixed tests. Broke database. --- ...4_06_27_163818_create_piggybanks_table.php | 3 - ...14_08_23_113221_create_reminders_table.php | 50 --------------- ...135749_create_transaction_groups_table.php | 2 +- .../2015_02_27_210653_changes_for_v332.php | 9 --- .../2015_03_29_174140_changes_for_v336.php | 11 ---- .../2015_04_26_054507_changes_for_v3310.php | 2 +- .../2015_06_22_192411_changes_for_v3451.php | 62 ------------------- 7 files changed, 2 insertions(+), 137 deletions(-) delete mode 100644 database/migrations/2014_08_23_113221_create_reminders_table.php delete mode 100644 database/migrations/2015_06_22_192411_changes_for_v3451.php diff --git a/database/migrations/2014_06_27_163818_create_piggybanks_table.php b/database/migrations/2014_06_27_163818_create_piggybanks_table.php index 827c5f4c48..d15420d9c4 100644 --- a/database/migrations/2014_06_27_163818_create_piggybanks_table.php +++ b/database/migrations/2014_06_27_163818_create_piggybanks_table.php @@ -42,9 +42,6 @@ class CreatePiggybanksTable extends Migration $table->enum('rep_length', ['day', 'week', 'quarter', 'month', 'year'])->nullable(); $table->smallInteger('rep_every')->unsigned(); $table->smallInteger('rep_times')->unsigned()->nullable(); - $table->enum('reminder', ['day', 'week', 'quarter', 'month', 'year'])->nullable(); - $table->smallInteger('reminder_skip')->unsigned(); - $table->boolean('remind_me'); $table->integer('order')->unsigned(); // connect account to piggy bank. diff --git a/database/migrations/2014_08_23_113221_create_reminders_table.php b/database/migrations/2014_08_23_113221_create_reminders_table.php deleted file mode 100644 index aaecf27eb6..0000000000 --- a/database/migrations/2014_08_23_113221_create_reminders_table.php +++ /dev/null @@ -1,50 +0,0 @@ -increments('id'); - $table->timestamps(); - $table->integer('user_id')->unsigned(); - $table->date('startdate'); - $table->date('enddate')->nullable(); - $table->boolean('active'); - $table->boolean('notnow')->default(0); - $table->integer('remindersable_id')->unsigned()->nullable(); - $table->string('remindersable_type')->nullable(); - - // connect reminders to users - $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade'); - } - ); - } - -} diff --git a/database/migrations/2014_11_29_135749_create_transaction_groups_table.php b/database/migrations/2014_11_29_135749_create_transaction_groups_table.php index db68b79146..019c0879e6 100644 --- a/database/migrations/2014_11_29_135749_create_transaction_groups_table.php +++ b/database/migrations/2014_11_29_135749_create_transaction_groups_table.php @@ -37,7 +37,7 @@ class CreateTransactionGroupsTable extends Migration $table->integer('user_id')->unsigned(); $table->enum('relation', ['balance']); - // connect reminders to users + // connect groups to users $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade'); } ); diff --git a/database/migrations/2015_02_27_210653_changes_for_v332.php b/database/migrations/2015_02_27_210653_changes_for_v332.php index 379b50a0c6..62caa2e67a 100644 --- a/database/migrations/2015_02_27_210653_changes_for_v332.php +++ b/database/migrations/2015_02_27_210653_changes_for_v332.php @@ -35,15 +35,6 @@ class ChangesForV332 extends Migration } ); - - Schema::table( - 'reminders', function (Blueprint $table) { - $table->text('metadata')->nullable(); - - } - ); - - } } diff --git a/database/migrations/2015_03_29_174140_changes_for_v336.php b/database/migrations/2015_03_29_174140_changes_for_v336.php index acaf6a384e..28352d4a8b 100644 --- a/database/migrations/2015_03_29_174140_changes_for_v336.php +++ b/database/migrations/2015_03_29_174140_changes_for_v336.php @@ -226,17 +226,6 @@ class ChangesForV336 extends Migration } ); - /** - * REMINDERS - */ - Schema::table( - 'reminders', function (Blueprint $table) { - $table->smallInteger('encrypted', false, true)->default(0); - - - } - ); - } } diff --git a/database/migrations/2015_04_26_054507_changes_for_v3310.php b/database/migrations/2015_04_26_054507_changes_for_v3310.php index 94c777ed1b..3598736a21 100644 --- a/database/migrations/2015_04_26_054507_changes_for_v3310.php +++ b/database/migrations/2015_04_26_054507_changes_for_v3310.php @@ -57,7 +57,7 @@ class ChangesForV3310 extends Migration $table->decimal('longitude', 18, 12)->nullable(); $table->smallInteger('zoomLevel', false, true)->nullable(); - // connect reminders to users + // connect tags to users $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade'); } ); diff --git a/database/migrations/2015_06_22_192411_changes_for_v3451.php b/database/migrations/2015_06_22_192411_changes_for_v3451.php deleted file mode 100644 index 8d23a373a2..0000000000 --- a/database/migrations/2015_06_22_192411_changes_for_v3451.php +++ /dev/null @@ -1,62 +0,0 @@ -increments('id'); - $table->timestamps(); - $table->integer('user_id')->unsigned(); - $table->date('startdate'); - $table->date('enddate')->nullable(); - $table->boolean('active'); - $table->boolean('notnow')->default(0); - $table->integer('remindersable_id')->unsigned()->nullable(); - $table->string('remindersable_type')->nullable(); - - // connect reminders to users - $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade'); - } - ); - - - Schema::table( - 'piggy_banks', function (Blueprint $table) { - //$table->smallInteger('reminder_skip')->unsigned(); - //$table->boolean('remind_me'); - $table->enum('reminder', ['day', 'week', 'quarter', 'month', 'year'])->nullable(); - } - ); - - } - - /** - * Run the migrations. - * - * @return void - */ - public function up() - { - Schema::table( - 'piggy_banks', function (Blueprint $table) { - //$table->dropColumn('reminder_skip'); - //$table->dropColumn('remind_me'); - $table->dropColumn('reminder'); - } - ); - Schema::drop('reminders'); - } -}