lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Try a fix with php that return a fatal error on some mysql

Browse Source
This commit is contained in:
Laurent Destailleur 2022-01-28 11:11:36 +01:00
parent 5ff37febe3
commit 34f3ec8a39
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
htdocs/core/db/mysqli.class.php
View File

@ -210,6 +210,8 @@ class DoliDBMysqli extends DoliDB
{ {
dol_syslog(get_class($this)."::connect host=$host, port=$port, login=$login, passwd=--hidden--, name=$name", LOG_DEBUG); dol_syslog(get_class($this)."::connect host=$host, port=$port, login=$login, passwd=--hidden--, name=$name", LOG_DEBUG);
//mysqli_report(MYSQLI_REPORT_ERROR | MYSQLI_REPORT_STRICT);
// Can also be // Can also be
// mysqli::init(); mysql::options(MYSQLI_INIT_COMMAND, 'SET AUTOCOMMIT = 0'); mysqli::options(MYSQLI_OPT_CONNECT_TIMEOUT, 5); // mysqli::init(); mysql::options(MYSQLI_INIT_COMMAND, 'SET AUTOCOMMIT = 0'); mysqli::options(MYSQLI_OPT_CONNECT_TIMEOUT, 5);
// return mysqli::real_connect($host, $user, $pass, $db, $port); // return mysqli::real_connect($host, $user, $pass, $db, $port);
@ -255,6 +257,8 @@ class DoliDBMysqli extends DoliDB
return false; return false;
} }
/** /**
* Execute a SQL request and return the resultset * Execute a SQL request and return the resultset
* *
@ -288,11 +292,16 @@ class DoliDBMysqli extends DoliDB
} }
} }
if (!$this->database_name) { try {
// Ordre SQL ne necessitant pas de connexion a une base (exemple: CREATE DATABASE) if (!$this->database_name) {
$ret = $this->db->query($query, $result_mode); // Ordre SQL ne necessitant pas de connexion a une base (exemple: CREATE DATABASE)
} else { $ret = $this->db->query($query, $result_mode);
$ret = $this->db->query($query, $result_mode); } else {
$ret = $this->db->query($query, $result_mode);
}
} catch (Exception $e) {
dol_syslog(get_class($this)."::query Exception in query instead of returning an error: ".$e->getMessage(), LOG_ERR);
$ret = false;
} }
if (!preg_match("/^COMMIT/i", $query) && !preg_match("/^ROLLBACK/i", $query)) { if (!preg_match("/^COMMIT/i", $query) && !preg_match("/^ROLLBACK/i", $query)) {