From 5859e2fe0cd23228192de7c40b8b1c760efa77d2 Mon Sep 17 00:00:00 2001
From: Brendan Abolivier <babolivier@matrix.org>
Date: Fri, 25 Mar 2022 10:56:18 +0100
Subject: [PATCH] Mention the new behaviour on unsafe database locale in the
 upgrade notes (#12288)

Co-authored-by: Shay <hillerys@element.io>
---
 changelog.d/12288.misc | 1 +
 docs/upgrade.md        | 7 +++++++
 2 files changed, 8 insertions(+)
 create mode 100644 changelog.d/12288.misc

diff --git a/changelog.d/12288.misc b/changelog.d/12288.misc
new file mode 100644
index 0000000000..ee8fbfd290
--- /dev/null
+++ b/changelog.d/12288.misc
@@ -0,0 +1 @@
+Refuse to start if DB has non-`C` locale, unless config flag `allow_unsafe_db_locale` is set to true.
diff --git a/docs/upgrade.md b/docs/upgrade.md
index f9ac605e7b..f039710520 100644
--- a/docs/upgrade.md
+++ b/docs/upgrade.md
@@ -99,6 +99,13 @@ experimental_features:
   groups_enabled: false
 ```
 
+## Change in behaviour for PostgreSQL databases with unsafe locale
+
+Synapse now refuses to start when using PostgreSQL with non-`C` values for `COLLATE` and
+`CTYPE` unless the config flag `allow_unsafe_locale`, found in the database section of
+the configuration file, is set to `true`. See the [PostgreSQL documentation](https://matrix-org.github.io/synapse/latest/postgres.html#fixing-incorrect-collate-or-ctype)
+for more information and instructions on how to fix a database with incorrect values.
+
 # Upgrading to v1.55.0
 
 ## `synctl` script has been moved
-- 
GitLab