From fd8b7182e7933fb0b98dceb0f69785a2b24ecf09 Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Fri, 10 Apr 2020 14:01:36 -0700
Subject: [PATCH] Merge migrations

---
 ...4_04_131016_add_table_server_transfers.php |  1 +
 ..._successful_column_to_server_transfers.php | 32 -------------------
 2 files changed, 1 insertion(+), 32 deletions(-)
 delete mode 100644 database/migrations/2020_04_04_172331_add_successful_column_to_server_transfers.php

diff --git a/database/migrations/2020_04_04_131016_add_table_server_transfers.php b/database/migrations/2020_04_04_131016_add_table_server_transfers.php
index 1ce37c26d..85c73f46e 100644
--- a/database/migrations/2020_04_04_131016_add_table_server_transfers.php
+++ b/database/migrations/2020_04_04_131016_add_table_server_transfers.php
@@ -18,6 +18,7 @@ class AddTableServerTransfers extends Migration
         Schema::create('server_transfers', function (Blueprint $table) {
             $table->increments('id');
             $table->integer('server_id')->unsigned();
+            $table->tinyInteger('successful')->unsigned()->default(0);
             $table->integer('old_node')->unsigned();
             $table->integer('new_node')->unsigned();
             $table->integer('old_allocation')->unsigned();
diff --git a/database/migrations/2020_04_04_172331_add_successful_column_to_server_transfers.php b/database/migrations/2020_04_04_172331_add_successful_column_to_server_transfers.php
deleted file mode 100644
index 83f183abf..000000000
--- a/database/migrations/2020_04_04_172331_add_successful_column_to_server_transfers.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class AddSuccessfulColumnToServerTransfers extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::table('server_transfers', function (Blueprint $table) {
-            $table->tinyInteger('successful')->unsigned()->default(0);
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::table('server_transfers', function (Blueprint $table) {
-            $table->dropColumn('successful');
-        });
-    }
-}