summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2016-04-29 19:28:56 +0100
committerDavid Baker <dave@matrix.org>2016-04-29 19:28:56 +0100
commitb0a1036d93eaec50839c95bf0dc621826342ea62 (patch)
tree3406b023a1c85739ea2f6653f663d5744b522ee3 /synapse
parentOops, actually specify the user id (diff)
downloadsynapse-b0a1036d93eaec50839c95bf0dc621826342ea62.tar.xz
Use explicit join
Diffstat (limited to 'synapse')
-rw-r--r--synapse/storage/event_push_actions.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/storage/event_push_actions.py b/synapse/storage/event_push_actions.py

index 974ceb3389..b710101b15 100644 --- a/synapse/storage/event_push_actions.py +++ b/synapse/storage/event_push_actions.py
@@ -127,9 +127,9 @@ class EventPushActionsStore(SQLBaseStore): " FROM events" " NATURAL JOIN receipts_linearized WHERE receipt_type = 'm.read'" " GROUP BY room_id, user_id" - ") AS rl " - "NATURAL JOIN events e " - "WHERE" + ") AS rl" + " INNER JOIN events AS e USING (room_id, event_id)" + " WHERE" " ep.room_id = rl.room_id" " AND (" " ep.topological_ordering > rl.topological_ordering"