From a08ebaeae90eabc08e4d8fc2302d482feed8d849 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Tue, 29 Nov 2016 21:04:08 +0200 Subject: [PATCH] Fix for self host database migrations --- database/migrations/2016_03_22_168362_add_documents.php | 5 ++--- database/migrations/2016_04_16_103943_enterprise_plan.php | 7 ++++++- database/migrations/2016_04_18_174135_add_page_size.php | 7 ++++--- database/migrations/2016_04_23_182223_payments_changes.php | 6 +++++- .../migrations/2016_08_10_184027_add_support_for_bots.php | 3 +++ .../migrations/2016_09_05_150625_create_gateway_types.php | 4 +++- 6 files changed, 23 insertions(+), 9 deletions(-) diff --git a/database/migrations/2016_03_22_168362_add_documents.php b/database/migrations/2016_03_22_168362_add_documents.php index 29fa07a6cbc1..d0f368b7728e 100644 --- a/database/migrations/2016_03_22_168362_add_documents.php +++ b/database/migrations/2016_03_22_168362_add_documents.php @@ -38,15 +38,14 @@ class AddDocuments extends Migration { $t->unsignedInteger('size'); $t->unsignedInteger('width')->nullable(); $t->unsignedInteger('height')->nullable(); - $t->timestamps(); + }); + Schema::table('documents', function($t) { $t->foreign('account_id')->references('id')->on('accounts')->onDelete('cascade'); $t->foreign('user_id')->references('id')->on('users')->onDelete('cascade'); $t->foreign('invoice_id')->references('id')->on('invoices')->onDelete('cascade'); $t->foreign('expense_id')->references('id')->on('expenses')->onDelete('cascade'); - - $t->unique( array('account_id','public_id') ); }); } diff --git a/database/migrations/2016_04_16_103943_enterprise_plan.php b/database/migrations/2016_04_16_103943_enterprise_plan.php index 41ec9dfc4ae6..7b3bca557594 100644 --- a/database/migrations/2016_04_16_103943_enterprise_plan.php +++ b/database/migrations/2016_04_16_103943_enterprise_plan.php @@ -32,7 +32,7 @@ class EnterprisePlan extends Migration $table->date('plan_expires')->nullable(); $table->unsignedInteger('payment_id')->nullable(); - $table->foreign('payment_id')->references('id')->on('payments'); + $table->date('trial_started')->nullable(); $table->enum('trial_plan', array('pro', 'enterprise'))->nullable(); @@ -43,6 +43,11 @@ class EnterprisePlan extends Migration $table->timestamps(); $table->softDeletes(); }); + + Schema::table('companies', function($table) + { + $table->foreign('payment_id')->references('id')->on('payments'); + }); } if (!Schema::hasColumn('accounts', 'company_id')) { 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 2eae6768342d..8184e954c1fe 100644 --- a/database/migrations/2016_04_18_174135_add_page_size.php +++ b/database/migrations/2016_04_18_174135_add_page_size.php @@ -29,16 +29,17 @@ class AddPageSize extends Migration $table->unsignedInteger('account_id')->index(); $table->timestamps(); $table->softDeletes(); - $table->string('name')->nullable(); + $table->unsignedInteger('public_id')->index(); + }); + Schema::table('expense_categories', function ($table) { $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(); }); diff --git a/database/migrations/2016_04_23_182223_payments_changes.php b/database/migrations/2016_04_23_182223_payments_changes.php index 2b693367403c..61d0d16eef15 100644 --- a/database/migrations/2016_04_23_182223_payments_changes.php +++ b/database/migrations/2016_04_23_182223_payments_changes.php @@ -64,6 +64,11 @@ class PaymentsChanges extends Migration $table->timestamps(); $table->softDeletes(); + $table->unsignedInteger('public_id')->index(); + }); + + Schema::table('payment_methods', function($table) + { $table->foreign('account_id')->references('id')->on('accounts')->onDelete('cascade'); $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade'); $table->foreign('contact_id')->references('id')->on('contacts')->onDelete('cascade'); @@ -71,7 +76,6 @@ class PaymentsChanges extends Migration $table->foreign('payment_type_id')->references('id')->on('payment_types'); $table->foreign('currency_id')->references('id')->on('currencies'); - $table->unsignedInteger('public_id')->index(); $table->unique( array('account_id','public_id') ); }); diff --git a/database/migrations/2016_08_10_184027_add_support_for_bots.php b/database/migrations/2016_08_10_184027_add_support_for_bots.php index 40704b4564c1..3a28f29a1395 100644 --- a/database/migrations/2016_08_10_184027_add_support_for_bots.php +++ b/database/migrations/2016_08_10_184027_add_support_for_bots.php @@ -22,7 +22,10 @@ class AddSupportForBots extends Migration $table->string('code')->nullable(); $table->string('bot_user_id')->unique(); $table->timestamp('created_at')->useCurrent(); + }); + Schema::table('security_codes', function($table) + { $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade'); $table->foreign('contact_id')->references('id')->on('contacts')->onDelete('cascade'); $table->foreign('account_id')->references('id')->on('accounts')->onDelete('cascade'); diff --git a/database/migrations/2016_09_05_150625_create_gateway_types.php b/database/migrations/2016_09_05_150625_create_gateway_types.php index 1a0f5c25fd99..544211eb53b4 100644 --- a/database/migrations/2016_09_05_150625_create_gateway_types.php +++ b/database/migrations/2016_09_05_150625_create_gateway_types.php @@ -34,11 +34,13 @@ class CreateGatewayTypes extends Migration $table->unsignedInteger('min_limit')->nullable(); $table->unsignedInteger('max_limit')->nullable(); + }); + Schema::table('account_gateway_settings', function($table) + { $table->foreign('account_id')->references('id')->on('accounts')->onDelete('cascade'); $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade'); $table->foreign('gateway_type_id')->references('id')->on('gateway_types')->onDelete('cascade'); - }); Schema::table('payment_types', function($table)