Merge pull request #3241 from matrix-org/fix_user_visits_insertion

fix psql compatability bug
This commit is contained in:
Neil Johnson 2018-05-18 15:01:01 +00:00 committed by GitHub
commit 08462620bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -376,7 +376,7 @@ class DataStore(RoomMemberStore, RoomStore,
FROM user_ips AS u FROM user_ips AS u
LEFT JOIN ( LEFT JOIN (
SELECT user_id, device_id, timestamp FROM user_daily_visits SELECT user_id, device_id, timestamp FROM user_daily_visits
WHERE timestamp IS ? WHERE timestamp = ?
) udv ) udv
ON u.user_id = udv.user_id AND u.device_id=udv.device_id 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 WHERE last_seen > ? AND last_seen <= ? AND udv.timestamp IS NULL