summary refs log tree commit diff
diff options
context:
space:
mode:
authorLuke Barnard <luke@matrix.org>2017-11-06 16:50:33 +0000
committerLuke Barnard <luke@matrix.org>2017-11-06 16:50:33 +0000
commitea14a142cccee5a8b3e548cacf2e356c7f412b50 (patch)
treedaecf00cd971bdf31603f67ef5a7aa2291ac70cc
parentUse static column name insertion (diff)
downloadsynapse-github/luke/get-admins-in-group-first.tar.xz
-rw-r--r--synapse/storage/_base.py3
-rw-r--r--synapse/storage/group_server.py2
2 files changed, 3 insertions, 2 deletions
diff --git a/synapse/storage/_base.py b/synapse/storage/_base.py

index 73a66e28b0..6b18d9e714 100644 --- a/synapse/storage/_base.py +++ b/synapse/storage/_base.py
@@ -641,7 +641,8 @@ class SQLBaseStore(object): ) @classmethod - def _simple_select_list_txn(cls, txn, table, keyvalues, retcols, order=None, order_asc=True): + def _simple_select_list_txn(cls, txn, table, keyvalues, retcols, + order=None, order_asc=True): """Executes a SELECT query on the named table, which may return zero or more rows, returning the result as a list of dicts. diff --git a/synapse/storage/group_server.py b/synapse/storage/group_server.py
index 3a30de5490..cfe23d18cd 100644 --- a/synapse/storage/group_server.py +++ b/synapse/storage/group_server.py
@@ -57,7 +57,7 @@ class GroupServerStore(SQLBaseStore): retcols=("user_id", "is_public", "is_admin",), desc="get_users_in_group", order="is_admin", - order_asc=False, # Order descending: admins first + order_asc=False, # Order descending: admins first ) def get_invited_users_in_group(self, group_id):