diff options
author | Brendan Abolivier <babolivier@matrix.org> | 2019-11-26 10:53:48 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-11-26 10:53:48 +0000 |
commit | 4c1b799e1b9f8e04f6cd86a0977e28685ac20aea (patch) | |
tree | fcaea2671bf38721520191c13bb37adf18ef84c5 /synapse/app/federation_sender.py | |
parent | Format changelog (diff) | |
parent | Make sure that we close cursors before returning from a query (#6408) (diff) | |
download | synapse-4c1b799e1b9f8e04f6cd86a0977e28685ac20aea.tar.xz |
Merge branch 'develop' into babolivier/context_filters
Diffstat (limited to 'synapse/app/federation_sender.py')
-rw-r--r-- | synapse/app/federation_sender.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/app/federation_sender.py b/synapse/app/federation_sender.py index 139221ad34..448e45e00f 100644 --- a/synapse/app/federation_sender.py +++ b/synapse/app/federation_sender.py @@ -69,7 +69,7 @@ class FederationSenderSlaveStore( self.federation_out_pos_startup = self._get_federation_out_pos(db_conn) def _get_federation_out_pos(self, db_conn): - sql = "SELECT stream_id FROM federation_stream_position" " WHERE type = ?" + sql = "SELECT stream_id FROM federation_stream_position WHERE type = ?" sql = self.database_engine.convert_param_style(sql) txn = db_conn.cursor() |