DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-12 06:17:28 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'v3' of github.com:snipe/snipe-it into v3

Browse source
This commit is contained in:
snipe 2016-05-20 12:23:36 -07:00
parent 7fd6051514 072923826d
commit 78fc6dec3c
2 changed files with 37 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
database/migrations/2016_05_20_024859_remove_option_keys_from_settings_table.php
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();
});
}
}

34
database/migrations/2016_05_20_143758_remove_option_value_from_settings_table.php Normal file
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();
});
}
}