diff options
| author | Neil Alexander <neilalexander@users.noreply.github.com> | 2021-02-17 15:18:41 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-17 15:18:41 +0000 |
| commit | c9f305f254ad9c02427c96d77632441eed16dbde (patch) | |
| tree | be8eb547a165a81d0e608163a78d774b7e2e581a /syncapi | |
| parent | 8b5cd256cbd473822dc358b958f17c3a381b32c5 (diff) | |
Don't exclude an event from sync if it was previously not excluded (#1767)
Diffstat (limited to 'syncapi')
| -rw-r--r-- | syncapi/storage/postgres/output_room_events_table.go | 2 | ||||
| -rw-r--r-- | syncapi/storage/sqlite3/output_room_events_table.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/syncapi/storage/postgres/output_room_events_table.go b/syncapi/storage/postgres/output_room_events_table.go index 28668de0..bd7aa018 100644 --- a/syncapi/storage/postgres/output_room_events_table.go +++ b/syncapi/storage/postgres/output_room_events_table.go @@ -75,7 +75,7 @@ const insertEventSQL = "" + "INSERT INTO syncapi_output_room_events (" + "room_id, event_id, headered_event_json, type, sender, contains_url, add_state_ids, remove_state_ids, session_id, transaction_id, exclude_from_sync" + ") VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11) " + - "ON CONFLICT ON CONSTRAINT syncapi_event_id_idx DO UPDATE SET exclude_from_sync = $11 " + + "ON CONFLICT ON CONSTRAINT syncapi_event_id_idx DO UPDATE SET exclude_from_sync = (excluded.exclude_from_sync AND $11) " + "RETURNING id" const selectEventsSQL = "" + diff --git a/syncapi/storage/sqlite3/output_room_events_table.go b/syncapi/storage/sqlite3/output_room_events_table.go index 3c70a499..37f7ea00 100644 --- a/syncapi/storage/sqlite3/output_room_events_table.go +++ b/syncapi/storage/sqlite3/output_room_events_table.go @@ -54,7 +54,7 @@ const insertEventSQL = "" + "INSERT INTO syncapi_output_room_events (" + "id, room_id, event_id, headered_event_json, type, sender, contains_url, add_state_ids, remove_state_ids, session_id, transaction_id, exclude_from_sync" + ") VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12) " + - "ON CONFLICT (event_id) DO UPDATE SET exclude_from_sync = $13" + "ON CONFLICT (event_id) DO UPDATE SET exclude_from_sync = (excluded.exclude_from_sync AND $13)" const selectEventsSQL = "" + "SELECT event_id, id, headered_event_json, session_id, exclude_from_sync, transaction_id FROM syncapi_output_room_events WHERE event_id = $1" |