X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fdb%2Fconnect_db_mysqli.inc;h=a70e5926b12f839fcc6263d4ab50208f514241fc;hb=8251cfa8dedaf1091e063989259db33f2f0f1a28;hp=45439f047cec8d71a0626bd13dbc17ab931e4658;hpb=1ea749c4abfe081bd7f1b4b11c65a61b311a189e;p=fa-stable.git
diff --git a/includes/db/connect_db_mysqli.inc b/includes/db/connect_db_mysqli.inc
index 45439f04..a70e5926 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();
@@ -28,16 +29,18 @@ function set_global_connection($company=-1)
$connection = $db_connections[$company];
- $db = mysqli_connect($connection["host"], $connection["dbuser"], $connection["dbpassword"]);
- mysqli_select_db($db, $connection["dbname"]);
+ $db = mysqli_connect($connection["host"], $connection["dbuser"], $connection["dbpassword"], "",
+ !empty($connection["port"]) ? $connection["port"] : 3306); // default port in mysql is 3306
+
+ mysqli_select_db($db, $connection["dbname"]);
///// From mysqli release 5.6.6 the sql_mode is no longer empty as it was prior to
///// this release. Just for safety we make it empty for all 5.6 release and higher.
///// 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."'");
/////
- refresh_sys_prefs();
+ $SysPrefs->refresh();
return $db;
}
@@ -60,7 +63,14 @@ function db_query($sql, $err_msg=null)
db_profile(); // mysql profiling
- $result = mysqli_query($db, $sql);
+ $retry = MAX_DEADLOCK_RETRY;
+ do {
+ $result = mysqli_query($db, $sql);
+ if (mysqli_errno($db) == 1213) { // deadlock detected
+ sleep(1); $retry--;
+ } else
+ $retry = 0;
+ } while ($retry);
db_profile($sql);
@@ -77,48 +87,47 @@ function db_query($sql, $err_msg=null)
if ($err_msg != null || $SysPrefs->go_debug) {
$exit = $err_msg != null;
if (function_exists('xdebug_call_file'))
- check_db_error('
At file '.xdebug_call_file().':'.xdebug_call_line().':
'.$err_msg, $sql, $exit);
- else
- check_db_error($err_msg, $sql, $exit);
+ $err_msg = '
At file '.xdebug_call_file().':'.xdebug_call_line().':
'.$err_msg;
+ check_db_error($err_msg, $sql, $exit);
}
return $result;
}
-function db_fetch_row ($result)
+function db_fetch_row($result)
{
$ret = mysqli_fetch_row($result);
return ($ret === null ? false : $ret);
}
-function db_fetch_assoc ($result)
+function db_fetch_assoc($result)
{
$ret = mysqli_fetch_assoc($result);
return ($ret === null ? false : $ret);
}
-function db_fetch ($result)
+function db_fetch($result)
{
$ret = mysqli_fetch_array($result);
return ($ret === null ? false : $ret);
}
-function db_seek (&$result,$record)
+function db_seek(&$result,$record)
{
return mysqli_data_seek($result, $record);
}
-function db_free_result ($result)
+function db_free_result($result)
{
if ($result)
mysqli_free_result($result);
}
-function db_num_rows ($result)
+function db_num_rows($result)
{
return mysqli_num_rows($result);
}
-function db_num_fields ($result)
+function db_num_fields($result)
{
return mysqli_num_fields($result);
}
@@ -126,8 +135,8 @@ function db_num_fields ($result)
function db_escape($value = "", $nullify = false)
{
global $db;
-
- $value = @html_entity_decode($value, ENT_QUOTES, $_SESSION['language']->encoding);
+
+ $value = @html_entity_decode($value, ENT_QUOTES, $_SESSION['language']->encoding=='iso-8859-2' ? 'ISO-8859-1' : $_SESSION['language']->encoding);
$value = html_specials_encode($value);
//reset default if second parameter is skipped
@@ -150,7 +159,7 @@ function db_escape($value = "", $nullify = false)
return $value;
}
-function db_error_no ()
+function db_error_no()
{
global $db;
return mysqli_errno($db);
@@ -180,15 +189,34 @@ 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)
{
- $db = mysqli_connect($connection["host"], $connection["dbuser"], $connection["dbpassword"]);
+ global $db;
+
+ $db = mysqli_connect($connection["host"], $connection["dbuser"], $connection["dbpassword"], "",
+ !empty($connection["port"]) ? $connection["port"] : 3306); // default port in mysql is 3306
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;
}