From 6849cf5c72ab1ba5153793b2900b7a7f515f5413 Mon Sep 17 00:00:00 2001 From: Chritoph Date: Tue, 26 May 2020 00:04:01 +0200 Subject: [PATCH] create_database.sh: support full UTF-8 support (utf8mb4). --- create_database.sh | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/create_database.sh b/create_database.sh index d4edcf7..b5f9493 100755 --- a/create_database.sh +++ b/create_database.sh @@ -627,12 +627,22 @@ if [[ "$_result" = "$DATABASE_NAME" ]] ; then fatal "Database '$DATABASE_NAME' already exists" fi -echononl " Create database \033[1m$DATABASE_NAME\033[m" +echononl " Create database \033[1m$DATABASE_NAME\033[m (full UTF-8 support - utf8mb4)" mysql $MYSQL_CREDENTIAL_ARGS -N -s -e \ - "CREATE DATABASE $DATABASE_NAME CHARACTER SET utf8 COLLATE utf8_general_ci" > $tmp_log_file 2>&1 + "CREATE DATABASE $DATABASE_NAME CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci" > $tmp_log_file 2>&1 if [[ $? -ne 0 ]] ; then echo_failed - fatal "$(cat $tmp_log_file)" + error "$(cat $tmp_log_file)" + echononl " Create database \033[1m$DATABASE_NAME\033[m (UTF-8 support - utf8)" + mysql $MYSQL_CREDENTIAL_ARGS -N -s -e \ + "CREATE DATABASE $DATABASE_NAME CHARACTER SET utf8 COLLATE utf8_general_ci" > $tmp_log_file 2>&1 + + if [[ $? -ne 0 ]] ; then + echo_failed + fatal "$(cat $tmp_log_file)" + else + echo_ok + fi else echo_ok fi