From 19796e20aab31272176e24ec23be9a18cc6680a5 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Wed, 19 Jul 2023 13:17:08 +0100
Subject: [PATCH] Fix bad merge of #15933 (#15958)
This was because we reverted the bump of the schema version, so we were not applying the new deltas.
---
changelog.d/15958.misc | 1 +
.../06_read_write_locks_triggers.sql.postgres} | 0
.../06_read_write_locks_triggers.sql.sqlite} | 0
3 files changed, 1 insertion(+)
create mode 100644 changelog.d/15958.misc
rename synapse/storage/schema/main/delta/{79/03_read_write_locks_triggers.sql.postgres => 78/06_read_write_locks_triggers.sql.postgres} (100%)
rename synapse/storage/schema/main/delta/{79/03_read_write_locks_triggers.sql.sqlite => 78/06_read_write_locks_triggers.sql.sqlite} (100%)
diff --git a/changelog.d/15958.misc b/changelog.d/15958.misc
new file mode 100644
index 0000000000..8457994c68
--- /dev/null
+++ b/changelog.d/15958.misc
@@ -0,0 +1 @@
+Fix bug with read/write lock implementation. This is currently unused so has no observable effects.
diff --git a/synapse/storage/schema/main/delta/79/03_read_write_locks_triggers.sql.postgres b/synapse/storage/schema/main/delta/78/06_read_write_locks_triggers.sql.postgres
similarity index 100%
rename from synapse/storage/schema/main/delta/79/03_read_write_locks_triggers.sql.postgres
rename to synapse/storage/schema/main/delta/78/06_read_write_locks_triggers.sql.postgres
diff --git a/synapse/storage/schema/main/delta/79/03_read_write_locks_triggers.sql.sqlite b/synapse/storage/schema/main/delta/78/06_read_write_locks_triggers.sql.sqlite
similarity index 100%
rename from synapse/storage/schema/main/delta/79/03_read_write_locks_triggers.sql.sqlite
rename to synapse/storage/schema/main/delta/78/06_read_write_locks_triggers.sql.sqlite