summary refs log tree commit diff
path: root/synapse/storage/stats.py
diff options
context:
space:
mode:
authorOlivier Wilkinson (reivilibre) <olivier@librepush.net>2019-08-30 15:23:56 +0100
committerOlivier Wilkinson (reivilibre) <olivier@librepush.net>2019-08-30 15:23:56 +0100
commiteba432e54154c8a5a0eaab940449f2d02de92dda (patch)
tree130adf0fcf9d876aed21d0dd512e091c38e46c90 /synapse/storage/stats.py
parentMerge branch 'rei/rss_inc7' into rei/rss_inc8 (diff)
parentAmbiguous `room_id` (diff)
downloadsynapse-eba432e54154c8a5a0eaab940449f2d02de92dda.tar.xz
Merge branch 'rei/rss_inc7' into rei/rss_inc8
Diffstat (limited to 'synapse/storage/stats.py')
-rw-r--r--synapse/storage/stats.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/stats.py b/synapse/storage/stats.py
index 5ce44e5646..0eb593e53b 100644
--- a/synapse/storage/stats.py
+++ b/synapse/storage/stats.py
@@ -1106,7 +1106,7 @@ class StatsStore(StateDeltasStore):
             SELECT COUNT(*) AS num_events, SUM(%s) AS num_bytes
             FROM events
             JOIN event_json USING (event_id)
-            WHERE room_id = ?
+            WHERE events.room_id = ?
                 AND ? <= stream_ordering
                 AND stream_ordering <= ?
         """ % (