From d7f4fc67dbf025d6b9cd55b47704cb46d095f2b9 Mon Sep 17 00:00:00 2001
From: "Tom K.H. Lin" <3011850@gmail.com>
Date: Thu, 26 Jul 2018 19:38:40 +0800
Subject: [PATCH] fix #1

---
 .../2014_10_12_000000_create_users_table.php  | 35 -----------------
 ...12_100000_create_password_resets_table.php | 32 ----------------
 .../2018_07_22_193326_create_admin_table.php  | 37 ------------------
 .../2018_07_26_113627_create_Admin_table.php  | 38 +++++++++++++++++++
 ...> 2018_07_26_113627_create_Area_table.php} |  0
 ...> 2018_07_26_113627_create_Bank_table.php} |  0
 ...26_113627_create_BeClassifiedAs_table.php} |  0
 ...2018_07_26_113627_create_Belong_table.php} |  0
 ...07_26_113627_create_CaseBuilder_table.php} |  0
 ...2018_07_26_113627_create_Choose_table.php} |  0
 ...7_26_113627_create_Commissioned_table.php} |  0
 ...113627_create_FlightNegotiation_table.php} |  0
 ...2018_07_26_113627_create_Manage_table.php} |  0
 ..._07_26_113627_create_Preference_table.php} |  0
 ..._113627_create_PriceNegotiation_table.php} |  0
 ...7_26_113627_create_ProofReading_table.php} |  0
 ...18_07_26_113627_create_Receiver_table.php} |  0
 ...113627_create_ReleaseManuscript_table.php} |  0
 ...018_07_26_113627_create_TheCase_table.php} |  0
 ...18_07_26_113627_create_TheClass_table.php} |  0
 ...26_113627_create_password_resets_table.php | 34 +++++++++++++++++
 .../2018_07_26_113627_create_users_table.php  | 37 ++++++++++++++++++
 ..._foreign_keys_to_BeClassifiedAs_table.php} |  4 +-
 ...3629_add_foreign_keys_to_Belong_table.php} |  0
 ...3629_add_foreign_keys_to_Choose_table.php} |  0
 ...dd_foreign_keys_to_Commissioned_table.php} |  0
 ...reign_keys_to_FlightNegotiation_table.php} |  0
 ...3629_add_foreign_keys_to_Manage_table.php} |  0
 ..._add_foreign_keys_to_Preference_table.php} |  0
 ...oreign_keys_to_PriceNegotiation_table.php} |  0
 ...dd_foreign_keys_to_ProofReading_table.php} |  0
 ...reign_keys_to_ReleaseManuscript_table.php} |  0
 ...629_add_foreign_keys_to_TheCase_table.php} |  0
 33 files changed, 111 insertions(+), 106 deletions(-)
 delete mode 100644 database/migrations/2014_10_12_000000_create_users_table.php
 delete mode 100644 database/migrations/2014_10_12_100000_create_password_resets_table.php
 delete mode 100644 database/migrations/2018_07_22_193326_create_admin_table.php
 create mode 100644 database/migrations/2018_07_26_113627_create_Admin_table.php
 rename database/migrations/{2018_07_22_192734_create_Area_table.php => 2018_07_26_113627_create_Area_table.php} (100%)
 rename database/migrations/{2018_07_22_192734_create_Bank_table.php => 2018_07_26_113627_create_Bank_table.php} (100%)
 rename database/migrations/{2018_07_22_192734_create_BeClassifiedAs_table.php => 2018_07_26_113627_create_BeClassifiedAs_table.php} (100%)
 rename database/migrations/{2018_07_22_192734_create_Belong_table.php => 2018_07_26_113627_create_Belong_table.php} (100%)
 rename database/migrations/{2018_07_22_192734_create_CaseBuilder_table.php => 2018_07_26_113627_create_CaseBuilder_table.php} (100%)
 rename database/migrations/{2018_07_22_192734_create_Choose_table.php => 2018_07_26_113627_create_Choose_table.php} (100%)
 rename database/migrations/{2018_07_22_192734_create_Commissioned_table.php => 2018_07_26_113627_create_Commissioned_table.php} (100%)
 rename database/migrations/{2018_07_22_192734_create_FlightNegotiation_table.php => 2018_07_26_113627_create_FlightNegotiation_table.php} (100%)
 rename database/migrations/{2018_07_22_192734_create_Manage_table.php => 2018_07_26_113627_create_Manage_table.php} (100%)
 rename database/migrations/{2018_07_22_192734_create_Preference_table.php => 2018_07_26_113627_create_Preference_table.php} (100%)
 rename database/migrations/{2018_07_22_192734_create_PriceNegotiation_table.php => 2018_07_26_113627_create_PriceNegotiation_table.php} (100%)
 rename database/migrations/{2018_07_22_192734_create_ProofReading_table.php => 2018_07_26_113627_create_ProofReading_table.php} (100%)
 rename database/migrations/{2018_07_22_192734_create_Receiver_table.php => 2018_07_26_113627_create_Receiver_table.php} (100%)
 rename database/migrations/{2018_07_22_192734_create_ReleaseManuscript_table.php => 2018_07_26_113627_create_ReleaseManuscript_table.php} (100%)
 rename database/migrations/{2018_07_22_192734_create_TheCase_table.php => 2018_07_26_113627_create_TheCase_table.php} (100%)
 rename database/migrations/{2018_07_22_192734_create_TheClass_table.php => 2018_07_26_113627_create_TheClass_table.php} (100%)
 create mode 100644 database/migrations/2018_07_26_113627_create_password_resets_table.php
 create mode 100644 database/migrations/2018_07_26_113627_create_users_table.php
 rename database/migrations/{2018_07_22_192736_add_foreign_keys_to_BeClassifiedAs_table.php => 2018_07_26_113629_add_foreign_keys_to_BeClassifiedAs_table.php} (84%)
 rename database/migrations/{2018_07_22_192736_add_foreign_keys_to_Belong_table.php => 2018_07_26_113629_add_foreign_keys_to_Belong_table.php} (100%)
 rename database/migrations/{2018_07_22_192736_add_foreign_keys_to_Choose_table.php => 2018_07_26_113629_add_foreign_keys_to_Choose_table.php} (100%)
 rename database/migrations/{2018_07_22_192736_add_foreign_keys_to_Commissioned_table.php => 2018_07_26_113629_add_foreign_keys_to_Commissioned_table.php} (100%)
 rename database/migrations/{2018_07_22_192736_add_foreign_keys_to_FlightNegotiation_table.php => 2018_07_26_113629_add_foreign_keys_to_FlightNegotiation_table.php} (100%)
 rename database/migrations/{2018_07_22_192736_add_foreign_keys_to_Manage_table.php => 2018_07_26_113629_add_foreign_keys_to_Manage_table.php} (100%)
 rename database/migrations/{2018_07_22_192736_add_foreign_keys_to_Preference_table.php => 2018_07_26_113629_add_foreign_keys_to_Preference_table.php} (100%)
 rename database/migrations/{2018_07_22_192736_add_foreign_keys_to_PriceNegotiation_table.php => 2018_07_26_113629_add_foreign_keys_to_PriceNegotiation_table.php} (100%)
 rename database/migrations/{2018_07_22_192736_add_foreign_keys_to_ProofReading_table.php => 2018_07_26_113629_add_foreign_keys_to_ProofReading_table.php} (100%)
 rename database/migrations/{2018_07_22_192736_add_foreign_keys_to_ReleaseManuscript_table.php => 2018_07_26_113629_add_foreign_keys_to_ReleaseManuscript_table.php} (100%)
 rename database/migrations/{2018_07_22_192736_add_foreign_keys_to_TheCase_table.php => 2018_07_26_113629_add_foreign_keys_to_TheCase_table.php} (100%)

