summary refs log tree commit diff
path: root/synapse/storage/databases/main
diff options
context:
space:
mode:
authorJason Robinson <jasonr@matrix.org>2021-01-26 10:13:35 +0200
committerGitHub <noreply@github.com>2021-01-26 10:13:35 +0200
commite20f18a76680bc16fd8299a61dd81dc07f1a3ffd (patch)
tree607d7e63dd28980bfd6b07c71840b60929056522 /synapse/storage/databases/main
parentMerge remote-tracking branch 'origin/develop' into jaywink/admin-forward-extr... (diff)
downloadsynapse-e20f18a76680bc16fd8299a61dd81dc07f1a3ffd.tar.xz
Make natural join inner join
Co-authored-by: Erik Johnston <erik@matrix.org>
Diffstat (limited to 'synapse/storage/databases/main')
-rw-r--r--synapse/storage/databases/main/events_forward_extremities.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/storage/databases/main/events_forward_extremities.py b/synapse/storage/databases/main/events_forward_extremities.py
index 84aaa919fb..68b64838bb 100644
--- a/synapse/storage/databases/main/events_forward_extremities.py
+++ b/synapse/storage/databases/main/events_forward_extremities.py
@@ -88,8 +88,8 @@ class EventForwardExtremitiesStore(SQLBaseStore):
             sql = """
                 SELECT event_id, state_group, depth, received_ts
                 FROM event_forward_extremities
-                NATURAL JOIN event_to_state_groups
-                NATURAL JOIN events
+                INNER JOIN event_to_state_groups USING (event_id)
+                INNER JOIN events INNER JOIN USING (event_id)
                 WHERE room_id = ?
             """