mirrors/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2024-11-29 15:39:00 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #914 from matrix-org/markjh/upgrade

Browse source 
Ensure that the guest user is in the database when upgrading accounts
This commit is contained in:
Mark Haines 2016-07-08 17:02:06 +01:00 committed by GitHub
commit 10f4856b0c
1 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
synapse/storage/registration.py
View file

@ -127,11 +127,26 @@ class RegistrationStore(SQLBaseStore):
try: try:
if was_guest: if was_guest:
# Ensure that the guest user actually exists
# ``allow_none=False`` makes this raise an exception
# if the row isn't in the database.
self._simple_select_one_txn(
txn,
"users",
keyvalues={
"name": user_id,
"is_guest": 1,
},
retcols=("name",),
allow_none=False,
)
self._simple_update_one_txn( self._simple_update_one_txn(
txn, txn,
"users", "users",
keyvalues={ keyvalues={
"name": user_id, "name": user_id,
"is_guest": 1,
}, },
updatevalues={ updatevalues={
"password_hash": password_hash, "password_hash": password_hash,