1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 22:47:25 +08:00

Merge branch 'master' into sliderbouncers

This commit is contained in:
Dean Herbert 2017-10-22 16:03:40 +09:00 committed by GitHub
commit 208f4cfbbc

View File

@ -180,13 +180,15 @@ namespace osu.Game.Database
{ {
try try
{ {
// will fail if EF hasn't touched the database yet. // will fail if the database isn't in a sane EF-migrated state.
Database.ExecuteSqlCommand("SELECT * FROM __EFMigrationsHistory LIMIT 1"); Database.ExecuteSqlCommand("SELECT MetadataID FROM BeatmapSetInfo LIMIT 1");
} }
catch catch
{ {
try try
{ {
Database.ExecuteSqlCommand("DROP TABLE IF EXISTS __EFMigrationsHistory");
// will fail (intentionally) if we don't have sqlite-net data present. // will fail (intentionally) if we don't have sqlite-net data present.
Database.ExecuteSqlCommand("SELECT OnlineBeatmapSetId FROM BeatmapMetadata LIMIT 1"); Database.ExecuteSqlCommand("SELECT OnlineBeatmapSetId FROM BeatmapMetadata LIMIT 1");