diff options
author | Neil Johnson <neil@matrix.org> | 2018-05-18 15:01:01 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-18 15:01:01 +0000 |
commit | 08462620bfe9bb1ac0b62d8d207fa2db595622b1 (patch) | |
tree | 73519c84e3f90cd317473b538fc01093611607e7 /synapse/storage/__init__.py | |
parent | Merge branch 'master' into develop (diff) | |
parent | fix psql compatability bug (diff) | |
download | synapse-08462620bfe9bb1ac0b62d8d207fa2db595622b1.tar.xz |
Merge pull request #3241 from matrix-org/fix_user_visits_insertion
fix psql compatability bug
Diffstat (limited to 'synapse/storage/__init__.py')
-rw-r--r-- | synapse/storage/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/__init__.py b/synapse/storage/__init__.py index 4551cf8774..ac264b5d25 100644 --- a/synapse/storage/__init__.py +++ b/synapse/storage/__init__.py @@ -376,7 +376,7 @@ class DataStore(RoomMemberStore, RoomStore, FROM user_ips AS u LEFT JOIN ( SELECT user_id, device_id, timestamp FROM user_daily_visits - WHERE timestamp IS ? + WHERE timestamp = ? ) udv ON u.user_id = udv.user_id AND u.device_id=udv.device_id WHERE last_seen > ? AND last_seen <= ? AND udv.timestamp IS NULL |