X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fdb%2Fconnect_db_mysql.inc;h=aa30740fb869ae5c19228c94398f04e8d889b63a;hb=19dce8c7be29e4cc8e7be92d044259348373d456;hp=2606721443d7db758930482dcde01d80d403efb3;hpb=40c3b111b007ad16a2eedff175e1612150191d04;p=fa-stable.git
diff --git a/includes/db/connect_db_mysql.inc b/includes/db/connect_db_mysql.inc
index 26067214..aa30740f 100644
--- a/includes/db/connect_db_mysql.inc
+++ b/includes/db/connect_db_mysql.inc
@@ -14,7 +14,7 @@ define('SQL_MODE', ''); // STRICT_ALL_TABLES,NO_ZERO_IN_DATE ?
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)
@@ -35,6 +35,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."'");
/////
+ $SysPrefs->refresh();
return $db;
}
@@ -57,7 +58,14 @@ function db_query($sql, $err_msg=null)
db_profile(); // mysql profiling
- $result = mysql_query($sql, $db);
+ $retry = MAX_DEADLOCK_RETRY;
+ do {
+ $result = mysql_query($db, $sql);
+ if (mysql_errno($db) == 1213) { // deadlock detected
+ sleep(1); $retry--;
+ } else
+ $retry = 0;
+ } while ($retry);
db_profile($sql);
@@ -75,48 +83,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)
{
return mysql_fetch_row($result);
}
-function db_fetch_assoc ($result)
+function db_fetch_assoc($result)
{
return mysql_fetch_assoc($result);
}
-function db_fetch ($result)
+function db_fetch($result)
{
return mysql_fetch_array($result);
}
-function db_seek (&$result,$record)
+function db_seek(&$result,$record)
{
return mysql_data_seek($result, $record);
}
-function db_free_result ($result)
+function db_free_result($result)
{
if ($result)
mysql_free_result($result);
}
-function db_num_rows ($result)
+function db_num_rows($result)
{
return mysql_num_rows($result);
}
-function db_num_fields ($result)
+function db_num_fields($result)
{
return mysql_num_fields($result);
}
@@ -150,7 +157,7 @@ function db_escape($value = "", $nullify = false)
return $value;
}
-function db_error_no ()
+function db_error_no()
{
global $db;
return mysql_errno($db);
@@ -179,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"] ,
@@ -186,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;
}