diff options
| author | Erik Johnston <erik@matrix.org> | 2015-01-30 11:10:37 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-01-30 11:10:37 +0000 |
| commit | 2ebf795c0ada8b30f22f9aca54753471a04649f6 (patch) | |
| tree | 23710ca7b15e7d65eee8885a04b23a829ca00379 /synapse/storage/registration.py | |
| parent | Update the current state of an event if we update auth events. (diff) | |
| parent | Include content in notification pokes (diff) | |
| download | synapse-2ebf795c0ada8b30f22f9aca54753471a04649f6.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into rejections
Conflicts: synapse/storage/__init__.py synapse/storage/schema/delta/v12.sql
Diffstat (limited to '')
| -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 = ?" |