commit 157c84b8766ae67f6868f26505ce9a5d7291730b
author Ihar Hrachyshka <ihrachys@redhat.com> Mon Oct 06 13:29:39 2014 +0200
committer Ihar Hrachyshka <ihrachys@redhat.com> Mon Jan 05 15:57:23 2015 +0100
tree 2335d93852b26d620b8c2270164c69d6879b596c
parent 5c0a3cfb71ef8c8faca92c19e4eee4968eb309e3

Enforce UTF-8 encoding when creating databases

We use InnoDB everywhere, so there should be no issues with long unicode
keys. Dropped charset parameter for recreate_database since it's not
needed anymore.

Change-Id: Ib768402a9337c918309030a92ab81da17269f4f6

lib/databases/mysql

diff --git a/lib/databases/mysql b/lib/databases/mysql
index d39d966..673d867 100644
--- a/lib/databases/mysql
+++ b/lib/databases/mysql
@@ -43,9 +43,8 @@
 
 function recreate_database_mysql {
     local db=$1
-    local charset=$2
     mysql -u$DATABASE_USER -p$DATABASE_PASSWORD -h$MYSQL_HOST -e "DROP DATABASE IF EXISTS $db;"
-    mysql -u$DATABASE_USER -p$DATABASE_PASSWORD -h$MYSQL_HOST -e "CREATE DATABASE $db CHARACTER SET $charset;"
+    mysql -u$DATABASE_USER -p$DATABASE_PASSWORD -h$MYSQL_HOST -e "CREATE DATABASE $db CHARACTER SET utf8;"
 }
 
 function configure_database_mysql {

lib/databases/postgresql

diff --git a/lib/databases/postgresql b/lib/databases/postgresql
index 76491c4..ad8cdc7 100644
--- a/lib/databases/postgresql
+++ b/lib/databases/postgresql
@@ -37,10 +37,9 @@
 
 function recreate_database_postgresql {
     local db=$1
-    local charset=$2
     # Avoid unsightly error when calling dropdb when the database doesn't exist
     psql -h$DATABASE_HOST -U$DATABASE_USER -dtemplate1 -c "DROP DATABASE IF EXISTS $db"
-    createdb -h $DATABASE_HOST -U$DATABASE_USER -l C -T template0 -E $charset $db
+    createdb -h $DATABASE_HOST -U$DATABASE_USER -l C -T template0 -E utf8 $db
 }
 
 function configure_database_postgresql {