Merge pull request #10454 from NiceAesth/laravel-10-migrations

Remove `doctrine/dbal` and fix migration improper column types
ppy · Aug 16, 2023 · 5ba12c5 · 5ba12c5
2 parents d81acd8 + c19f0a4
commit 5ba12c5
Show file tree

Hide file tree

Showing 11 changed files with 43 additions and 389 deletions.
diff --git a/composer.json b/composer.json
@@ -17,7 +17,6 @@
   "require": {
     "anhskohbo/no-captcha": "^3.2",
     "chaseconey/laravel-datadog-helper": ">=1.2.0",
-    "doctrine/dbal": "^3.1",
     "egulias/email-validator": "*",
     "elasticsearch/elasticsearch": "^7.12.0",
     "ezyang/htmlpurifier": "*",

diff --git a/composer.lock b/composer.lock
diff --git a/database/migrations/2016_05_10_080557_update_achievements_table.php b/database/migrations/2016_05_10_080557_update_achievements_table.php
@@ -30,8 +30,9 @@ public function up()
             $table->string('image', 50)->nullable()->change();
         });
 
-        // DBAL, which is used to execute `change()`, doesn't support `mediumInteger`.
-        DB::statement('ALTER TABLE osu_achievements MODIFY achievement_id MEDIUMINT UNSIGNED NOT NULL');
+        Schema::table('osu_achievements', function ($table) {
+            $table->mediumInteger('achievement_id')->unsigned()->change();
+        });
     }
 
     /**
@@ -47,7 +48,8 @@ public function down()
             $table->string('image', 50)->change();
         });
 
-        // `mediumIncrements` requires unsupported `mediumInteger`.
+        // Laravel mediumIncrements() always specifies primary key, causing conflicts.
+
         DB::statement('ALTER TABLE osu_achievements MODIFY achievement_id MEDIUMINT UNSIGNED NOT NULL AUTO_INCREMENT');
     }
 }
diff --git a/database/migrations/2017_01_13_062704_nullable_entry_url_on_contest_entries.php b/database/migrations/2017_01_13_062704_nullable_entry_url_on_contest_entries.php
@@ -17,7 +17,7 @@ class NullableEntryUrlOnContestEntries extends Migration
     public function up()
     {
         Schema::table('contest_entries', function (Blueprint $table) {
-            $table->string('entry_url')->nullable()->default('NULL')->change();
+            $table->string('entry_url')->nullable()->change();
         });
     }