Merge branch '576-fix-warranty-loading-from-motiv' into 'master-fix'

Fix splitting of db info. #576

See merge request jankstudio/resq!691
This commit is contained in:
Kendrick Chan 2021-06-09 10:20:37 +00:00
commit 40018d262f

View file

@ -26,17 +26,17 @@ $dotenv->loadEnv(__DIR__.'/../../.env');
$db_info = $_ENV['DATABASE_URL']; $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 // 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='; $db_type = 'mysql:host=';
$user = $result[1]; $user = $result[1];
$pass = $result[2]; $pass = $result[2];
$ip_port = $result[3] . ':' . $result[4] . ';'; $ip_port = $result[3] . ':' . $result[4] . ';';
$db_name = 'dbname=' . $result[5] . ';'; $db_name = 'dbname=' . $result[5] . ';';
$charset = 'charset=UTF8'; $charset = $result[6];
$dsn = $db_type . $ip_port . $db_name . $charset; $dsn = $db_type . $ip_port . $db_name . $charset;