diff options
| author | Erik Johnston <erik@matrix.org> | 2017-05-30 14:53:01 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-05-30 14:53:01 +0100 |
| commit | 04095f75810176d7ba2b5ef70b40dd1a3281850d (patch) | |
| tree | f7c8cf32dcf88d0b006ae758155014c22a46a798 | |
| parent | Add current_state_delta_stream table (diff) | |
| download | synapse-04095f75810176d7ba2b5ef70b40dd1a3281850d.tar.xz | |
Add clobbered event_id
| -rw-r--r-- | synapse/storage/events.py | 1 | ||||
| -rw-r--r-- | synapse/storage/schema/delta/42/current_state_delta.sql | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/synapse/storage/events.py b/synapse/storage/events.py index c37a2a6f16..dfb57f9d12 100644 --- a/synapse/storage/events.py +++ b/synapse/storage/events.py @@ -749,6 +749,7 @@ class EventsStore(SQLBaseStore): "type": key[0], "state_key": key[1], "event_id": ev_id, + "prev_event_id": to_delete.get(key, None), } for key, ev_id in state_deltas.iteritems() ] diff --git a/synapse/storage/schema/delta/42/current_state_delta.sql b/synapse/storage/schema/delta/42/current_state_delta.sql index 1a55aa912b..bf124f3def 100644 --- a/synapse/storage/schema/delta/42/current_state_delta.sql +++ b/synapse/storage/schema/delta/42/current_state_delta.sql @@ -19,7 +19,8 @@ CREATE TABLE current_state_delta_stream ( room_id TEXT NOT NULL, type TEXT NOT NULL, state_key TEXT NOT NULL, - event_id TEXT -- Is null if the key was removed + event_id TEXT, -- Is null if the key was removed + prev_event_id TEXT ); CREATE INDEX current_state_delta_stream_idx ON current_state_delta_stream(stream_id); |