summary refs log tree commit diff
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2018-05-18 15:01:01 +0000
committerGitHub <noreply@github.com>2018-05-18 15:01:01 +0000
commit08462620bfe9bb1ac0b62d8d207fa2db595622b1 (patch)
tree73519c84e3f90cd317473b538fc01093611607e7
parentMerge branch 'master' into develop (diff)
parentfix psql compatability bug (diff)
downloadsynapse-08462620bfe9bb1ac0b62d8d207fa2db595622b1.tar.xz
Merge pull request #3241 from matrix-org/fix_user_visits_insertion
fix psql compatability bug
-rw-r--r--synapse/storage/__init__.py2
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