summary refs log tree commit diff
path: root/synapse/storage/databases
diff options
context:
space:
mode:
authorJason Robinson <jasonr@matrix.org>2021-01-26 10:21:02 +0200
committerJason Robinson <jasonr@matrix.org>2021-01-26 10:21:02 +0200
commit4936fc59fcf23582c940cb1cbf4286039b3504de (patch)
tree94e3fec3cd3d4b712272e4b57c089bb313188c5d /synapse/storage/databases
parentMerge branch 'develop' into jaywink/admin-forward-extremities (diff)
downloadsynapse-4936fc59fcf23582c940cb1cbf4286039b3504de.tar.xz
Fix get forward extremities query
Signed-off-by: Jason Robinson <jasonr@matrix.org>
Diffstat (limited to 'synapse/storage/databases')
-rw-r--r--synapse/storage/databases/main/events_forward_extremities.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/databases/main/events_forward_extremities.py b/synapse/storage/databases/main/events_forward_extremities.py
index 68b64838bb..0ac1da9c35 100644
--- a/synapse/storage/databases/main/events_forward_extremities.py
+++ b/synapse/storage/databases/main/events_forward_extremities.py
@@ -89,7 +89,7 @@ class EventForwardExtremitiesStore(SQLBaseStore):
                 SELECT event_id, state_group, depth, received_ts
                 FROM event_forward_extremities
                 INNER JOIN event_to_state_groups USING (event_id)
-                INNER JOIN events INNER JOIN USING (event_id)
+                INNER JOIN events USING (room_id, event_id)
                 WHERE room_id = ?
             """