Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2024-12-23 05:49:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix ambiguous column name that would prevent use of MSC2716 History Import when using Postgres as a database. (#12843)

Browse Source
This commit is contained in:
reivilibre 2022-05-26 12:19:01 +01:00 committed by GitHub
parent 1885ee0113
commit e768644368
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/12843.bugfix Normal file
View File

@ -0,0 +1 @@
Fix bug where servers using a Postgres database would fail to backfill from an insertion event when MSC2716 is enabled (`experimental_features.msc2716_enabled`).

2
synapse/storage/databases/main/event_federation.py
View File

@ -1057,7 +1057,7 @@ class EventFederationWorkerStore(SignatureWorkerStore, EventsWorkerStore, SQLBas
INNER JOIN batch_events AS c INNER JOIN batch_events AS c
ON i.next_batch_id = c.batch_id ON i.next_batch_id = c.batch_id
/* Get the depth of the batch start event from the events table */ /* Get the depth of the batch start event from the events table */
INNER JOIN events AS e USING (event_id) INNER JOIN events AS e ON c.event_id = e.event_id
/* Find an insertion event which matches the given event_id */ /* Find an insertion event which matches the given event_id */
WHERE i.event_id = ? WHERE i.event_id = ?
LIMIT ? LIMIT ?