Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Fix getting latest device IP for user with no devices #2118

Merged
merged 3 commits into from
Apr 12, 2017
Merged

Fix getting latest device IP for user with no devices #2118

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
34840cd
Fix getting latest device IP for user with no devices
erikjohnston Apr 11, 2017
b48045a
Don't bother with outer check for now
erikjohnston Apr 11, 2017
85657ee
Bail on where clause instead
erikjohnston Apr 11, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions synapse/storage/client_ips.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,9 @@ def _get_last_client_ip_by_device_txn(cls, txn, devices, retcols):
where_clauses.append("(user_id = ? AND device_id = ?)")
bindings.extend((user_id, device_id))

if not where_clauses:
return []

inner_select = (
"SELECT MAX(last_seen) mls, user_id, device_id FROM user_ips "
"WHERE %(where)s "
Expand Down