X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fdb%2Fconnect_db_mysqli.inc;h=30e3f6c77e455e4c5a64eba0b4719bffcd38da6f;hb=9a1b3abd5371ad7f6315db1d56f8356587444314;hp=65b4a339080000f143a5f6a94deb678f8e7ec041;hpb=a721b65478fd2a264b470e1265e69cf829031e7a;p=fa-stable.git

diff --git a/includes/db/connect_db_mysqli.inc b/includes/db/connect_db_mysqli.inc
index 65b4a339..30e3f6c7 100644
--- a/includes/db/connect_db_mysqli.inc
+++ b/includes/db/connect_db_mysqli.inc
@@ -16,9 +16,10 @@ $db_last_inserted_id = 0;
 
 function set_global_connection($company=-1)
 {
-	global $db, $path_to_root, $db_connections;
+	global $db, $path_to_root, $db_connections, $SysPrefs;
 
 	include ($path_to_root . "/config_db.php");
+
 	if ($company == -1) 
 		$company = user_company();
 
@@ -37,7 +38,7 @@ function set_global_connection($company=-1)
 	///// We are, however, investigating the existing code to be compatible in the future.
 		db_query("SET sql_mode = '".SQL_MODE."'");
 	/////
-	refresh_sys_prefs();
+	$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;
 }