Merge remote-tracking branch 'origin/develop' into clokep/thread-root…

…-rels
matrix-org · Oct 13, 2022 · 4064a0f · 4064a0f
2 parents 0f031b1 + 2019b60
commit 4064a0f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/changelog.d/14171.feature b/changelog.d/14171.feature
@@ -0,0 +1 @@
+Experimental support for [MSC3856](https://github.com/matrix-org/matrix-spec-proposals/pull/3856): threads list API.
diff --git a/synapse/storage/databases/main/relations.py b/synapse/storage/databases/main/relations.py
@@ -138,7 +138,7 @@ def threads_backfill_txn(txn: LoggingTransaction) -> int:
  if isinstance(txn.database_engine, PostgresEngine):
  txn.execute_values(sql % ("?",), rows, fetch=False)
  else:
- txn.execute_batch(sql % ("?, ?, ?, ?, ?",), rows)
+ txn.execute_batch(sql % ("(?, ?, ?, ?, ?)",), rows)
 
  # Mark the progress.
  self.db_pool.updates._background_update_progress_txn(