Add supporting of general URI DSN (#78)

Author: SerafimArts

src/Driver/Driver.php

@@ -18,6 +18,7 @@
 use PDOStatement;
 use Psr\Log\LoggerAwareInterface;
 use Psr\Log\LoggerAwareTrait;
+use Spiral\Database\Exception\ConfigException;
 use Spiral\Database\Exception\DriverException;
 use Spiral\Database\Exception\ReadonlyConnectionException;
 use Spiral\Database\Exception\StatementException;
@@ -127,6 +128,33 @@ public function __construct(
         if ($this->options['readonlySchema']) {
             $this->schemaHandler = new ReadonlyHandler($this->schemaHandler);
         }
+
+        // Actualize DSN
+        $this->updateDSN();
+    }
+
+    /**
+     * Updates an internal options
+     *
+     * @return void
+     */
+    private function updateDSN(): void
+    {
+        [$connection, $this->options['username'], $this->options['password']] = $this->parseDSN();
+
+        // Update connection. The DSN field can be located in one of the
+        // following keys of the configuration array.
+        switch (true) {
+            case \array_key_exists('dsn', $this->options):
+                $this->options['dsn'] = $connection;
+                break;
+            case \array_key_exists('addr', $this->options):
+                $this->options['addr'] = $connection;
+                break;
+            default:
+                $this->options['connection'] = $connection;
+                break;
+        }
     }
 
     /**
@@ -706,19 +734,52 @@ protected function rollbackSavepoint(int $level): void
         $this->execute('ROLLBACK TO SAVEPOINT ' . $this->identifier("SVP{$level}"));
     }
 
+    /**
+     * @return array{string, string, string}
+     */
+    private function parseDSN(): array
+    {
+        $dsn = $this->getDSN();
+
+        $user = (string)($this->options['username'] ?? '');
+        $pass = (string)($this->options['password'] ?? '');
+
+        if (\strpos($dsn, '://') > 0) {
+            $parts = \parse_url($dsn);
+
+            if (!isset($parts['scheme'])) {
+                throw new ConfigException('Configuration database scheme must be defined');
+            }
+
+            // Update username and password from DSN if not defined.
+            $user = $user ?: $parts['user'] ?? '';
+            $pass = $pass ?: $parts['pass'] ?? '';
+
+            // Build new DSN
+            $dsn = \sprintf('%s:host=%s', $parts['scheme'], $parts['host'] ?? 'localhost');
+
+            if (isset($parts['port'])) {
+                $dsn .= ';port=' . $parts['port'];
+            }
+
+            if (isset($parts['path']) && \trim($parts['path'], '/')) {
+                $dsn .= ';dbname=' . \trim($parts['path'], '/');
+            }
+        }
+
+        return [$dsn, $user, $pass];
+    }
+
     /**
      * Create instance of configured PDO class.
      *
      * @return PDO
      */
     protected function createPDO(): PDO
     {
-        return new PDO(
-            $this->getDSN(),
-            $this->options['username'],
-            $this->options['password'],
-            $this->options['options']
-        );
+        [$dsn, $user, $pass] = $this->parseDSN();
+
+        return new PDO($dsn, $user, $pass, $this->options['options']);
     }
 
     /**

tests/Database/BaseTest.php

@@ -61,13 +61,15 @@ public function getDriver(array $options = []): Driver
         if (!isset($this->driver)) {
             $class = $config['driver'];
 
-            $this->driver = new $class(\array_merge($options, [
-                'connection' => $config['conn'],
-                'username'   => $config['user'],
-                'password'   => $config['pass'],
-                'options'    => [],
-                'queryCache' => true
-            ]));
+            $this->driver = new $class(
+                [
+                    'connection' => $config['conn'],
+                    'username'   => $config['user'] ?? '',
+                    'password'   => $config['pass'] ?? '',
+                    'options'    => [],
+                    'queryCache' => true
+                ]
+            );
         }
 
         static::$logger = static::$logger ?? new TestLogger();

tests/bootstrap.php

@@ -30,9 +30,7 @@
     ],
     'mysql'     => [
         'driver'     => Database\Driver\MySQL\MySQLDriver::class,
-        'conn'       => 'mysql:host=127.0.0.1:13306;dbname=spiral',
-        'user'       => 'root',
-        'pass'       => 'root',
+        'conn'       => 'mysql://root:[email protected]:13306/spiral',
         'queryCache' => 100
     ],
     'postgres'  => [