fix sqlite where clause

7 years ago · 97c0496cfa
parent 8713365265
commit 97c0496cfa
1 changed files with 3 additions and 2 deletions
--- a/synapse/storage/state.py
+++ b/synapse/storage/state.py
@ -277,13 +277,14 @@ class StateGroupWorkerStore(SQLBaseStore):
                        results[group][key] = event_id
        else:
            if types is not None:
-                where_clause = "AND (%s)" % (
+                where_clause = "AND (%s" % (
                    " OR ".join(["(type = ? AND state_key = ?)"] * len(types)),
                )
                if include_other_types:
-                    where_clause += " AND (%s)" % (
+                    where_clause += " OR (%s)" % (
                        " AND ".join(["type <> ?"] * len(types)),
                    )
+                where_clause += ")"
            else:
                where_clause = ""