summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-06-06 14:19:01 +0100
committerRichard van der Hoff <richard@matrix.org>2018-06-06 14:19:01 +0100
commitd3a8c9c55e580f73a723f810eee9fb6b11d360dd (patch)
treea94e977fcdc0bc9357adc96bc9c2791e2795c6e0 /synapse
parentMerge pull request #3347 from krombel/py3_extend_tox_2 (diff)
downloadsynapse-d3a8c9c55e580f73a723f810eee9fb6b11d360dd.tar.xz
Fix sql error in _get_state_groups_from_groups
If this was called with a `(type, None)` entry in types (which is supposed to
return all state of type `type`), it would explode with a sql error.
Diffstat (limited to 'synapse')
-rw-r--r--synapse/storage/state.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/state.py b/synapse/storage/state.py
index c11bc52177..85b8ec2b8f 100644
--- a/synapse/storage/state.py
+++ b/synapse/storage/state.py
@@ -272,7 +272,7 @@ class StateGroupWorkerStore(SQLBaseStore):
                 for typ in types:
                     if typ[1] is None:
                         where_clauses.append("(type = ?)")
-                        where_args.extend(typ[0])
+                        where_args.append(typ[0])
                         wildcard_types = True
                     else:
                         where_clauses.append("(type = ? AND state_key = ?)")