summary refs log tree commit diff
path: root/synapse/storage/_base.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-12-09 13:53:21 +0000
committerGitHub <noreply@github.com>2019-12-09 13:53:21 +0000
commit30e9adf32f7db9aa44693876d33692bf4590d363 (patch)
tree9b83e1dc2eeefaafe8eca4e5b95cffdf8572b346 /synapse/storage/_base.py
parentMerge pull request #6493 from matrix-org/erikj/invite_state_config (diff)
parentFix comment (diff)
downloadsynapse-30e9adf32f7db9aa44693876d33692bf4590d363.tar.xz
Merge pull request #6487 from matrix-org/erikj/pass_in_db
Pass in Database object to data stores.
Diffstat (limited to 'synapse/storage/_base.py')
-rw-r--r--synapse/storage/_base.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/storage/_base.py b/synapse/storage/_base.py
index b7e27d4e97..b7637b5dc0 100644
--- a/synapse/storage/_base.py
+++ b/synapse/storage/_base.py
@@ -37,11 +37,11 @@ class SQLBaseStore(object):
     per data store (and not one per physical database).
     """
 
-    def __init__(self, db_conn, hs):
+    def __init__(self, database: Database, db_conn, hs):
         self.hs = hs
         self._clock = hs.get_clock()
         self.database_engine = hs.database_engine
-        self.db = Database(hs)  # In future this will be passed in
+        self.db = database
         self.rand = random.SystemRandom()
 
     def _invalidate_state_caches(self, room_id, members_changed):