summary refs log tree commit diff
path: root/synapse/storage/registration.py
diff options
context:
space:
mode:
authorNeil Johnson <neil@fragile.org.uk>2018-04-09 13:48:15 +0100
committerNeil Johnson <neil@fragile.org.uk>2018-04-09 13:48:15 +0100
commit89dda613153c4869f3c9ce96f5cbc47f93f54723 (patch)
tree320e718965e5e843fe3950bd8c19cf4b9ad367a6 /synapse/storage/registration.py
parent0.27.3 (diff)
parentMerge pull request #3029 from matrix-org/erikj/linearize_generate_user_id (diff)
downloadsynapse-89dda613153c4869f3c9ce96f5cbc47f93f54723.tar.xz
Merge branch 'develop' into release-v0.27.0
Diffstat (limited to 'synapse/storage/registration.py')
-rw-r--r--synapse/storage/registration.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/synapse/storage/registration.py b/synapse/storage/registration.py
index d809b2ba46..6b557ca0cf 100644
--- a/synapse/storage/registration.py
+++ b/synapse/storage/registration.py
@@ -460,14 +460,12 @@ class RegistrationStore(RegistrationWorkerStore,
         """
         def _find_next_generated_user_id(txn):
             txn.execute("SELECT name FROM users")
-            rows = self.cursor_to_dict(txn)
 
             regex = re.compile("^@(\d+):")
 
             found = set()
 
-            for r in rows:
-                user_id = r["name"]
+            for user_id, in txn:
                 match = regex.search(user_id)
                 if match:
                     found.add(int(match.group(1)))