Merge branch 'develop' of github.com:matrix-org/synapse into neilj/reserved_users

This commit is contained in:
Neil Johnson 2018-08-08 13:45:21 +01:00
commit be59910b93
16 changed files with 225 additions and 156 deletions

View file

@ -87,7 +87,7 @@ class MonthlyActiveUsersStore(SQLBaseStore):
# If MAU user count still exceeds the MAU threshold, then delete on
# a least recently active basis.
# Note it is not possible to write this query using OFFSET due to
# incompatibilities in how sqlite an postgres support the feature.
# incompatibilities in how sqlite and postgres support the feature.
# sqlite requires 'LIMIT -1 OFFSET ?', the LIMIT must be present
# While Postgres does not require 'LIMIT', but also does not support
# negative LIMIT values. So there is no way to write it that both can