diff options
author | Hubert Chathi <hubert@uhoreg.ca> | 2019-11-27 15:33:29 -0500 |
---|---|---|
committer | Hubert Chathi <hubert@uhoreg.ca> | 2019-11-27 15:33:29 -0500 |
commit | a2a3f758247c41037d161668c61d8d7a526ecfc1 (patch) | |
tree | dcf387073cfbc7672cb7fbd27682925fa1ba3d73 /synapse/app/federation_sender.py | |
parent | apply suggestions from review (diff) | |
parent | Add more tests to the worker blacklist (#6429) (diff) | |
download | synapse-a2a3f758247c41037d161668c61d8d7a526ecfc1.tar.xz |
Merge branch 'develop' into uhoreg/e2e_backup_hash
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() |