Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix SQL

This commit is contained in:
Brendan Abolivier 2020-06-11 18:25:25 +01:00
parent 34fd1f7ab5
commit 803291728c
No known key found for this signature in database
GPG Key ID: 1E015C145F1916CD
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
synapse/storage/data_stores/main/event_push_actions.py
View File

@ -843,7 +843,7 @@ class EventPushActionsStore(EventPushActionsWorkerStore):
upd.stream_ordering, upd.stream_ordering,
old.user_id old.user_id
FROM ( FROM (
SELECT user_id, room_id, count(*) as unread_count, SELECT user_id, room_id, count(*) as %s,
max(stream_ordering) as stream_ordering max(stream_ordering) as stream_ordering
FROM event_push_actions FROM event_push_actions
WHERE ? <= stream_ordering AND stream_ordering < ? WHERE ? <= stream_ordering AND stream_ordering < ?
@ -856,14 +856,14 @@ class EventPushActionsStore(EventPushActionsWorkerStore):
# First get the count of unread messages. # First get the count of unread messages.
txn.execute( txn.execute(
sql % ("unread_count", "unread_count", ""), sql % ("unread_count", "unread_count", "unread_count", ""),
(old_rotate_stream_ordering, rotate_to_stream_ordering), (old_rotate_stream_ordering, rotate_to_stream_ordering),
) )
rows = txn.fetchall() rows = txn.fetchall()
# Then get the count of notifications. # Then get the count of notifications.
txn.execute( txn.execute(
sql % ("notify_count", "notify_count", "notif = 1"), sql % ("notif_count", "notif_count", "notif_count", "AND notif = 1"),
(old_rotate_stream_ordering, rotate_to_stream_ordering), (old_rotate_stream_ordering, rotate_to_stream_ordering),
) )
notif_rows = txn.fetchall() notif_rows = txn.fetchall()