Skip to content
Snippets Groups Projects
Commit 3c431ab9 authored by catch's avatar catch
Browse files

Issue #3126940 by Beakerboy, daffie: New DB URI breaks if an existing query...

Issue #3126940 by Beakerboy, daffie: New DB URI breaks if an existing query part is missing the new module parameter

(cherry picked from commit d6f9e2c4)
parent 06752837
No related branches found
No related tags found
9 merge requests!1445Issue #2920039: Views' User Name exposed group filter validation,!1298Issue #3240993: Let layout builder render inline block translations,!774Issue #3174569: Example node template file name is incorrect,!497Issue #2463967: Use .user.ini file for PHP settings,!433Resolve #3163663 "Too many open files",!233Resolve #2693787 "Taxonomy term name",!133Resolve #2666286 "Clean up menuui",!112Resolve #3187004 "Drupaldatetime serialization issue",!53Resolve #3181870: Correct typo "the the" in "core/classList" deprecation message.
...@@ -468,7 +468,7 @@ public static function convertDbUrlToConnectionInfo($url, $root) { ...@@ -468,7 +468,7 @@ public static function convertDbUrlToConnectionInfo($url, $root) {
$url_components = parse_url($url); $url_components = parse_url($url);
if (isset($url_components['query'])) { if (isset($url_components['query'])) {
parse_str($url_components['query'], $query); parse_str($url_components['query'], $query);
if ($query['module']) { if (isset($query['module']) && $query['module']) {
$module = $query['module']; $module = $query['module'];
// Set up an additional autoloader. We don't use the main autoloader as // Set up an additional autoloader. We don't use the main autoloader as
// this method can be called before Drupal is installed and is never // this method can be called before Drupal is installed and is never
......
...@@ -188,6 +188,19 @@ public function providerConvertDbUrlToConnectionInfo() { ...@@ -188,6 +188,19 @@ public function providerConvertDbUrlToConnectionInfo() {
'autoload' => 'core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestPgsql/', 'autoload' => 'core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestPgsql/',
], ],
], ],
'MySql with a custom query parameter' => [
'',
'mysql://test_user:test_pass@test_host:3306/test_database?extra=value',
[
'driver' => 'mysql',
'username' => 'test_user',
'password' => 'test_pass',
'host' => 'test_host',
'database' => 'test_database',
'port' => 3306,
'namespace' => 'Drupal\Core\Database\Driver\mysql',
],
],
]; ];
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment