diff options
| author | Erik Johnston <erik@matrix.org> | 2017-03-29 10:57:19 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-03-29 10:57:19 +0100 |
| commit | 4ad613f6be7211edf4b39d7b031bc7d2947d8297 (patch) | |
| tree | d3e1835e7d3f5694098d06b093edcf2cd7d0e60f /synapse/storage/room.py | |
| parent | Correctly look up key (diff) | |
| parent | Merge pull request #2037 from ricco386/fix_readme_centos_issues (diff) | |
| download | synapse-4ad613f6be7211edf4b39d7b031bc7d2947d8297.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/e2e_one_time_upsert
Diffstat (limited to 'synapse/storage/room.py')
| -rw-r--r-- | synapse/storage/room.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/storage/room.py b/synapse/storage/room.py index 8a2fe2fdf5..e4c56cc175 100644 --- a/synapse/storage/room.py +++ b/synapse/storage/room.py @@ -396,7 +396,7 @@ class RoomStore(SQLBaseStore): sql % ("AND appservice_id IS NULL",), (stream_id,) ) - return dict(txn.fetchall()) + return dict(txn) else: # We want to get from all lists, so we need to aggregate the results @@ -422,7 +422,7 @@ class RoomStore(SQLBaseStore): results = {} # A room is visible if its visible on any list. - for room_id, visibility in txn.fetchall(): + for room_id, visibility in txn: results[room_id] = bool(visibility) or results.get(room_id, False) return results |