From 765d9cfae1c38e09fba32e3ab667f6f40651d63f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 12 Jan 2021 17:01:40 +0900
Subject: [PATCH] Use direct access for query pattern

---
 .../Database/TestRealmKeyBindingStore.cs          |  2 --
 .../Bindings/DatabasedKeyBindingContainer.cs      | 15 ++++++++++++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Database/TestRealmKeyBindingStore.cs b/osu.Game.Tests/Database/TestRealmKeyBindingStore.cs
index d8eb3a9906..3402b95739 100644
--- a/osu.Game.Tests/Database/TestRealmKeyBindingStore.cs
+++ b/osu.Game.Tests/Database/TestRealmKeyBindingStore.cs
@@ -6,13 +6,11 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using NUnit.Framework;
-using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Platform;
 using osu.Game.Database;
 using osu.Game.Input;
 using osu.Game.Input.Bindings;
-using osuTK.Input;
 
 namespace osu.Game.Tests.Database
 {
diff --git a/osu.Game/Input/Bindings/DatabasedKeyBindingContainer.cs b/osu.Game/Input/Bindings/DatabasedKeyBindingContainer.cs
index 48cab674ca..03da76b330 100644
--- a/osu.Game/Input/Bindings/DatabasedKeyBindingContainer.cs
+++ b/osu.Game/Input/Bindings/DatabasedKeyBindingContainer.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Input.Bindings;
 using osu.Game.Database;
@@ -24,6 +25,9 @@ namespace osu.Game.Input.Bindings
         [Resolved]
         private RealmKeyBindingStore store { get; set; }
 
+        [Resolved]
+        private RealmContextFactory realmFactory { get; set; }
+
         public override IEnumerable<IKeyBinding> DefaultKeyBindings => ruleset.CreateInstance().GetDefaultKeyBindings(variant ?? 0);
 
         /// <summary>
@@ -64,7 +68,16 @@ namespace osu.Game.Input.Bindings
                 // fallback to defaults instead.
                 KeyBindings = DefaultKeyBindings;
             else
-                KeyBindings = store.Query(ruleset?.ID, variant).Detach();
+            {
+                var rulesetId = ruleset?.ID;
+
+                // #1
+                KeyBindings = store.Query(rulesetId, variant).Detach();
+
+                // #2 (Clearly shows lifetime of realm context access)
+                using (var realm = realmFactory.Get())
+                    KeyBindings = realm.All<RealmKeyBinding>().Where(b => b.RulesetID == rulesetId && b.Variant == variant).Detach();
+            }
         }
     }
 }