From dff963704bcd57dae39c86d9d5c2c0b48c56184f Mon Sep 17 00:00:00 2001 From: OhmygoodR <109280933+OhmygoodR@users.noreply.github.com> Date: Fri, 25 Oct 2024 22:56:36 +0800 Subject: [PATCH 01/13] Update 2021_11_08_091231_create_tasks_table.php --- .../migrations/task1/2021_11_08_091231_create_tasks_table.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/database/migrations/task1/2021_11_08_091231_create_tasks_table.php b/database/migrations/task1/2021_11_08_091231_create_tasks_table.php index 08bf628f..d249f4b7 100644 --- a/database/migrations/task1/2021_11_08_091231_create_tasks_table.php +++ b/database/migrations/task1/2021_11_08_091231_create_tasks_table.php @@ -15,8 +15,7 @@ public function up() { Schema::create('tasks', function (Blueprint $table) { $table->id(); - $table->bigInteger('user_id'); - $table->foreign('user_id')->references('id')->on('users'); + $table->foreignId('user_id')->constrained(); $table->string('name'); $table->timestamps(); }); From 38c49987521d6ca8c2630ac17577255af2c53fef Mon Sep 17 00:00:00 2001 From: OhmygoodR <109280933+OhmygoodR@users.noreply.github.com> Date: Fri, 25 Oct 2024 22:57:28 +0800 Subject: [PATCH 02/13] Update 2021_11_08_092943_create_comments_table.php --- .../task1/2021_11_08_092943_create_comments_table.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/database/migrations/task1/2021_11_08_092943_create_comments_table.php b/database/migrations/task1/2021_11_08_092943_create_comments_table.php index 0378294b..3c5ff32a 100644 --- a/database/migrations/task1/2021_11_08_092943_create_comments_table.php +++ b/database/migrations/task1/2021_11_08_092943_create_comments_table.php @@ -15,10 +15,8 @@ public function up() { Schema::create('comments', function (Blueprint $table) { $table->id(); - $table->unsignedInteger('user_id'); - $table->foreign('user_id')->references('id')->on('users'); - $table->unsignedInteger('comment_id'); - $table->foreign('comment_id')->references('id')->on('comments'); + $table->foreignId('user_id')->constrained(); + $table->foreignId('comment_id')->constrained(); $table->string('comment_text'); $table->timestamps(); }); From 7f65c79e1ff324a4ec08919762481865238e64bc Mon Sep 17 00:00:00 2001 From: OhmygoodR <109280933+OhmygoodR@users.noreply.github.com> Date: Fri, 25 Oct 2024 22:58:28 +0800 Subject: [PATCH 03/13] Update 2021_11_09_075928_add_surname_to_users_table.php --- .../task2/2021_11_09_075928_add_surname_to_users_table.php | 1 + 1 file changed, 1 insertion(+) diff --git a/database/migrations/task2/2021_11_09_075928_add_surname_to_users_table.php b/database/migrations/task2/2021_11_09_075928_add_surname_to_users_table.php index 5a3422a4..e6ff3b38 100644 --- a/database/migrations/task2/2021_11_09_075928_add_surname_to_users_table.php +++ b/database/migrations/task2/2021_11_09_075928_add_surname_to_users_table.php @@ -16,6 +16,7 @@ public function up() Schema::table('users', function (Blueprint $table) { // TASK: Add a string field "surname" which would go after the field "name" // Write code here + $table->string('surname')->after('name'); }); } From d0bd0995b04d1b1a68c81746bec0171e03305b0d Mon Sep 17 00:00:00 2001 From: OhmygoodR <109280933+OhmygoodR@users.noreply.github.com> Date: Fri, 25 Oct 2024 22:58:53 +0800 Subject: [PATCH 04/13] Update 2021_11_09_080955_create_projects_table.php --- .../migrations/task3/2021_11_09_080955_create_projects_table.php | 1 + 1 file changed, 1 insertion(+) diff --git a/database/migrations/task3/2021_11_09_080955_create_projects_table.php b/database/migrations/task3/2021_11_09_080955_create_projects_table.php index 9dc9d7b5..3cbcc04d 100644 --- a/database/migrations/task3/2021_11_09_080955_create_projects_table.php +++ b/database/migrations/task3/2021_11_09_080955_create_projects_table.php @@ -19,6 +19,7 @@ public function up() $table->timestamps(); // TASK: Add soft deletes column here + $table->softDeletes(); }); } From 9aed7d6c52f31fe90767c6267fcb3623f68b06dc Mon Sep 17 00:00:00 2001 From: OhmygoodR <109280933+OhmygoodR@users.noreply.github.com> Date: Fri, 25 Oct 2024 22:59:44 +0800 Subject: [PATCH 05/13] Update 2021_11_09_082205_create_products_table.php --- .../task4/2021_11_09_082205_create_products_table.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/migrations/task4/2021_11_09_082205_create_products_table.php b/database/migrations/task4/2021_11_09_082205_create_products_table.php index 78636019..9a22e739 100644 --- a/database/migrations/task4/2021_11_09_082205_create_products_table.php +++ b/database/migrations/task4/2021_11_09_082205_create_products_table.php @@ -16,7 +16,7 @@ public function up() // TASK: Edit this file, so that deleting category would auto-delete its products Schema::create('products', function (Blueprint $table) { $table->id(); - $table->foreignId('category_id')->constrained(); + $table->foreignId('category_id')->constrained()->cascadeOnDelete(); $table->string('name'); $table->timestamps(); }); From 4722eb28e3b33d11de06404594dbfa85eea4dbbf Mon Sep 17 00:00:00 2001 From: OhmygoodR <109280933+OhmygoodR@users.noreply.github.com> Date: Fri, 25 Oct 2024 23:01:19 +0800 Subject: [PATCH 06/13] Update 2021_11_09_083121_update_users_table.php --- .../migrations/task5/2021_11_09_083121_update_users_table.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/database/migrations/task5/2021_11_09_083121_update_users_table.php b/database/migrations/task5/2021_11_09_083121_update_users_table.php index c10976a5..6c31fbec 100644 --- a/database/migrations/task5/2021_11_09_083121_update_users_table.php +++ b/database/migrations/task5/2021_11_09_083121_update_users_table.php @@ -14,6 +14,10 @@ class UpdateUsersTable extends Migration public function up() { // TASK: add an if-statement in this file to NOT add column if it already exists + + if(Schema::hasColumn('users','name')){ + return; + } Schema::table('users', function (Blueprint $table) { $table->string('name'); }); From 6ad4a2097dce08590662f2c59814e4b716d754a6 Mon Sep 17 00:00:00 2001 From: OhmygoodR <109280933+OhmygoodR@users.noreply.github.com> Date: Fri, 25 Oct 2024 23:02:41 +0800 Subject: [PATCH 07/13] Update 2021_11_09_075928_add_surname_to_users_table.php --- .../task2/2021_11_09_075928_add_surname_to_users_table.php | 1 + 1 file changed, 1 insertion(+) diff --git a/database/migrations/task2/2021_11_09_075928_add_surname_to_users_table.php b/database/migrations/task2/2021_11_09_075928_add_surname_to_users_table.php index e6ff3b38..7cfe14e5 100644 --- a/database/migrations/task2/2021_11_09_075928_add_surname_to_users_table.php +++ b/database/migrations/task2/2021_11_09_075928_add_surname_to_users_table.php @@ -29,6 +29,7 @@ public function down() { Schema::table('users', function (Blueprint $table) { // + $table->dropColumn('surname'); }); } } From 9b1dc0a1b80cd75bdb8f3b995d1daca6be875580 Mon Sep 17 00:00:00 2001 From: OhmygoodR <109280933+OhmygoodR@users.noreply.github.com> Date: Fri, 25 Oct 2024 23:03:40 +0800 Subject: [PATCH 08/13] Update 2021_11_09_083225_recreate_users_table.php --- .../task5/2021_11_09_083225_recreate_users_table.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/database/migrations/task5/2021_11_09_083225_recreate_users_table.php b/database/migrations/task5/2021_11_09_083225_recreate_users_table.php index 6b15a7c6..d1eefcbf 100644 --- a/database/migrations/task5/2021_11_09_083225_recreate_users_table.php +++ b/database/migrations/task5/2021_11_09_083225_recreate_users_table.php @@ -14,6 +14,9 @@ class RecreateUsersTable extends Migration public function up() { // TASK: add an if-statement in this file to NOT create table if it already exists + if(Schema::hasTable('users')){ + return; + } Schema::create('users', function (Blueprint $table) { $table->id(); $table->string('name'); From 971efd3e714dd0713e389afc7b655324ac82fa34 Mon Sep 17 00:00:00 2001 From: OhmygoodR <109280933+OhmygoodR@users.noreply.github.com> Date: Fri, 25 Oct 2024 23:04:24 +0800 Subject: [PATCH 09/13] Update 2021_11_09_083843_create_companies_table.php --- .../task6/2021_11_09_083843_create_companies_table.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/migrations/task6/2021_11_09_083843_create_companies_table.php b/database/migrations/task6/2021_11_09_083843_create_companies_table.php index 9554406a..360998bb 100644 --- a/database/migrations/task6/2021_11_09_083843_create_companies_table.php +++ b/database/migrations/task6/2021_11_09_083843_create_companies_table.php @@ -16,7 +16,7 @@ public function up() // TASK: edit this migration so there couldn't be two companies with the same name Schema::create('companies', function (Blueprint $table) { $table->id(); - $table->string('name'); + $table->string('name')->unique(); $table->timestamps(); }); } From 9dfce099131e57b8bc88067942fed604f7421013 Mon Sep 17 00:00:00 2001 From: OhmygoodR <109280933+OhmygoodR@users.noreply.github.com> Date: Fri, 25 Oct 2024 23:04:55 +0800 Subject: [PATCH 10/13] Update 2021_11_09_084922_create_new_companies_table.php --- .../task7/2021_11_09_084922_create_new_companies_table.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/migrations/task7/2021_11_09_084922_create_new_companies_table.php b/database/migrations/task7/2021_11_09_084922_create_new_companies_table.php index 868a2422..36bf0166 100644 --- a/database/migrations/task7/2021_11_09_084922_create_new_companies_table.php +++ b/database/migrations/task7/2021_11_09_084922_create_new_companies_table.php @@ -17,7 +17,7 @@ public function up() // its automatic value of name would be "My company" Schema::create('companies', function (Blueprint $table) { $table->id(); - $table->string('name'); + $table->string('name')->default('My company'); $table->timestamps(); }); } From af4799194e5a140cf0b60a9d85bdf18a472aea08 Mon Sep 17 00:00:00 2001 From: OhmygoodR <109280933+OhmygoodR@users.noreply.github.com> Date: Fri, 25 Oct 2024 23:06:04 +0800 Subject: [PATCH 11/13] Update 2021_11_09_085453_rename_companies_table.php --- .../task8/2021_11_09_085453_rename_companies_table.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/database/migrations/task8/2021_11_09_085453_rename_companies_table.php b/database/migrations/task8/2021_11_09_085453_rename_companies_table.php index dc4ae6f2..1f09456b 100644 --- a/database/migrations/task8/2021_11_09_085453_rename_companies_table.php +++ b/database/migrations/task8/2021_11_09_085453_rename_companies_table.php @@ -14,6 +14,7 @@ class RenameCompaniesTable extends Migration public function up() { // TASK: add a migration to rename table "company" into "companies" + Schema::rename('company','companies'); } /** @@ -24,5 +25,6 @@ public function up() public function down() { // + Schema::rename('companies','company'); } } From fc6979676e4edc80b53e367e0c48a6a5fa734bd1 Mon Sep 17 00:00:00 2001 From: OhmygoodR <109280933+OhmygoodR@users.noreply.github.com> Date: Fri, 25 Oct 2024 23:06:59 +0800 Subject: [PATCH 12/13] Update 2021_11_09_090018_rename_name_in_companies_table.php --- .../task9/2021_11_09_090018_rename_name_in_companies_table.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/database/migrations/task9/2021_11_09_090018_rename_name_in_companies_table.php b/database/migrations/task9/2021_11_09_090018_rename_name_in_companies_table.php index f270c9e7..f782c2d8 100644 --- a/database/migrations/task9/2021_11_09_090018_rename_name_in_companies_table.php +++ b/database/migrations/task9/2021_11_09_090018_rename_name_in_companies_table.php @@ -16,6 +16,7 @@ public function up() // TASK: write the migration to rename the column "title" into "name" Schema::table('companies', function (Blueprint $table) { // Write code here + $table->renameColumn('title','name'); }); } @@ -28,6 +29,7 @@ public function down() { Schema::table('companies', function (Blueprint $table) { // + $table->renameColumn('name','title'); }); } } From 247555aec52ef2a27c387d9a2eea7cdd30477ef9 Mon Sep 17 00:00:00 2001 From: OhmygoodR <109280933+OhmygoodR@users.noreply.github.com> Date: Fri, 25 Oct 2024 23:07:42 +0800 Subject: [PATCH 13/13] Update 2021_11_09_090858_create_visitors_table.php --- .../task10/2021_11_09_090858_create_visitors_table.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/migrations/task10/2021_11_09_090858_create_visitors_table.php b/database/migrations/task10/2021_11_09_090858_create_visitors_table.php index 7a53968c..08e7516e 100644 --- a/database/migrations/task10/2021_11_09_090858_create_visitors_table.php +++ b/database/migrations/task10/2021_11_09_090858_create_visitors_table.php @@ -16,7 +16,7 @@ public function up() // TASK: edit this migration so country_id would allow NULL values Schema::create('visitors', function (Blueprint $table) { $table->id(); - $table->foreignId('country_id')->constrained(); + $table->foreignId('country_id')->nullable()->constrained(); $table->string('ip_address'); $table->timestamps(); });