h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 09:07:25 +08:00
Code Issues Releases Wiki Activity

Rely on storage.DeleteDatabase for guaranteed database deletion

Browse Source 
Relies on https://github.com/ppy/osu-framework/pull/1100 being merged for most effectiveness.
This commit is contained in:
Dean Herbert 2017-10-21 00:15:02 +09:00
parent b805174143
commit 47213d2498
2 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
osu.Game/Database/DatabaseContextFactory.cs
View File

@ -9,11 +9,19 @@ namespace osu.Game.Database
{ {
private readonly GameHost host; private readonly GameHost host;
private const string database_name = @"client";
public DatabaseContextFactory(GameHost host) public DatabaseContextFactory(GameHost host)
{ {
this.host = host; this.host = host;
} }
public OsuDbContext GetContext() => new OsuDbContext(host.Storage.GetDatabaseConnectionString(@"client")); public OsuDbContext GetContext() => new OsuDbContext(host.Storage.GetDatabaseConnectionString(database_name));
public void ResetDatabase()
{
// todo: we probably want to make sure there are no active contexts before performing this operation.
host.Storage.DeleteDatabase(database_name);
}
} }
} }

18
osu.Game/OsuGameBase.cs
View File

@ -177,22 +177,8 @@ namespace osu.Game
// if we failed, let's delete the database and start fresh. // if we failed, let's delete the database and start fresh.
// todo: we probably want a better (non-destructive) migrations/recovery process at a later point than this. // todo: we probably want a better (non-destructive) migrations/recovery process at a later point than this.
int retries = 20; contextFactory.ResetDatabase();
while (retries-- > 0) Logger.Log("Database purged successfully.", LoggingTarget.Database, LogLevel.Important);
{
try
{
using (var context = contextFactory.GetContext())
{
context.Database.EnsureDeleted();
Logger.Log("Database purged successfully.", LoggingTarget.Database, LogLevel.Important);
break;
}
}
catch
{
}
}
using (var context = contextFactory.GetContext()) using (var context = contextFactory.GetContext())
context.Migrate(); context.Migrate();