Fix for migrations

This commit is contained in:
Hillel Coren 2017-01-11 11:32:11 +02:00
parent 91790efe8d
commit 65b45fc3c0
2 changed files with 2 additions and 3 deletions

View File

@ -493,8 +493,8 @@ class ConfideSetupUsersTable extends Migration {
$t->timestamps(); $t->timestamps();
$t->unsignedInteger('account_id'); $t->unsignedInteger('account_id');
$t->unsignedInteger('client_id');
$t->unsignedInteger('user_id'); $t->unsignedInteger('user_id');
$t->unsignedInteger('client_id')->nullable();
$t->unsignedInteger('contact_id')->nullable(); $t->unsignedInteger('contact_id')->nullable();
$t->unsignedInteger('payment_id')->nullable(); $t->unsignedInteger('payment_id')->nullable();
$t->unsignedInteger('invoice_id')->nullable(); $t->unsignedInteger('invoice_id')->nullable();
@ -508,7 +508,6 @@ class ConfideSetupUsersTable extends Migration {
$t->decimal('balance', 13, 2)->nullable(); $t->decimal('balance', 13, 2)->nullable();
$t->foreign('account_id')->references('id')->on('accounts')->onDelete('cascade'); $t->foreign('account_id')->references('id')->on('accounts')->onDelete('cascade');
$t->foreign('client_id')->references('id')->on('clients')->onDelete('cascade');
}); });
} }

View File

@ -30,7 +30,7 @@ class SupportNewPricing extends Migration
// https://github.com/invoiceninja/invoiceninja/pull/955 // https://github.com/invoiceninja/invoiceninja/pull/955
Schema::table('activities', function (Blueprint $table) { Schema::table('activities', function (Blueprint $table) {
$table->integer('task_id')->after('invitation_id')->nullable(); $table->integer('task_id')->after('invitation_id')->nullable();
$table->dropForeign('activities_client_id_foreign'); $table->unsignedInteger('client_id')->nullable()->change();
}); });
// https://github.com/invoiceninja/invoiceninja/pull/950 // https://github.com/invoiceninja/invoiceninja/pull/950