Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2024-12-11 13:14:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Use case sensitive collations

Browse Source
This commit is contained in:
Erik Johnston 2015-04-10 18:46:33 +01:00
parent 4103b1c470
commit c5365dee56
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
synapse/app/homeserver.py
View File

@ -363,7 +363,6 @@ def setup(config_options):
db_config = { db_config = {
k: v for k, v in db_config.items() k: v for k, v in db_config.items()
if not k.startswith("cp_")
} }
name = db_config.get("name", None) name = db_config.get("name", None)
@ -372,7 +371,7 @@ def setup(config_options):
"sql_mode": "TRADITIONAL", "sql_mode": "TRADITIONAL",
"charset": "utf8mb4", "charset": "utf8mb4",
"use_unicode": True, "use_unicode": True,
"collation": "utf8mb4_general_ci", "collation": "utf8mb4_bin",
}) })
elif name == "sqlite3": elif name == "sqlite3":
db_config.setdefault("args", {}).update({ db_config.setdefault("args", {}).update({

2
synapse/storage/engines/maria.py
View File

@ -36,7 +36,7 @@ class MariaEngine(object):
def prepare_database(self, db_conn): def prepare_database(self, db_conn):
cur = db_conn.cursor() cur = db_conn.cursor()
cur.execute( cur.execute(
"ALTER DATABASE CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci" "ALTER DATABASE CHARACTER SET utf8mb4 COLLATE utf8mb4_bin"
) )
db_conn.commit() db_conn.commit()
prepare_database(db_conn, self) prepare_database(db_conn, self)