summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2016-03-30 16:20:07 +0100
committerMark Haines <mark.haines@matrix.org>2016-03-30 16:20:07 +0100
commit8b8052909f5352e55998b8c7fbb26a8274e75366 (patch)
tree59f73b0a5926c079908b5108077f7385a83c8e54 /synapse
parentAdd a replication stream for state groups (diff)
downloadsynapse-8b8052909f5352e55998b8c7fbb26a8274e75366.tar.xz
return the state_group for backfill
Diffstat (limited to 'synapse')
-rw-r--r--synapse/storage/events.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/storage/events.py b/synapse/storage/events.py
index a4b8995496..e0ef7f46b2 100644
--- a/synapse/storage/events.py
+++ b/synapse/storage/events.py
@@ -1114,7 +1114,8 @@ class EventsStore(SQLBaseStore):
                 new_forward_events = []
 
             sql = (
-                "SELECT -e.stream_ordering, ej.internal_metadata, ej.json"
+                "SELECT -e.stream_ordering, ej.internal_metadata, ej.json,"
+                " eg.state_group"
                 " FROM events as e"
                 " JOIN event_json as ej"
                 " ON e.event_id = ej.event_id AND e.room_id = ej.room_id"