Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Fix setting wait_timeout for database

Browse Source 
[MAILPOET-2243]
This commit is contained in:
Rostislav Wolny
2019-07-31 22:04:56 +02:00
parent a412f13a9b
commit 68bb0f98a1
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Doctrine/ConnectionFactory.php
View File

@ -43,7 +43,9 @@ class ConnectionFactory {
$driver_options = [ $driver_options = [
"@@session.time_zone = '$timezone_offset'", "@@session.time_zone = '$timezone_offset'",
'@@session.sql_mode = REPLACE(@@sql_mode, "ONLY_FULL_GROUP_BY", "")', '@@session.sql_mode = REPLACE(@@sql_mode, "ONLY_FULL_GROUP_BY", "")',
"@@session.wait_timeout = GREATEST(@@wait_timeout, $this->min_wait_timeout)", // We need to use CONVERT for MySQL 8, Maria DB bug which triggers #1232 - Incorrect argument type to variable 'wait_timeout`
// https://stackoverflow.com/questions/35187378/mariadb-type-error-when-setting-session-variable
"@@session.wait_timeout = GREATEST(CONVERT(COALESCE(@@wait_timeout, 0), SIGNED), $this->min_wait_timeout)",
]; ];
if (!empty(Env::$db_charset)) { if (!empty(Env::$db_charset)) {