diff options
| author | Erik Johnston <erik@matrix.org> | 2019-12-11 17:01:41 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-12-11 17:01:41 +0000 |
| commit | 6828b47c459ea15d2815fe880616aa260a546838 (patch) | |
| tree | bdcc359e06bd7f7f977c976fe1d770bd708b0f55 /synapse/storage/_base.py | |
| parent | Newsfile (diff) | |
| parent | Add `include_event_in_state` to _get_state_for_room (#6521) (diff) | |
| download | synapse-6828b47c459ea15d2815fe880616aa260a546838.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/initial_sync_asnyc
Diffstat (limited to 'synapse/storage/_base.py')
| -rw-r--r-- | synapse/storage/_base.py | 4 |
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): |