Don't always lock "user_ips" table when performing non-native upsert (#15788)

2 files changed, 2 insertions, 1 deletions

diff --git a/changelog.d/15788.bugfix b/changelog.d/15788.bugfix
new file mode 100644

index 0000000000..d22aae7baf
--- /dev/null
+++ b/changelog.d/15788.bugfix
@@ -0,0 +1 @@
+Fix a bug introduced in 1.57.0 where the wrong table would be locked on updating database rows when using SQLite as the database backend.
\ No newline at end of file
diff --git a/synapse/storage/database.py b/synapse/storage/database.py

index 10fa6c4802..7e49ae11bc 100644
--- a/synapse/storage/database.py
+++ b/synapse/storage/database.py
@@ -1529,7 +1529,7 @@ class DatabasePool:
         # Lock the table just once, to prevent it being done once per row.
         # Note that, according to Postgres' documentation, once obtained,
         # the lock is held for the remainder of the current transaction.
-        self.engine.lock_table(txn, "user_ips")
+        self.engine.lock_table(txn, table)
 
         for keyv, valv in zip(key_values, value_values):
             _keys = dict(zip(key_names, keyv))