diff options
| author | Erik Johnston <erik@matrix.org> | 2016-09-12 12:43:56 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-09-12 12:43:56 +0100 |
| commit | 0294c14ec43bed0b116c7ff531482539fb713443 (patch) | |
| tree | 4352c56f4e824fcd5ce5f8f0489261b6c3eb3c08 /synapse | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/make_notif... (diff) | |
| download | synapse-0294c14ec43bed0b116c7ff531482539fb713443.tar.xz | |
Add back in query change
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/storage/event_push_actions.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/storage/event_push_actions.py b/synapse/storage/event_push_actions.py index 8632b2f936..40bfe754b5 100644 --- a/synapse/storage/event_push_actions.py +++ b/synapse/storage/event_push_actions.py @@ -361,12 +361,14 @@ class EventPushActionsStore(SQLBaseStore): before_clause += " " before_clause += "AND epa.highlight = 1" + # NB. This assumes event_ids are globally unique since + # it makes the query easier to index sql = ( "SELECT epa.event_id, epa.room_id," " epa.stream_ordering, epa.topological_ordering," " epa.actions, epa.profile_tag, e.received_ts" " FROM event_push_actions epa, events e" - " WHERE epa.room_id = e.room_id AND epa.event_id = e.event_id" + " WHERE epa.event_id = e.event_id" " AND epa.user_id = ? %s" " ORDER BY epa.stream_ordering DESC" " LIMIT ?" |