diff --git a/database/migrations/2014_10_12_000000_create_users_table.php b/database/migrations/2014_10_12_000000_create_users_table.php
deleted file mode 100644
index 689cbee..0000000
--- a/database/migrations/2014_10_12_000000_create_users_table.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class CreateUsersTable extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('users', function (Blueprint $table) {
-            $table->increments('id');
-            $table->string('name');
-            $table->string('email')->unique();
-            $table->string('password');
-            $table->rememberToken();
-            $table->timestamps();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('users');
-    }
-}
diff --git a/database/migrations/2014_10_12_100000_create_password_resets_table.php b/database/migrations/2014_10_12_100000_create_password_resets_table.php
deleted file mode 100644
index 0d5cb84..0000000
--- a/database/migrations/2014_10_12_100000_create_password_resets_table.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class CreatePasswordResetsTable extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('password_resets', function (Blueprint $table) {
-            $table->string('email')->index();
-            $table->string('token');
-            $table->timestamp('created_at')->nullable();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('password_resets');
-    }
-}
diff --git a/database/migrations/2018_07_22_193326_create_admin_table.php b/database/migrations/2018_07_22_193326_create_admin_table.php
deleted file mode 100644
index 8534b5d..0000000
--- a/database/migrations/2018_07_22_193326_create_admin_table.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class CreateAdminTable extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('Admin', function (Blueprint $table) {
-            $table->string('ID');
-            $table->string('password');
-            $table->string('name');
-            $table->string('nick_name');
-            $table->string('email');
-            $table->string('phone_number');
-            $table->timestamps();
-            $table->primary('ID');
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('admin');
-    }
-}
diff --git a/database/migrations/2018_07_26_113627_create_Admin_table.php b/database/migrations/2018_07_26_113627_create_Admin_table.php
new file mode 100644
index 0000000..7533c6f
--- /dev/null
+++ b/database/migrations/2018_07_26_113627_create_Admin_table.php
@@ -0,0 +1,38 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+
+class CreateAdminTable extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::create('Admin', function(Blueprint $table)
+		{
+			$table->string('ID')->primary();
+			$table->string('password');
+			$table->string('name');
+			$table->string('nick_name');
+			$table->string('email');
+			$table->string('phone_number');
+			$table->timestamps();
+		});
+	}
+
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::drop('Admin');
+	}
+
+}
diff --git a/database/migrations/2018_07_22_192734_create_Area_table.php b/database/migrations/2018_07_26_113627_create_Area_table.php
similarity index 100%
rename from database/migrations/2018_07_22_192734_create_Area_table.php
rename to database/migrations/2018_07_26_113627_create_Area_table.php
diff --git a/database/migrations/2018_07_22_192734_create_Bank_table.php b/database/migrations/2018_07_26_113627_create_Bank_table.php
similarity index 100%
rename from database/migrations/2018_07_22_192734_create_Bank_table.php
rename to database/migrations/2018_07_26_113627_create_Bank_table.php
diff --git a/database/migrations/2018_07_22_192734_create_BeClassifiedAs_table.php b/database/migrations/2018_07_26_113627_create_BeClassifiedAs_table.php
similarity index 100%
rename from database/migrations/2018_07_22_192734_create_BeClassifiedAs_table.php
rename to database/migrations/2018_07_26_113627_create_BeClassifiedAs_table.php
diff --git a/database/migrations/2018_07_22_192734_create_Belong_table.php b/database/migrations/2018_07_26_113627_create_Belong_table.php
similarity index 100%
rename from database/migrations/2018_07_22_192734_create_Belong_table.php
rename to database/migrations/2018_07_26_113627_create_Belong_table.php
diff --git a/database/migrations/2018_07_22_192734_create_CaseBuilder_table.php b/database/migrations/2018_07_26_113627_create_CaseBuilder_table.php
similarity index 100%
rename from database/migrations/2018_07_22_192734_create_CaseBuilder_table.php
rename to database/migrations/2018_07_26_113627_create_CaseBuilder_table.php
diff --git a/database/migrations/2018_07_22_192734_create_Choose_table.php b/database/migrations/2018_07_26_113627_create_Choose_table.php
similarity index 100%
rename from database/migrations/2018_07_22_192734_create_Choose_table.php
rename to database/migrations/2018_07_26_113627_create_Choose_table.php
diff --git a/database/migrations/2018_07_22_192734_create_Commissioned_table.php b/database/migrations/2018_07_26_113627_create_Commissioned_table.php
similarity index 100%
rename from database/migrations/2018_07_22_192734_create_Commissioned_table.php
rename to database/migrations/2018_07_26_113627_create_Commissioned_table.php
diff --git a/database/migrations/2018_07_22_192734_create_FlightNegotiation_table.php b/database/migrations/2018_07_26_113627_create_FlightNegotiation_table.php
similarity index 100%
rename from database/migrations/2018_07_22_192734_create_FlightNegotiation_table.php
rename to database/migrations/2018_07_26_113627_create_FlightNegotiation_table.php
diff --git a/database/migrations/2018_07_22_192734_create_Manage_table.php b/database/migrations/2018_07_26_113627_create_Manage_table.php
similarity index 100%
rename from database/migrations/2018_07_22_192734_create_Manage_table.php
rename to database/migrations/2018_07_26_113627_create_Manage_table.php
diff --git a/database/migrations/2018_07_22_192734_create_Preference_table.php b/database/migrations/2018_07_26_113627_create_Preference_table.php
similarity index 100%
rename from database/migrations/2018_07_22_192734_create_Preference_table.php
rename to database/migrations/2018_07_26_113627_create_Preference_table.php
diff --git a/database/migrations/2018_07_22_192734_create_PriceNegotiation_table.php b/database/migrations/2018_07_26_113627_create_PriceNegotiation_table.php
similarity index 100%
rename from database/migrations/2018_07_22_192734_create_PriceNegotiation_table.php
rename to database/migrations/2018_07_26_113627_create_PriceNegotiation_table.php
diff --git a/database/migrations/2018_07_22_192734_create_ProofReading_table.php b/database/migrations/2018_07_26_113627_create_ProofReading_table.php
similarity index 100%
rename from database/migrations/2018_07_22_192734_create_ProofReading_table.php
rename to database/migrations/2018_07_26_113627_create_ProofReading_table.php
diff --git a/database/migrations/2018_07_22_192734_create_Receiver_table.php b/database/migrations/2018_07_26_113627_create_Receiver_table.php
similarity index 100%
rename from database/migrations/2018_07_22_192734_create_Receiver_table.php
rename to database/migrations/2018_07_26_113627_create_Receiver_table.php
diff --git a/database/migrations/2018_07_22_192734_create_ReleaseManuscript_table.php b/database/migrations/2018_07_26_113627_create_ReleaseManuscript_table.php
similarity index 100%
rename from database/migrations/2018_07_22_192734_create_ReleaseManuscript_table.php
rename to database/migrations/2018_07_26_113627_create_ReleaseManuscript_table.php
diff --git a/database/migrations/2018_07_22_192734_create_TheCase_table.php b/database/migrations/2018_07_26_113627_create_TheCase_table.php
similarity index 100%
rename from database/migrations/2018_07_22_192734_create_TheCase_table.php
rename to database/migrations/2018_07_26_113627_create_TheCase_table.php
diff --git a/database/migrations/2018_07_22_192734_create_TheClass_table.php b/database/migrations/2018_07_26_113627_create_TheClass_table.php
similarity index 100%
rename from database/migrations/2018_07_22_192734_create_TheClass_table.php
rename to database/migrations/2018_07_26_113627_create_TheClass_table.php
diff --git a/database/migrations/2018_07_26_113627_create_password_resets_table.php b/database/migrations/2018_07_26_113627_create_password_resets_table.php
new file mode 100644
index 0000000..2fcab1a
--- /dev/null
+++ b/database/migrations/2018_07_26_113627_create_password_resets_table.php
@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+
+class CreatePasswordResetsTable extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::create('password_resets', function(Blueprint $table)
+		{
+			$table->string('email')->index();
+			$table->string('token');
+			$table->dateTime('created_at')->nullable();
+		});
+	}
+
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::drop('password_resets');
+	}
+
+}
diff --git a/database/migrations/2018_07_26_113627_create_users_table.php b/database/migrations/2018_07_26_113627_create_users_table.php
new file mode 100644
index 0000000..a19ec65
--- /dev/null
+++ b/database/migrations/2018_07_26_113627_create_users_table.php
@@ -0,0 +1,37 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+
+class CreateUsersTable extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::create('users', function(Blueprint $table)
+		{
+			$table->increments('id');
+			$table->string('name');
+			$table->string('email')->unique();
+			$table->string('password');
+			$table->string('remember_token', 100)->nullable();
+			$table->timestamps();
+		});
+	}
+
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::drop('users');
+	}
+
+}
diff --git a/database/migrations/2018_07_22_192736_add_foreign_keys_to_BeClassifiedAs_table.php b/database/migrations/2018_07_26_113629_add_foreign_keys_to_BeClassifiedAs_table.php
similarity index 84%
rename from database/migrations/2018_07_22_192736_add_foreign_keys_to_BeClassifiedAs_table.php
rename to database/migrations/2018_07_26_113629_add_foreign_keys_to_BeClassifiedAs_table.php
index ad60039..14c3df6 100644
--- a/database/migrations/2018_07_22_192736_add_foreign_keys_to_BeClassifiedAs_table.php
+++ b/database/migrations/2018_07_26_113629_add_foreign_keys_to_BeClassifiedAs_table.php
@@ -14,8 +14,8 @@ class AddForeignKeysToBeClassifiedAsTable extends Migration {
 	{
 		Schema::table('BeClassifiedAs', function(Blueprint $table)
 		{
-			$table->foreign('CID', 'beclassifiedas_ibfk_1')->references('C_ID')->on('theclass')->onUpdate('CASCADE')->onDelete('CASCADE');
-			$table->foreign('CBID', 'beclassifiedas_ibfk_2')->references('CBID')->on('casebuilder')->onUpdate('RESTRICT')->onDelete('RESTRICT');
+			$table->foreign('CID', 'beclassifiedas_ibfk_1')->references('CID')->on('TheClass')->onUpdate('CASCADE')->onDelete('CASCADE');
+			$table->foreign('CBID', 'beclassifiedas_ibfk_2')->references('CBID')->on('CaseBuilder')->onUpdate('RESTRICT')->onDelete('RESTRICT');
 		});
 	}
 
diff --git a/database/migrations/2018_07_22_192736_add_foreign_keys_to_Belong_table.php b/database/migrations/2018_07_26_113629_add_foreign_keys_to_Belong_table.php
similarity index 100%
rename from database/migrations/2018_07_22_192736_add_foreign_keys_to_Belong_table.php
rename to database/migrations/2018_07_26_113629_add_foreign_keys_to_Belong_table.php
diff --git a/database/migrations/2018_07_22_192736_add_foreign_keys_to_Choose_table.php b/database/migrations/2018_07_26_113629_add_foreign_keys_to_Choose_table.php
similarity index 100%
rename from database/migrations/2018_07_22_192736_add_foreign_keys_to_Choose_table.php
rename to database/migrations/2018_07_26_113629_add_foreign_keys_to_Choose_table.php
diff --git a/database/migrations/2018_07_22_192736_add_foreign_keys_to_Commissioned_table.php b/database/migrations/2018_07_26_113629_add_foreign_keys_to_Commissioned_table.php
similarity index 100%
rename from database/migrations/2018_07_22_192736_add_foreign_keys_to_Commissioned_table.php
rename to database/migrations/2018_07_26_113629_add_foreign_keys_to_Commissioned_table.php
diff --git a/database/migrations/2018_07_22_192736_add_foreign_keys_to_FlightNegotiation_table.php b/database/migrations/2018_07_26_113629_add_foreign_keys_to_FlightNegotiation_table.php
similarity index 100%
rename from database/migrations/2018_07_22_192736_add_foreign_keys_to_FlightNegotiation_table.php
rename to database/migrations/2018_07_26_113629_add_foreign_keys_to_FlightNegotiation_table.php
diff --git a/database/migrations/2018_07_22_192736_add_foreign_keys_to_Manage_table.php b/database/migrations/2018_07_26_113629_add_foreign_keys_to_Manage_table.php
similarity index 100%
rename from database/migrations/2018_07_22_192736_add_foreign_keys_to_Manage_table.php
rename to database/migrations/2018_07_26_113629_add_foreign_keys_to_Manage_table.php
diff --git a/database/migrations/2018_07_22_192736_add_foreign_keys_to_Preference_table.php b/database/migrations/2018_07_26_113629_add_foreign_keys_to_Preference_table.php
similarity index 100%
rename from database/migrations/2018_07_22_192736_add_foreign_keys_to_Preference_table.php
rename to database/migrations/2018_07_26_113629_add_foreign_keys_to_Preference_table.php
diff --git a/database/migrations/2018_07_22_192736_add_foreign_keys_to_PriceNegotiation_table.php b/database/migrations/2018_07_26_113629_add_foreign_keys_to_PriceNegotiation_table.php
similarity index 100%
rename from database/migrations/2018_07_22_192736_add_foreign_keys_to_PriceNegotiation_table.php
rename to database/migrations/2018_07_26_113629_add_foreign_keys_to_PriceNegotiation_table.php
diff --git a/database/migrations/2018_07_22_192736_add_foreign_keys_to_ProofReading_table.php b/database/migrations/2018_07_26_113629_add_foreign_keys_to_ProofReading_table.php
similarity index 100%
rename from database/migrations/2018_07_22_192736_add_foreign_keys_to_ProofReading_table.php
rename to database/migrations/2018_07_26_113629_add_foreign_keys_to_ProofReading_table.php
diff --git a/database/migrations/2018_07_22_192736_add_foreign_keys_to_ReleaseManuscript_table.php b/database/migrations/2018_07_26_113629_add_foreign_keys_to_ReleaseManuscript_table.php
similarity index 100%
rename from database/migrations/2018_07_22_192736_add_foreign_keys_to_ReleaseManuscript_table.php
rename to database/migrations/2018_07_26_113629_add_foreign_keys_to_ReleaseManuscript_table.php
diff --git a/database/migrations/2018_07_22_192736_add_foreign_keys_to_TheCase_table.php b/database/migrations/2018_07_26_113629_add_foreign_keys_to_TheCase_table.php
similarity index 100%
rename from database/migrations/2018_07_22_192736_add_foreign_keys_to_TheCase_table.php
rename to database/migrations/2018_07_26_113629_add_foreign_keys_to_TheCase_table.php