This repository was archived by the owner on Apr 26, 2024. It is now read-only.
Fix guest -> real account upgrade with account validity enabled#6359
Merged
anoadragon453 merged 5 commits intodevelopfrom Nov 14, 2019
Merged
Fix guest -> real account upgrade with account validity enabled#6359anoadragon453 merged 5 commits intodevelopfrom
anoadragon453 merged 5 commits intodevelopfrom
Conversation
Member
Author
|
Won't pass til develop is fixed :') Edit: And fixed! |
…ert_validity * 'develop' of github.com:matrix-org/synapse: Blacklist PurgeRoomTestCase (#6361) Set room version default to 5
babolivier
pushed a commit
that referenced
this pull request
Sep 1, 2021
* commit '745a48625': Fix guest -> real account upgrade with account validity enabled (#6359)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
When enabling account validity on sytest, I noticed the test "Guest user can upgrade to fully featured user" broke. This was due to this user being registered once as a guest, then again as a real user. This failed when account validity was enabled however, as inserting into the
account_validitytable setsuser_idas a unique column, and we were trying to insert the same thing into two rows.I've changed the insert to an upsert, which still makes sense and doesn't crash in this edge case.