diff options
author | Mark Haines <mark.haines@matrix.org> | 2016-07-08 15:15:55 +0100 |
---|---|---|
committer | Mark Haines <mark.haines@matrix.org> | 2016-07-08 15:15:55 +0100 |
commit | 10c843fcfbd6c3f6bcc13c5b9c71c9007ee54480 (patch) | |
tree | da1db887330329247bfcd375cdc781660234201e /synapse/storage | |
parent | Merge branch 'master' of github.com:matrix-org/synapse into develop (diff) | |
download | synapse-10c843fcfbd6c3f6bcc13c5b9c71c9007ee54480.tar.xz |
Ensure that the guest user is in the database when upgrading accounts
Diffstat (limited to 'synapse/storage')
-rw-r--r-- | synapse/storage/registration.py | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/synapse/storage/registration.py b/synapse/storage/registration.py index 0a68341494..3a675e53f6 100644 --- a/synapse/storage/registration.py +++ b/synapse/storage/registration.py @@ -127,11 +127,24 @@ class RegistrationStore(SQLBaseStore): try: if was_guest: + # Ensure that the guest user actually exists + self._simple_select_one_txn( + txn, + "users", + keyvalues={ + "name": user_id, + "is_guest": 1, + }, + retcols=("name",), + allow_none=False, + ) + self._simple_update_one_txn( txn, "users", keyvalues={ "name": user_id, + "is_guest": 1, }, updatevalues={ "password_hash": password_hash, |