X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fdb%2Fconnect_db_mysql.inc;h=aa30740fb869ae5c19228c94398f04e8d889b63a;hb=19dce8c7be29e4cc8e7be92d044259348373d456;hp=f6417e4547fd03ea117a27893aeb0beb2543652c;hpb=d1babda7c01b314d35fb89f2d195553b55936532;p=fa-stable.git

diff --git a/includes/db/connect_db_mysql.inc b/includes/db/connect_db_mysql.inc
index f6417e45..aa30740f 100644
--- a/includes/db/connect_db_mysql.inc
+++ b/includes/db/connect_db_mysql.inc
@@ -186,6 +186,15 @@ function db_field_name($result, $n)
 	return mysql_field_name($result, $n);
 }
 
+function db_set_collation($db, $fa_collation)
+{
+	return mysql_query("ALTER DATABASE COLLATE ".get_mysql_collation($fa_collation), $db);
+}
+
+/*
+	Create database for FA company. If database already exists,
+	just set collation to be sure nothing weird will happen later.
+*/
 function db_create_db($connection)
 {
 	$db = mysql_connect($connection["host"] ,
@@ -193,10 +202,15 @@ function db_create_db($connection)
 
 	if (!mysql_select_db($connection["dbname"], $db))
 	{
-		$sql = "CREATE DATABASE IF NOT EXISTS " . $connection["dbname"] . "";
+		$sql = "CREATE DATABASE IF NOT EXISTS `" . $connection["dbname"] . "`"
+			. " DEFAULT COLLATE '" . get_mysql_collation($connection["collation"]) . "'";
+
 		if (!mysql_query($sql) || !mysql_select_db($connection["dbname"], $db))
+				return 0;
+	} else
+		if (!db_set_collation($connection["collation"], $db))
 			return 0;
-	}
+
 	return $db;
 }