From c2e5907dfe7eff0614f2f41fa1ae663eef6bc6bf Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Sat, 13 Aug 2016 22:21:44 +0300 Subject: [PATCH] Fix problem updating --- .../2016_04_18_174135_add_page_size.php | 17 ++++++++--------- .../2016_04_23_182223_payments_changes.php | 2 +- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/database/migrations/2016_04_18_174135_add_page_size.php b/database/migrations/2016_04_18_174135_add_page_size.php index 0094c84335b5..7bd9c895a5f3 100644 --- a/database/migrations/2016_04_18_174135_add_page_size.php +++ b/database/migrations/2016_04_18_174135_add_page_size.php @@ -17,16 +17,16 @@ class AddPageSize extends Migration $table->boolean('live_preview')->default(true); $table->smallInteger('invoice_number_padding')->default(4); }); - + Schema::table('fonts', function ($table) { $table->dropColumn('is_early_access'); }); - + Schema::create('expense_categories', function($table) { $table->increments('id'); $table->unsignedInteger('user_id'); - $table->unsignedInteger('account_id')->index(); + $table->unsignedInteger('account_id')->index(); $table->timestamps(); $table->softDeletes(); @@ -34,15 +34,14 @@ class AddPageSize extends Migration $table->foreign('account_id')->references('id')->on('accounts')->onDelete('cascade'); $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade'); - + $table->unsignedInteger('public_id')->index(); $table->unique( array('account_id','public_id') ); }); - + Schema::table('expenses', function ($table) { $table->unsignedInteger('expense_category_id')->nullable()->index(); - - $table->foreign('expense_category_id')->references('id')->on('expense_categories')->onDelete('cascade'); + //$table->foreign('expense_category_id')->references('id')->on('expense_categories')->onDelete('cascade'); }); } @@ -62,12 +61,12 @@ class AddPageSize extends Migration Schema::table('fonts', function ($table) { $table->boolean('is_early_access'); }); - + Schema::table('expenses', function ($table) { $table->dropForeign('expenses_expense_category_id_foreign'); $table->dropColumn('expense_category_id'); }); - + Schema::dropIfExists('expense_categories'); } } diff --git a/database/migrations/2016_04_23_182223_payments_changes.php b/database/migrations/2016_04_23_182223_payments_changes.php index 41476222ab42..28fc2d58f15a 100644 --- a/database/migrations/2016_04_23_182223_payments_changes.php +++ b/database/migrations/2016_04_23_182223_payments_changes.php @@ -88,7 +88,7 @@ class PaymentsChanges extends Migration $table->string('email')->nullable(); $table->unsignedInteger('payment_method_id')->nullable(); - $table->foreign('payment_method_id')->references('id')->on('payment_methods'); + //$table->foreign('payment_method_id')->references('id')->on('payment_methods'); }); Schema::table('invoices', function($table)