From 34f3ec8a39e9e743980d9557b2069a1fba3d49b8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 28 Jan 2022 11:11:36 +0100
Subject: [PATCH] Try a fix with php that return a fatal error on some mysql

---
 htdocs/core/db/mysqli.class.php | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/db/mysqli.class.php b/htdocs/core/db/mysqli.class.php
index 4dd71f0e351..fa24e4a70ac 100644
--- a/htdocs/core/db/mysqli.class.php
+++ b/htdocs/core/db/mysqli.class.php
@@ -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);
 
+		//mysqli_report(MYSQLI_REPORT_ERROR | MYSQLI_REPORT_STRICT);
+
 		// Can also be
 		// 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);
@@ -255,6 +257,8 @@ class DoliDBMysqli extends DoliDB
 		return false;
 	}
 
+
+
 	/**
 	 * 	Execute a SQL request and return the resultset
 	 *
@@ -288,11 +292,16 @@ class DoliDBMysqli extends DoliDB
 			}
 		}
 
-		if (!$this->database_name) {
-			// Ordre SQL ne necessitant pas de connexion a une base (exemple: CREATE DATABASE)
-			$ret = $this->db->query($query, $result_mode);
-		} else {
-			$ret = $this->db->query($query, $result_mode);
+		try {
+			if (!$this->database_name) {
+				// Ordre SQL ne necessitant pas de connexion a une base (exemple: CREATE DATABASE)
+				$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)) {