diff options
| author | Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> | 2019-11-14 12:02:05 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-14 12:02:05 +0000 |
| commit | 745a48625d9760374a7d683441185fa8bd2a2aac (patch) | |
| tree | 2579d4179ad51ff3cfb0590c49dc4149a914fd0a | |
| parent | Replace instance variations of homeserver with correct case/spacing (#6357) (diff) | |
| download | synapse-745a48625d9760374a7d683441185fa8bd2a2aac.tar.xz | |
Fix guest -> real account upgrade with account validity enabled (#6359)
| -rw-r--r-- | changelog.d/6359.bugfix | 1 | ||||
| -rw-r--r-- | synapse/storage/_base.py | 9 |
2 files changed, 4 insertions, 6 deletions
diff --git a/changelog.d/6359.bugfix b/changelog.d/6359.bugfix new file mode 100644 index 0000000000..22bf5f642a --- /dev/null +++ b/changelog.d/6359.bugfix @@ -0,0 +1 @@ +Fix bug where upgrading a guest account to a full user would fail when account validity is enabled. \ No newline at end of file diff --git a/synapse/storage/_base.py b/synapse/storage/_base.py index 1a2b7ebe25..ab596fa68d 100644 --- a/synapse/storage/_base.py +++ b/synapse/storage/_base.py @@ -361,14 +361,11 @@ class SQLBaseStore(object): expiration_ts, ) - self._simple_insert_txn( + self._simple_upsert_txn( txn, "account_validity", - values={ - "user_id": user_id, - "expiration_ts_ms": expiration_ts, - "email_sent": False, - }, + keyvalues={"user_id": user_id}, + values={"expiration_ts_ms": expiration_ts, "email_sent": False}, ) def start_profiling(self): |