Use make_tuple_in_list_sql_clause

Required defining a three-column overload for the method to pass mypy.

Additionally the type-ignore was no longer required according to mypy.

Author: anoadragon453

synapse/storage/database.py

@@ -2653,15 +2653,22 @@ def make_in_list_sql_clause(
 
 
 # These overloads ensure that `columns` and `iterable` values have the same length.
-# Suppress "Single overload definition, multiple required" complaint.
-@overload  # type: ignore[misc]
+@overload
 def make_tuple_in_list_sql_clause(
     database_engine: BaseDatabaseEngine,
     columns: Tuple[str, str],
     iterable: Collection[Tuple[Any, Any]],
 ) -> Tuple[str, list]: ...
 
 
+@overload
+def make_tuple_in_list_sql_clause(
+    database_engine: BaseDatabaseEngine,
+    columns: Tuple[str, str, str],
+    iterable: Collection[Tuple[Any, Any, Any]],
+) -> Tuple[str, list]: ...
+
+
 def make_tuple_in_list_sql_clause(
     database_engine: BaseDatabaseEngine,
     columns: Tuple[str, ...],

synapse/storage/databases/main/end_to_end_keys.py

@@ -530,21 +530,20 @@ async def _get_e2e_cross_signing_signatures_for_devices(
         def _get_e2e_cross_signing_signatures_for_devices_txn(
             txn: LoggingTransaction, device_query: Iterable[Tuple[str, str]]
         ) -> Mapping[Tuple[str, str], Sequence[Tuple[str, str]]]:
-            signature_query_clauses = []
-            signature_query_params = []
-
-            for user_id, device_id in device_query:
-                signature_query_clauses.append(
-                    "target_user_id = ? AND target_device_id = ? AND user_id = ?"
-                )
-                signature_query_params.extend([user_id, device_id, user_id])
+            where_clause_sql, where_clause_params = make_tuple_in_list_sql_clause(
+                self.database_engine,
+                columns=("target_user_id", "target_device_id", "user_id"),
+                iterable=[
+                    (user_id, device_id, user_id) for user_id, device_id in device_query
+                ],
+            )
 
-            signature_sql = """
+            signature_sql = f"""
                 SELECT user_id, key_id, target_device_id, signature
-                FROM e2e_cross_signing_signatures WHERE %s
-                """ % (" OR ".join("(" + q + ")" for q in signature_query_clauses))
+                FROM e2e_cross_signing_signatures WHERE {where_clause_sql}
+            """
 
-            txn.execute(signature_sql, signature_query_params)
+            txn.execute(signature_sql, where_clause_params)
 
             devices_and_signatures: Dict[Tuple[str, str], List[Tuple[str, str]]] = {}