Adjusting database creation (char set UTF-8)

diff --git a/sql/Makefile b/sql/Makefile
index 6668308dfc266759155ab56edca57b90275eed98..6352c39e1c9141f40b354a32459ae05f3602d3cf 100644 (file)
--- a/sql/Makefile
+++ b/sql/Makefile
@@ -32,6 +32,8 @@ dbmysql       :  mailleur.mysql
                        WITH GRANT OPTION;";            \
             echo "FLUSH PRIVILEGES;";                  \
             echo "CREATE DATABASE mailleur;";          \
+            echo "ALTER DATABASE mailleur              \
+                        CHARACTER SET utf8;";          \
             ) | sudo mariadb -q
           @ cat mailleur.mysql | mariadb -q mailleur;
           @ cpp -P -DMYSQL datatest.sql | mariadb -q mailleur;
@@ -50,7 +52,8 @@ dbpostg       :  mailleur.postg
           @-(                                          \
             echo "CREATE ROLE apache WITH LOGIN;";     \
             echo "CREATE ROLE dovecot WITH LOGIN;";    \
-            echo "create database mailleur;"           \
+            echo "CREATE DATABASE mailleur             \
+                       ENCODING='UTF8';"               \
             ) | psql -q -U postgres template1
           @ cat mailleur.postg | psql -q mailleur;
           @ cpp -P -DPOSTGRESQL datatest.sql | psql -q mailleur;

diff --git a/support/crdb.sh b/support/crdb.sh
index 88ac8dd1a683242561c2ec726d4c1f48b3e4eecf..8e8c4a37c1995e3a93d26470f76a195d0fc91adc 100755 (executable)
--- a/support/crdb.sh
+++ b/support/crdb.sh
@@ -56,6 +56,7 @@ case "$DB_TYPE" in
       echo "GRANT ALL PRIVILEGES ON $APPNAME.* TO $APPNAME@localhost;"
       echo "FLUSH PRIVILEGES;"
       echo "CREATE DATABASE $APPNAME;"
+      echo "ALTER DATABASE $APPNAME CHARACTER SET utf8;"
       ) | $SQL >> $LOG
       /bin/echo "data-base is now created" >> $LOG
       fi
@@ -83,7 +84,7 @@ case "$DB_TYPE" in
       echo "CREATE ROLE $APPNAME WITH LOGIN CREATEDB SUPERUSER;"
       echo "CREATE ROLE apache WITH LOGIN;"
       echo "CREATE ROLE dovecot WITH LOGIN;"
-      echo "CREATE DATABASE $APPNAME;"
+      echo "CREATE DATABASE $APPNAME ENCODING='UTF8';"
       ) | /usr/bin/su - -m postgres -c "$SQL $SQLHOST $SQLPORT template1" >> $LOG
       echo "data-base is now created" >> $LOG
       fi