sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-04 07:06:35 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix incorrect initial migration

Browse Source 
Also adds variant to settings
This commit is contained in:
Dean Herbert
2018-01-25 23:41:03 +09:00
parent 45e8a2b69b
commit 03154dbc63
12 changed files with 40 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Configuration/DatabasedConfigManager.cs
View File

@ -17,12 +17,12 @@ namespace osu.Game.Configuration
private readonly RulesetInfo ruleset;
protected DatabasedConfigManager(SettingsStore settings, RulesetInfo ruleset = null)
protected DatabasedConfigManager(SettingsStore settings, RulesetInfo ruleset = null, int variant = 0)
{
this.settings = settings;
this.ruleset = ruleset;
databasedSettings = settings.Query(ruleset?.ID);
databasedSettings = settings.Query(ruleset?.ID, variant);
InitialiseDefaults();
}

2
osu.Game/Configuration/DatabasedSetting.cs
View File

@ -14,6 +14,8 @@ namespace osu.Game.Configuration
public int? RulesetID { get; set; }
public int? Variant { get; set; }
[Column("Key")]
public int IntKey
{

4
osu.Game/Configuration/SettingsStore.cs
View File

@ -23,8 +23,8 @@ namespace osu.Game.Configuration
/// <param name="rulesetId">The ruleset's internal ID.</param>
/// <param name="variant">An optional variant.</param>
/// <returns></returns>
public List<DatabasedSetting> Query(int? rulesetId = null) =>
GetContext().DatabasedSetting.Where(b => b.RulesetID == rulesetId).ToList();
public List<DatabasedSetting> Query(int? rulesetId = null, int? variant = null) =>
GetContext().DatabasedSetting.Where(b => b.RulesetID == rulesetId && b.Variant == variant).ToList();
public void Update(DatabasedSetting setting)
{