From 9c53efb609453ee03e11d90973e429acf23a2b70 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Mon, 27 Apr 2020 22:34:03 +0100
Subject: [PATCH] Fix collation for postgres for unit tests

When running the UTs against a postgres deatbase, we need to set the collation
correctly.
---
 changelog.d/7359.misc | 1 +
 tests/utils.py        | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/7359.misc

diff --git a/changelog.d/7359.misc b/changelog.d/7359.misc
new file mode 100644
index 000000000000..b99f257d9ae5
--- /dev/null
+++ b/changelog.d/7359.misc
@@ -0,0 +1 @@
+Fix collation for postgres for unit tests.
diff --git a/tests/utils.py b/tests/utils.py
index 2079e0143d69..037cb134f0dd 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -74,7 +74,10 @@ def setupdb():
         db_conn.autocommit = True
         cur = db_conn.cursor()
         cur.execute("DROP DATABASE IF EXISTS %s;" % (POSTGRES_BASE_DB,))
-        cur.execute("CREATE DATABASE %s;" % (POSTGRES_BASE_DB,))
+        cur.execute(
+            "CREATE DATABASE %s ENCODING 'UTF8' LC_COLLATE='C' LC_CTYPE='C' "
+            "template=template0;" % (POSTGRES_BASE_DB,)
+        )
         cur.close()
         db_conn.close()