From 7c6827ea9fd9a3cd61bbc3f583cc32f7e94b3b02 Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Sat, 18 Apr 2020 13:21:46 +0200 Subject: [PATCH] Added MYSQL_ATTR_USE_BUFFERED_QUERY driver option with value true for mysql/maria connections --- composer.json | 2 +- config/autoload/entity-manager.local.php.dist | 1 + config/test/test_config.global.php | 1 + docker/config/shlink_in_docker.local.php | 2 ++ 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 191a7d1b..c324b39c 100644 --- a/composer.json +++ b/composer.json @@ -51,7 +51,7 @@ "shlinkio/shlink-common": "dev-master#e659cf9d9b5b3b131419e2f55f2e595f562baafc as 3.1.0", "shlinkio/shlink-config": "^1.0", "shlinkio/shlink-event-dispatcher": "^1.4", - "shlinkio/shlink-installer": "dev-master#487227bfc03233b44e8a113af0bc5bd0c6d67d5d as 5.0.0", + "shlinkio/shlink-installer": "dev-master#508652c895fb88512b8685198be1e2cfca59f4ce as 5.0.0", "shlinkio/shlink-ip-geolocation": "^1.4", "symfony/console": "^5.0", "symfony/filesystem": "^5.0", diff --git a/config/autoload/entity-manager.local.php.dist b/config/autoload/entity-manager.local.php.dist index 3c38fb82..d2fc3fd8 100644 --- a/config/autoload/entity-manager.local.php.dist +++ b/config/autoload/entity-manager.local.php.dist @@ -12,6 +12,7 @@ return [ 'host' => 'shlink_db', 'driverOptions' => [ PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8', + PDO::MYSQL_ATTR_USE_BUFFERED_QUERY => true, ], ], ], diff --git a/config/test/test_config.global.php b/config/test/test_config.global.php index 5d57e981..6aad5375 100644 --- a/config/test/test_config.global.php +++ b/config/test/test_config.global.php @@ -35,6 +35,7 @@ $buildDbConnection = function (): array { 'charset' => 'utf8', 'driverOptions' => [ PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8', + PDO::MYSQL_ATTR_USE_BUFFERED_QUERY => true, ], ], 'postgres' => [ diff --git a/docker/config/shlink_in_docker.local.php b/docker/config/shlink_in_docker.local.php index f1842de2..725a019b 100644 --- a/docker/config/shlink_in_docker.local.php +++ b/docker/config/shlink_in_docker.local.php @@ -41,6 +41,8 @@ $helper = new class { $driverOptions = ! contains(['maria', 'mysql'], $driver) ? [] : [ // 1002 -> PDO::MYSQL_ATTR_INIT_COMMAND 1002 => 'SET NAMES utf8', + // 1000 -> PDO::MYSQL_ATTR_USE_BUFFERED_QUERY + 1000 => true, ]; return [ 'driver' => self::DB_DRIVERS_MAP[$driver],