Merge branch 'master' into sliderbouncers

2026-05-16 17:03:01 +08:00 · 2017-10-22 16:03:40 +09:00
parent ad685bd919 6de037127d
commit 208f4cfbbc
1 changed files with 4 additions and 2 deletions
@@ -180,13 +180,15 @@ namespace osu.Game.Database
        {
            try
            {
-                // will fail if EF hasn't touched the database yet.
-                Database.ExecuteSqlCommand("SELECT * FROM __EFMigrationsHistory LIMIT 1");
+                // will fail if the database isn't in a sane EF-migrated state.
+                Database.ExecuteSqlCommand("SELECT MetadataID FROM BeatmapSetInfo LIMIT 1");
            }
            catch
            {
                try
                {
+                    Database.ExecuteSqlCommand("DROP TABLE IF EXISTS __EFMigrationsHistory");
+
                    // will fail (intentionally) if we don't have sqlite-net data present.
                    Database.ExecuteSqlCommand("SELECT OnlineBeatmapSetId FROM BeatmapMetadata LIMIT 1");