summary refs log tree commit diff
path: root/synapse/storage/databases/main/events.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-10-20 17:51:52 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2020-10-20 17:51:52 +0100
commitd7fd0deaf1a7396ddb960528d01ddde192c1605c (patch)
tree0565258d8ba6609d39b8f272493926a82eeee906 /synapse/storage/databases/main/events.py
parentMerge commit '0d4f614fd' into anoa/dinsic_release_1_21_x (diff)
parentAdd StreamStore to mypy (#8232) (diff)
downloadsynapse-d7fd0deaf1a7396ddb960528d01ddde192c1605c.tar.xz
Merge commit '112266eaf' into anoa/dinsic_release_1_21_x
* commit '112266eaf':
  Add StreamStore to mypy (#8232)
  Re-implement unread counts (again) (#8059)
Diffstat (limited to 'synapse/storage/databases/main/events.py')
-rw-r--r--synapse/storage/databases/main/events.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/storage/databases/main/events.py b/synapse/storage/databases/main/events.py

index 46b11e705b..b94fe7ac17 100644 --- a/synapse/storage/databases/main/events.py +++ b/synapse/storage/databases/main/events.py
@@ -1298,9 +1298,9 @@ class PersistEventsStore: sql = """ INSERT INTO event_push_actions ( room_id, event_id, user_id, actions, stream_ordering, - topological_ordering, notif, highlight + topological_ordering, notif, highlight, unread ) - SELECT ?, event_id, user_id, actions, ?, ?, notif, highlight + SELECT ?, event_id, user_id, actions, ?, ?, notif, highlight, unread FROM event_push_actions_staging WHERE event_id = ? """