Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-02 10:36:06 -04:00
Code Issues Projects Releases Packages Wiki Activity

Address minor PR issues

Browse source
This commit is contained in:
David Baker 2016-01-04 13:39:29 +00:00
parent d2a92c6bde
commit 3051c9d002
7 changed files with 12 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

6
synapse/storage/push_rule.py
View file

@ -62,12 +62,12 @@ class PushRuleStore(SQLBaseStore):
def f(txn, user_ids_to_fetch):
sql = (
"SELECT " +
",".join(map(lambda x: "pr."+x, PushRuleTable.fields)) +
",".join("pr."+x for x in PushRuleTable.fields) +
" FROM " + PushRuleTable.table_name + " pr " +
" LEFT JOIN " + PushRuleEnableTable.table_name + " pre " +
" ON pr.user_name = pre.user_name and pr.rule_id = pre.rule_id " +
" WHERE pr.user_name " +
" IN (" + ",".join(["?" for _ in user_ids_to_fetch]) + ")"
" IN (" + ",".join("?" for _ in user_ids_to_fetch) + ")"
" AND (pre.enabled is null or pre.enabled = 1)"
" ORDER BY pr.user_name, pr.priority_class DESC, pr.priority DESC"
)
@ -78,7 +78,7 @@ class PushRuleStore(SQLBaseStore):
batch_start = 0
while batch_start < len(user_ids):
batch_end = max(len(user_ids), batch_size)
batch_end = min(len(user_ids), batch_size)
batch_user_ids = user_ids[batch_start:batch_end]
batch_start = batch_end