diff --git a/synapse/storage/search.py b/synapse/storage/search.py
index 4be6e56dfa..7695bf09fc 100644
--- a/synapse/storage/search.py
+++ b/synapse/storage/search.py
@@ -24,7 +24,7 @@ from canonicaljson import json
from twisted.internet import defer
from synapse.api.errors import SynapseError
-from synapse.storage._base import add_in_list_sql_clause
+from synapse.storage._base import make_in_list_sql_clause
from synapse.storage.engines import PostgresEngine, Sqlite3Engine
from .background_updates import BackgroundUpdateStore
@@ -386,9 +386,10 @@ class SearchStore(SearchBackgroundUpdateStore):
# Make sure we don't explode because the person is in too many rooms.
# We filter the results below regardless.
if len(room_ids) < 500:
- add_in_list_sql_clause(
- self.database_engine, "room_id", room_ids, clauses, args
+ clause, args = make_in_list_sql_clause(
+ self.database_engine, "room_id", room_ids
)
+ clauses = [clause]
local_clauses = []
for key in keys:
@@ -494,9 +495,10 @@ class SearchStore(SearchBackgroundUpdateStore):
# Make sure we don't explode because the person is in too many rooms.
# We filter the results below regardless.
if len(room_ids) < 500:
- add_in_list_sql_clause(
- self.database_engine, "room_id", room_ids, clauses, args
+ clause, args = make_in_list_sql_clause(
+ self.database_engine, "room_id", room_ids
)
+ clauses = [clause]
local_clauses = []
for key in keys:
|
