From 4351d1242ee632111c8534ac17e775215c4aeb88 Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Wed, 9 Jun 2021 10:19:22 +0000 Subject: [PATCH] Fix splitting of db info. #576 --- utils/load_warranty_serial/load_serials.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/load_warranty_serial/load_serials.php b/utils/load_warranty_serial/load_serials.php index 812b151c..c2bb5671 100644 --- a/utils/load_warranty_serial/load_serials.php +++ b/utils/load_warranty_serial/load_serials.php @@ -26,17 +26,17 @@ $dotenv->loadEnv(__DIR__.'/../../.env'); $db_info = $_ENV['DATABASE_URL']; -// sample format of db_info: mysql://db_user:db_password@127.0.0.1:3306/resq +// sample format of db_info: mysql://db_user:db_password@127.0.0.1:3306/resq?charset=utf8 // dsn for PDO needs to be: mysql:host=127.0.0.1:3306;dbname=resq;charset=UTF8 -preg_match('/^mysql:\/\/(.*):(.*)@(.*):(.*)\/(.*)/', $db_info, $result); +preg_match('/^mysql:\/\/(.*):(.*)@(.*):(.*)\/(.*)\?(.*)/', $db_info, $result); $db_type = 'mysql:host='; $user = $result[1]; $pass = $result[2]; $ip_port = $result[3] . ':' . $result[4] . ';'; $db_name = 'dbname=' . $result[5] . ';'; -$charset = 'charset=UTF8'; +$charset = $result[6]; $dsn = $db_type . $ip_port . $db_name . $charset;