summary refs log tree commit diff
diff options
context:
space:
mode:
authorNeil Johnson <neil@fragile.org.uk>2018-03-29 17:27:39 +0100
committerNeil Johnson <neil@fragile.org.uk>2018-03-29 17:27:39 +0100
commitb4e37c6f50b91dd0ea90c773185884659e3a738a (patch)
treec80884c3e8e55e33f2c8fee75433a1819e5b9f62
parentRemove need for sqlite specific query (diff)
downloadsynapse-b4e37c6f50b91dd0ea90c773185884659e3a738a.tar.xz
pep8
-rw-r--r--synapse/storage/__init__.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/synapse/storage/__init__.py b/synapse/storage/__init__.py

index 0b4693041f..f68e436df0 100644 --- a/synapse/storage/__init__.py +++ b/synapse/storage/__init__.py
@@ -280,7 +280,8 @@ class DataStore(RoomMemberStore, RoomStore, sql = """ SELECT platform, COALESCE(count(*), 0) FROM ( - SELECT users.name, platform, users.creation_ts * 1000, MAX(uip.last_seen) + SELECT users.name, platform, users.creation_ts * 1000, + MAX(uip.last_seen) FROM users INNER JOIN ( SELECT @@ -317,7 +318,8 @@ class DataStore(RoomMemberStore, RoomStore, sql = """ SELECT COALESCE(count(*), 0) FROM ( - SELECT users.name, users.creation_ts * 1000, MAX(uip.last_seen) + SELECT users.name, users.creation_ts * 1000, + MAX(uip.last_seen) FROM users INNER JOIN ( SELECT