Merge pull request #10700 from nanaya/table-aliases

Alias some score tables
ppy · Nov 6, 2023 · 91259f7 · 91259f7
2 parents 02015c2 + 5cd6c7c
commit 91259f7
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 9 deletions.
diff --git a/app/Models/Multiplayer/ScoreLink.php b/app/Models/Multiplayer/ScoreLink.php
@@ -60,7 +60,7 @@ public static function complete(ScoreToken $token, array $params): static
     public $timestamps = false;
 
     protected $primaryKey = 'score_id';
-    protected $table = 'multiplayer_score_links';
+    protected $table = 'multiplayer_playlist_item_scores';
 
     public function playlistItem(): BelongsTo
     {

diff --git a/app/Models/ScoreToken.php b/app/Models/ScoreToken.php
@@ -25,8 +25,6 @@
  */
 class ScoreToken extends Model
 {
-    protected $table = 'solo_score_tokens';
-
     public function beatmap()
     {
         return $this->belongsTo(Beatmap::class, 'beatmap_id');

diff --git a/app/Models/Solo/Score.php b/app/Models/Solo/Score.php
@@ -39,7 +39,6 @@ class Score extends Model implements Traits\ReportableInterface
 
     const PROCESSING_QUEUE = 'osu-queue:score-statistics';
 
-    protected $table = 'solo_scores';
     protected $casts = [
         'data' => ScoreData::class,
         'has_replay' => 'boolean',

diff --git a/app/Models/Solo/ScorePerformance.php b/app/Models/Solo/ScorePerformance.php
@@ -17,5 +17,5 @@ class ScorePerformance extends Model
     public $timestamps = false;
 
     protected $primaryKey = 'score_id';
-    protected $table = 'solo_scores_performance';
+    protected $table = 'score_performance';
 }
diff --git a/database/migrations/2023_10_31_074205_create_score_table_aliases.php b/database/migrations/2023_10_31_074205_create_score_table_aliases.php
@@ -0,0 +1,34 @@
+<?php
+
+// Copyright (c) ppy Pty Ltd <[email protected]>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+declare(strict_types=1);
+
+use Illuminate\Database\Migrations\Migration;
+
+return new class extends Migration
+{
+    private const ALIASES = [
+        'multiplayer_score_links' => 'multiplayer_playlist_item_scores',
+        'solo_score_tokens' => 'score_tokens',
+        'solo_scores' => 'scores',
+        'solo_scores_legacy_id_map' => 'score_legacy_id_map',
+        'solo_scores_performance' => 'score_performance',
+        'solo_scores_process_history' => 'score_process_history',
+    ];
+
+    public function up(): void
+    {
+        foreach (static::ALIASES as $current => $alias) {
+            DB::statement("CREATE VIEW {$alias} AS SELECT * FROM {$current}");
+        }
+    }
+
+    public function down(): void
+    {
+        foreach (static::ALIASES as $alias) {
+            DB::statement("DROP VIEW {$alias}");
+        }
+    }
+};
diff --git a/tests/Controllers/BeatmapsControllerSoloScoresTest.php b/tests/Controllers/BeatmapsControllerSoloScoresTest.php
@@ -166,7 +166,7 @@ public static function tearDownAfterClass(): void
             Genre::truncate();
             Group::truncate();
             Language::truncate();
-            SoloScore::truncate();
+            SoloScore::select()->delete(); // TODO: revert to truncate after the table is actually renamed
             User::truncate();
             UserGroup::truncate();
             UserGroupEvent::truncate();

diff --git a/tests/Jobs/RemoveBeatmapsetSoloScoresTest.php b/tests/Jobs/RemoveBeatmapsetSoloScoresTest.php
@@ -72,8 +72,8 @@ public function testHandle()
             Genre::truncate();
             Group::truncate();
             Language::truncate();
-            Score::truncate();
-            ScorePerformance::truncate();
+            Score::select()->delete(); // TODO: revert to truncate after the table is actually renamed
+            ScorePerformance::select()->delete(); // TODO: revert to truncate after the table is actually renamed
             User::truncate();
             UserGroup::truncate();
             UserGroupEvent::truncate();

diff --git a/tests/Models/Solo/ScoreEsIndexTest.php b/tests/Models/Solo/ScoreEsIndexTest.php
@@ -107,7 +107,7 @@ public static function tearDownAfterClass(): void
             Genre::truncate();
             Group::truncate();
             Language::truncate();
-            Score::truncate();
+            Score::select()->delete(); // TODO: revert to truncate after the table is actually renamed
             User::truncate();
             UserGroup::truncate();
             UserGroupEvent::truncate();