mirror of
https://mau.dev/maunium/synapse.git
synced 2024-12-15 12:53:51 +01:00
Merge remote-tracking branch 'origin/release-v1.26.0' into develop
This commit is contained in:
commit
939ef657ce
3 changed files with 20 additions and 1 deletions
1
changelog.d/9195.bugfix
Normal file
1
changelog.d/9195.bugfix
Normal file
|
@ -0,0 +1 @@
|
||||||
|
Fix receipts or account data not being sent down sync. Introduced in v1.26.0rc1.
|
|
@ -0,0 +1,18 @@
|
||||||
|
/* Copyright 2021 The Matrix.org Foundation C.I.C
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
-- We incorrectly populated these, so we delete them and let the
|
||||||
|
-- MultiWriterIdGenerator repopulate it.
|
||||||
|
DELETE FROM stream_positions WHERE stream_name = 'receipts' OR stream_name = 'account_data';
|
|
@ -180,7 +180,7 @@ class PostgresSequenceGenerator(SequenceGenerator):
|
||||||
if max_in_stream_positions and max_in_stream_positions > last_value:
|
if max_in_stream_positions and max_in_stream_positions > last_value:
|
||||||
raise IncorrectDatabaseSetup(
|
raise IncorrectDatabaseSetup(
|
||||||
_INCONSISTENT_STREAM_ERROR
|
_INCONSISTENT_STREAM_ERROR
|
||||||
% {"seq": self._sequence_name, "stream": stream_name}
|
% {"seq": self._sequence_name, "stream_name": stream_name}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue