diff options
| author | Erik Johnston <erik@matrix.org> | 2019-10-10 15:35:46 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-10-10 15:35:46 +0100 |
| commit | 3bc687508fa6c4cf82b5ddb22ce6f3674433d0ff (patch) | |
| tree | f30e049cd884f7fedee51cfe067ea6090ea07ebe /synapse/storage/search.py | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/postgres_any (diff) | |
| download | synapse-3bc687508fa6c4cf82b5ddb22ce6f3674433d0ff.tar.xz | |
Remove add_in_list_sql_clause
Diffstat (limited to 'synapse/storage/search.py')
| -rw-r--r-- | synapse/storage/search.py | 12 |
1 files changed, 7 insertions, 5 deletions
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: |