Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-08-14 21:55:24 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix unicode support

Browse source
This commit is contained in:
Erik Johnston 2015-04-02 10:06:22 +01:00
parent e24c32e6f3
commit 779f7b0f44
22 changed files with 193 additions and 168 deletions
Download patch file Download diff file Expand all files Collapse all files

12
synapse/app/homeserver.py
View file

@ -18,7 +18,7 @@ import sys
sys.dont_write_bytecode = True
from synapse.storage import (
prepare_database, prepare_sqlite3_database, UpgradeDatabaseException,
prepare_database, UpgradeDatabaseException,
)
from synapse.storage.engines import create_engine
@ -381,19 +381,18 @@ def setup(config_options):
"sql_mode": "TRADITIONAL",
"charset": "utf8mb4",
"use_unicode": True,
"collation": "utf8mb4_general_ci",
})
elif name == "sqlite3":
def open_fun(conn):
prepare_database(conn, database_engine)
db_config.setdefault("args", {}).update({
"cp_min": 1,
"cp_max": 1,
"cp_openfun": open_fun,
})
else:
raise RuntimeError("Unsupported database type '%s'" % (name,))
database_engine = create_engine(name)
db_config["args"]["cp_openfun"] = database_engine.on_new_connection
hs = SynapseHomeServer(
config.server_name,
@ -424,10 +423,7 @@ def setup(config_options):
}
)
if name == "sqlite3":
prepare_sqlite3_database(db_conn)
prepare_database(db_conn, database_engine)
database_engine.prepare_database(db_conn)
db_conn.commit()
except UpgradeDatabaseException: