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

database/migrations/2016_05_20_024859_remove_option_keys_from_settings_table.php

@@ -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();
         });
     }
 }

database/migrations/2016_05_20_143758_remove_option_value_from_settings_table.php

@@ -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();
+        });
+    }
+}