diff --git a/core/modules/sqlite/src/Driver/Database/sqlite/Connection.php b/core/modules/sqlite/src/Driver/Database/sqlite/Connection.php index 964fa80c9c9ab901caf6b9eadb05e832191fdc56..1dfd88f65dfde978951a20ab3fc2ed9929282a4a 100644 --- a/core/modules/sqlite/src/Driver/Database/sqlite/Connection.php +++ b/core/modules/sqlite/src/Driver/Database/sqlite/Connection.php @@ -445,12 +445,7 @@ public static function createConnectionOptionsFromUrl($url, $root) { if ($url_components['path'][0] === '/') { $url_components['path'] = substr($url_components['path'], 1); } - if ($url_components['path'][0] === '/' || $url_components['path'] === ':memory:') { - $database['database'] = $url_components['path']; - } - else { - $database['database'] = $root . '/' . $url_components['path']; - } + $database['database'] = $url_components['path']; // User credentials and system port are irrelevant for SQLite. unset( diff --git a/core/modules/sqlite/tests/src/Unit/ConnectionTest.php b/core/modules/sqlite/tests/src/Unit/ConnectionTest.php index b1f1290a98e4abbabedf8e5515d1830e803e6508..4e2417ef2a03a26e3cc7c6ff27cc4c20e65f0677 100644 --- a/core/modules/sqlite/tests/src/Unit/ConnectionTest.php +++ b/core/modules/sqlite/tests/src/Unit/ConnectionTest.php @@ -40,9 +40,8 @@ public function testCreateConnectionOptionsFromUrl(string $url, string $expected * - Expected database connection option */ public static function providerCreateConnectionOptionsFromUrl(): array { - $root = dirname(__DIR__, 8); return [ - 'sqlite relative path' => ['sqlite://localhost/tmp/test', $root . '/tmp/test'], + 'sqlite relative path' => ['sqlite://localhost/tmp/test', 'tmp/test'], 'sqlite absolute path' => ['sqlite://localhost//tmp/test', '/tmp/test'], 'in memory sqlite path' => ['sqlite://localhost/:memory:', ':memory:'], ]; diff --git a/core/tests/Drupal/Tests/Core/Database/UrlConversionTest.php b/core/tests/Drupal/Tests/Core/Database/UrlConversionTest.php index b93f3ecf31c047e03de0b82cc685b3d9f508f20b..e36767d2f5a4dd3fdeb986d83bf83c9102dc2f41 100644 --- a/core/tests/Drupal/Tests/Core/Database/UrlConversionTest.php +++ b/core/tests/Drupal/Tests/Core/Database/UrlConversionTest.php @@ -44,7 +44,6 @@ public function testDbUrlToConnectionConversion($url, $database_array, $include_ * - database_array: An array containing the expected results. */ public static function providerConvertDbUrlToConnectionInfo() { - $root = dirname(__FILE__, 7); return [ 'MySql without prefix' => [ 'mysql://test_user:test_pass@test_host:3306/test_database', @@ -65,7 +64,7 @@ public static function providerConvertDbUrlToConnectionInfo() { [ 'driver' => 'sqlite', 'host' => 'localhost', - 'database' => $root . '/test_database', + 'database' => 'test_database', 'namespace' => 'Drupal\sqlite\Driver\Database\sqlite', 'autoload' => 'core/modules/sqlite/src/Driver/Database/sqlite/', ], @@ -91,7 +90,7 @@ public static function providerConvertDbUrlToConnectionInfo() { [ 'driver' => 'sqlite', 'host' => 'localhost', - 'database' => $root . '/test_database', + 'database' => 'test_database', 'prefix' => 'foo', 'namespace' => 'Drupal\sqlite\Driver\Database\sqlite', 'autoload' => 'core/modules/sqlite/src/Driver/Database/sqlite/', @@ -266,7 +265,7 @@ public static function providerConvertDbUrlToConnectionInfo() { [ 'driver' => 'sqlite', 'host' => 'localhost', - 'database' => $root . '/test_database', + 'database' => 'test_database', 'namespace' => 'Drupal\sqlite\Driver\Database\sqlite', 'autoload' => 'core/modules/sqlite/src/Driver/Database/sqlite/', ],