From 81b32d21ad723a2706e7111378395b164ba91142 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Sun, 18 Sep 2016 15:19:02 +0200 Subject: [PATCH] Create UTF8 mysql database by default. --- installer.cfg | 2 ++ modoboa_installer/database.py | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/installer.cfg b/installer.cfg index 77e75eb..cd324db 100644 --- a/installer.cfg +++ b/installer.cfg @@ -12,6 +12,8 @@ password = [mysql] user = root password = password +charset = utf8 +collation = utf8_general_ci [modoboa] user = modoboa diff --git a/modoboa_installer/database.py b/modoboa_installer/database.py index 3ce77c9..6b592dc 100644 --- a/modoboa_installer/database.py +++ b/modoboa_installer/database.py @@ -159,7 +159,12 @@ class MySQL(Database): def create_database(self, name, owner): """Create a database.""" self._exec_query( - "CREATE DATABASE IF NOT EXISTS {}".format(name)) + "CREATE DATABASE IF NOT EXISTS {} " + "DEFAULT CHARACTER SET {} " + "DEFAULT COLLATE {}".format( + name, self.config.get("mysql", "charset"), + self.config.get("mysql", "collation")) + ) self.grant_access(name, owner) def grant_access(self, dbname, user):