kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-13 16:00:13 +00:00
Code Issues Projects Releases Wiki Activity

Fix nullable fields.

Browse Source
This commit is contained in:
James Cole
2016-09-24 17:22:42 +02:00
parent b3b66a8f92
commit abc4f856ce
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Models/ImportJob.php
View File

@@ -110,6 +110,9 @@ class ImportJob extends Model
*/ */
public function getConfigurationAttribute($value) public function getConfigurationAttribute($value)
{ {
if (is_null($value)) {
return [];
}
if (strlen($value) == 0) { if (strlen($value) == 0) {
return []; return [];
} }

6
database/migrations/2016_06_16_000002_create_main_tables.php
View File

@@ -290,7 +290,7 @@ class CreateMainTables extends Migration
$table->string('key', 12)->unique(); $table->string('key', 12)->unique();
$table->string('file_type', 12); $table->string('file_type', 12);
$table->string('status', 45); $table->string('status', 45);
$table->text('configuration'); $table->text('configuration')->nullable();
$table->foreign('user_id')->references('id')->on('users')->onDelete('cascade'); $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade');
} }
); );
@@ -398,7 +398,7 @@ class CreateMainTables extends Migration
$table->softDeletes(); $table->softDeletes();
$table->integer('user_id', false, true); $table->integer('user_id', false, true);
$table->string('title', 255); $table->string('title', 255);
$table->text('description'); $table->text('description')->nullable();
$table->integer('order', false, true)->default(0); $table->integer('order', false, true)->default(0);
$table->boolean('active')->default(1); $table->boolean('active')->default(1);
@@ -416,7 +416,7 @@ class CreateMainTables extends Migration
$table->integer('user_id', false, true); $table->integer('user_id', false, true);
$table->integer('rule_group_id', false, true); $table->integer('rule_group_id', false, true);
$table->string('title', 255); $table->string('title', 255);
$table->text('description'); $table->text('description')->nullable();
$table->integer('order', false, true)->default(0); $table->integer('order', false, true)->default(0);
$table->boolean('active')->default(1); $table->boolean('active')->default(1);
$table->boolean('stop_processing')->default(0); $table->boolean('stop_processing')->default(0);