X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=includes%2Fdb%2Fconnect_db_mysqli.inc;h=897316d698e22e56c9dcfc8e3257971c555d81a1;hb=11f5f29ce63aaba4e154a5e0521321753d831654;hp=0654c460e1ed2fd7b1a5f1b1a498d6bee7c93ff7;hpb=d1babda7c01b314d35fb89f2d195553b55936532;p=fa-stable.git

diff --git a/includes/db/connect_db_mysqli.inc b/includes/db/connect_db_mysqli.inc
index 0654c460..897316d6 100644
--- a/includes/db/connect_db_mysqli.inc
+++ b/includes/db/connect_db_mysqli.inc
@@ -19,6 +19,7 @@ function set_global_connection($company=-1)
 	global $db, $path_to_root, $db_connections, $SysPrefs;
 
 	include ($path_to_root . "/config_db.php");
+
 	if ($company == -1) 
 		$company = user_company();
 
@@ -35,7 +36,7 @@ function set_global_connection($company=-1)
 	///// This non empty sql_mode values can interphere with FA, so all is set empty during
 	///// our sessions.
 	///// We are, however, investigating the existing code to be compatible in the future.
-		db_query("SET sql_mode = '".SQL_MODE."'");
+	db_query("SET sql_mode = '".SQL_MODE."'");
 	/////
 	$SysPrefs->refresh();
 	return $db;
@@ -186,15 +187,33 @@ function db_field_name($result, $n)
     return $fieldinfo->name;
 }
 
+function db_set_collation($db, $fa_collation)
+{
+	return mysqli_query($db, "ALTER DATABASE COLLATE ".get_mysql_collation($fa_collation));
+}
+
+/*
+	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)
 {
+	global $db;
+
 	$db = mysqli_connect($connection["host"], $connection["dbuser"], $connection["dbpassword"]);
 
 	if (!mysqli_select_db($db, $connection["dbname"]))
 	{
-		$sql = "CREATE DATABASE IF NOT EXISTS `" . $connection["dbname"] . "`";
+		$sql = "CREATE DATABASE IF NOT EXISTS `" . $connection["dbname"] . "`"
+			. " DEFAULT COLLATE '" . get_mysql_collation($connection["collation"]) . "'";
+
 		if (!mysqli_query($db, $sql) || !mysqli_select_db($db, $connection["dbname"]))
 			return 0;
+	} else {
+		if (!db_set_collation($db, $connection["collation"]))
+		{
+			return 0;
+		}
 	}
 	return $db;
 }