Merge pull request #2060 from dmeltzer/fix-settings-table-for-sqlite

Fix updates from v2
This commit is contained in:
snipe 2016-05-20 10:52:00 -07:00
commit 072923826d
2 changed files with 37 additions and 2 deletions

View file

@ -14,8 +14,8 @@ class RemoveOptionKeysFromSettingsTable extends Migration
{
Schema::table('settings', function (Blueprint $table) {
//
$table->dropColumn('option_name');
$table->dropColumn('option_value');
if(Schema::hasColumn('option_name', 'settings'))
$table->dropColumn('option_name');
});
}
@ -28,6 +28,7 @@ class RemoveOptionKeysFromSettingsTable extends Migration
{
Schema::table('Settings', function (Blueprint $table) {
//
$table->string('option_name')->nullable();
});
}
}

View file

@ -0,0 +1,34 @@
<?php
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
class RemoveOptionValueFromSettingsTable extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('settings', function (Blueprint $table) {
//
if(Schema::hasColumn('option_value', 'settings'))
$table->dropColumn('option_value');
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
//
Schema::table('settings', function (Blueprint $table) {
$table->string('option_value')->nullable();
});
}
}