summary refs log tree commit diff
path: root/synapse/app/user_dir.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-03-19 16:28:41 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2020-03-19 16:28:41 +0000
commit237f3fe187ad54d0f73927324ed6f7bcf6e9ed1f (patch)
treef9e0d53e0fd03cf2dcbc66dfdd73f768ae261ca4 /synapse/app/user_dir.py
parentMerge pull request #6470 from matrix-org/babolivier/port_db_ci_failure (diff)
parentMerge pull request #6464 from matrix-org/erikj/make_public_sql_base (diff)
downloadsynapse-237f3fe187ad54d0f73927324ed6f7bcf6e9ed1f.tar.xz
Merge pull request #6464 from matrix-org/erikj/make_public_sql_base
* commit 'ddbbfc951':
  Newsfile
  Remove underscore from SQLBaseStore functions
  Don't call SQLBaseStore methods from outside stores
Diffstat (limited to 'synapse/app/user_dir.py')
-rw-r--r--synapse/app/user_dir.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/app/user_dir.py b/synapse/app/user_dir.py

index 6cb100319f..0fa2b50999 100644 --- a/synapse/app/user_dir.py +++ b/synapse/app/user_dir.py
@@ -64,7 +64,7 @@ class UserDirectorySlaveStore( super(UserDirectorySlaveStore, self).__init__(db_conn, hs) events_max = self._stream_id_gen.get_current_token() - curr_state_delta_prefill, min_curr_state_delta_id = self._get_cache_dict( + curr_state_delta_prefill, min_curr_state_delta_id = self.get_cache_dict( db_conn, "current_state_delta_stream", entity_column="room_id",