diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-01-29 14:55:27 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-01-29 14:55:27 +0000 |
| commit | 9d8f798a3fa0a0a98626218ff1602bf06be0fb82 (patch) | |
| tree | 7226008bc691b4599c2c499de63c4bbced486a1b /synapse/storage/registration.py | |
| parent | Move bump schema delta (diff) | |
| parent | SYN-252: Supply the stream and topological parts in the correct order to the ... (diff) | |
| download | synapse-9d8f798a3fa0a0a98626218ff1602bf06be0fb82.tar.xz | |
Merge changes from develop
Diffstat (limited to 'synapse/storage/registration.py')
| -rw-r--r-- | synapse/storage/registration.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/storage/registration.py b/synapse/storage/registration.py index 75dffa4db2..029b07cc66 100644 --- a/synapse/storage/registration.py +++ b/synapse/storage/registration.py @@ -122,7 +122,8 @@ class RegistrationStore(SQLBaseStore): def _query_for_auth(self, txn, token): sql = ( - "SELECT users.name, users.admin, access_tokens.device_id" + "SELECT users.name, users.admin," + " access_tokens.device_id, access_tokens.id as token_id" " FROM users" " INNER JOIN access_tokens on users.id = access_tokens.user_id" " WHERE token = ?" |