Issue #3056698 by mondrake, quietone: Sqlite Connection::createConnectionOptionsFromUrl should not convert relative paths to full

Author: alexpott

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(

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:'],
     ];

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/',
         ],