X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fdb%2Fconnect_db_mysql.inc;h=8abdaa34f268e4cce6b934213abf645f6c0426ad;hb=df317147686e6577fcfa7215705d376a3939772d;hp=4c225796be61f25cdbda7187bd424e7a9edda0ec;hpb=0b63d898491b6577a5a5bf90e771dca0dcbbcf1f;p=fa-stable.git diff --git a/includes/db/connect_db_mysql.inc b/includes/db/connect_db_mysql.inc index 4c225796..8abdaa34 100644 --- a/includes/db/connect_db_mysql.inc +++ b/includes/db/connect_db_mysql.inc @@ -9,69 +9,73 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ +define('DB_DUPLICATE_ERROR', 1062); +define('SQL_MODE', 'STRICT_ALL_TABLES'); // prevents SQL injection with silent field content truncation function set_global_connection($company=-1) { - global $db, $transaction_level, $path_to_root, $db_connections; + global $db, $path_to_root, $db_connections, $SysPrefs; include ($path_to_root . "/config_db.php"); if ($company == -1) - $company = $_SESSION["wa_current_user"]->company; + $company = user_company(); cancel_transaction(); // cancel all aborted transactions if any - $transaction_level = 0; $_SESSION["wa_current_user"]->cur_con = $company; $connection = $db_connections[$company]; + + $server = $connection["host"]; + if (!empty($connection["port"])) + $server .= ":".$connection["port"]; - $db = mysql_connect($connection["host"], $connection["dbuser"], $connection["dbpassword"]); - mysql_select_db($connection["dbname"], $db); + $db = mysql_connect($server, $connection["dbuser"], $connection["dbpassword"]); + mysql_select_db($connection["dbname"], $db); ///// From MySql 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. - if (strncmp(db_get_version(), "5.6", 3) >= 0) - db_query("SET sql_mode = ''"); + db_query("SET sql_mode = '".SQL_MODE."'"); ///// + $SysPrefs->refresh(); return $db; } -$db_duplicate_error_code = 1062; - //DB wrapper functions to change only once for whole application function db_query($sql, $err_msg=null) { - global $db, $show_sql, $sql_trail, $select_trail, $go_debug, $sql_queries, $Ajax, - $db_connections, $db_last_inserted_id; - + global $db, $SysPrefs, $sql_queries, $Ajax, $db_connections, $db_last_inserted_id; + // set current db prefix $comp = isset($_SESSION["wa_current_user"]->cur_con) ? $_SESSION["wa_current_user"]->cur_con : 0; - $cur_prefix = $db_connections[$comp]['tbpref']; + $cur_prefix = @$db_connections[$comp]['tbpref']; $sql = str_replace(TB_PREF, $cur_prefix, $sql); - if ($show_sql) + if ($SysPrefs->show_sql) { $Ajax->activate('footer_debug'); $sql_queries .= "
$sql
\n
"; } - // mysql profiling - global $profile_sql; - if (@$profile_sql) - get_usec(); - $result = mysql_query($sql, $db); - if (@$profile_sql) - { - $profile_sql= false; - _vd($sql.'
:'.db_num_rows($result).'rows, '.get_usec()); - } - - if($sql_trail) { + db_profile(); // mysql profiling + + $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); + + if($SysPrefs->sql_trail) { $db_last_inserted_id = mysql_insert_id($db); // preserve in case trail insert is done - if ($select_trail || (strstr($sql, 'SELECT') === false)) { + if ($SysPrefs->select_trail || (strstr($sql, 'SELECT') === false)) { mysql_query( "INSERT INTO ".$cur_prefix."sql_trail (`sql`, `result`, `msg`) @@ -80,51 +84,50 @@ function db_query($sql, $err_msg=null) } } - if ($err_msg != null || $go_debug) { + 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); } @@ -132,7 +135,7 @@ function db_num_fields ($result) function db_escape($value = "", $nullify = false) { $value = @html_entity_decode($value, ENT_QUOTES, $_SESSION['language']->encoding); - $value = @htmlspecialchars($value, ENT_QUOTES, $_SESSION['language']->encoding); + $value = html_specials_encode($value); //reset default if second parameter is skipped $nullify = ($nullify === null) ? (false) : ($nullify); @@ -158,7 +161,7 @@ function db_escape($value = "", $nullify = false) return $value; } -function db_error_no () +function db_error_no() { global $db; return mysql_errno($db); @@ -171,9 +174,9 @@ function db_error_msg($conn) function db_insert_id() { - global $db_last_inserted_id, $sql_trail, $db; + global $db_last_inserted_id, $SysPrefs, $db; - return $sql_trail ? $db_last_inserted_id : mysql_insert_id($db); + return $SysPrefs->sql_trail ? $db_last_inserted_id : mysql_insert_id($db); } function db_num_affected_rows() @@ -187,18 +190,33 @@ 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"] , - $connection["dbuser"], $connection["dbpassword"]); - if (strncmp(db_get_version(), "5.6", 3) >= 0) - db_query("SET sql_mode = ''"); + $server = $connection["host"]; + if (!empty($connection["port"])) + $server .= ":".$connection["port"]; + $db = mysql_connect($server, $connection["dbuser"], $connection["dbpassword"]); + 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; } @@ -264,4 +282,12 @@ function db_set_encoding($ui_encoding=null) mysql_set_charset($mysql_enc); } -?> \ No newline at end of file +function db_get_charset($db) +{ + return mysql_client_encoding(); +} + +function db_set_charset($db, $charset) +{ + return mysql_set_charset($charset, $db); +}