Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3449 from matrix-org/dbkr/fix_deactivate_account_multiple_pending 

Fix error on deleting users pending deactivation
This commit is contained in:
Matthew Hodgson 2018-06-26 10:59:19 +01:00 committed by GitHub
parent c7f6b420ae 028490afd4
commit c695a8d003
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
synapse/storage/registration.py
View File

@ -623,7 +623,9 @@ class RegistrationStore(RegistrationWorkerStore,
Removes the given user to the table of users who need to be parted from all the Removes the given user to the table of users who need to be parted from all the
rooms they're in, effectively marking that user as fully deactivated. rooms they're in, effectively marking that user as fully deactivated.
""" """
return self._simple_delete_one( # XXX: This should be simple_delete_one but we failed to put a unique index on
# the table, so somehow duplicate entries have ended up in it.
return self._simple_delete(
"users_pending_deactivation", "users_pending_deactivation",
keyvalues={ keyvalues={
"user_id": user_id, "user_id": user_id,