Validate DDL column options and PDO DSN parameters

composer.json

@@ -33,7 +33,7 @@
     },
     "require": {
         "php": "~8.3.0 || ~8.4.0 || ~8.5.0",
-        "php-db/phpdb": "^0.6.0"
+        "php-db/phpdb": "^0.6.x-dev"
     },
     "require-dev": {
         "ext-mysqli": "*",

src/Connection.php

@@ -186,14 +186,6 @@ public function connect(): ConnectionInterface
             );
         }
 
-        if ($this->resource->connect_error) {
-            throw new Exception\RuntimeException(
-                'Connection error',
-                $this->resource->connect_errno,
-                new Exception\ErrorException($this->resource->connect_error, $this->resource->connect_errno),
-            );
-        }
-
         if ('' !== ($p['charset'] ?? '')) {
             $this->resource->set_charset($p['charset']);
         }
@@ -264,9 +256,11 @@ public function getCurrentSchema(): string|false
         }
 
         $r = $result->fetch_row();
+        // @codeCoverageIgnoreStart
         if (false === $r) {
             throw new Exception\RuntimeException($this->resource->error);
         }
+        // @codeCoverageIgnoreEnd
 
         /** @var array{0: string|null}|null $r */
         if (null === $r || null === $r[0]) {

src/Driver.php

@@ -50,11 +50,13 @@ public function __construct(
     #[Override]
     public function checkEnvironment(): bool
     {
+        // @codeCoverageIgnoreStart
         if (! extension_loaded('mysqli')) {
             throw new Exception\RuntimeException(
                 'The Mysqli extension is required for this adapter but the extension is not loaded',
             );
         }
+        // @codeCoverageIgnoreEnd
         return true;
     }
 

src/Pdo/Connection.php

@@ -17,10 +17,11 @@
 use function is_array;
 use function is_int;
 use function is_string;
+use function preg_match;
+use function sprintf;
 use function strtolower;
 
 // @mago-expect lint:cyclomatic-complexity
-// @mago-expect lint:kan-defect
 final class Connection extends AbstractPdoConnection
 {
     // @mago-expect analysis:write-only-property - read by the parent's final AbstractPdoConnection::getDsn()
@@ -104,22 +105,22 @@ public function connect(): ConnectionInterface
         if (null === $dsn) {
             $dsn = [];
             if (null !== $database) {
-                $dsn[] = "dbname={$database}";
+                $dsn[] = "dbname={$this->getDsnParameter('dbname', $database)}";
             }
             if (null !== $hostname) {
-                $dsn[] = "host={$hostname}";
+                $dsn[] = "host={$this->getDsnParameter('host', $hostname)}";
             }
             if (null !== $port) {
                 $dsn[] = "port={$port}";
             }
             if (null !== $charset) {
-                $dsn[] = "charset={$charset}";
+                $dsn[] = "charset={$this->getDsnParameter('charset', $charset)}";
             }
             if (null !== $unixSocket) {
-                $dsn[] = "unix_socket={$unixSocket}";
+                $dsn[] = "unix_socket={$this->getDsnParameter('unix_socket', $unixSocket)}";
             }
             if (null !== $version) {
-                $dsn[] = "version={$version}";
+                $dsn[] = "version={$this->getDsnParameter('version', $version)}";
             }
             $dsn = 'mysql:' . implode(';', $dsn);
         }
@@ -132,9 +133,7 @@ public function connect(): ConnectionInterface
             $this->driverName = strtolower((string) $this->resource->getAttribute(PDO::ATTR_DRIVER_NAME));
         } catch (PDOException $e) {
             $code = $e->getCode();
-            if (! is_int($code)) {
-                $code = 0;
-            }
+            $code = is_int($code) ? $code : 0;
             throw new Exception\RuntimeException("Connect Error: {$e->getMessage()}", $code, $e);
         }
 
@@ -154,13 +153,10 @@ public function getCurrentSchema(): string|false
             $this->connect();
         }
 
-        if (null === $this->resource) {
-            throw new Exception\RuntimeException(
-                'Cannot query current schema without a connected resource; call connect() first.',
-            );
-        }
+        /** @var PDO $resource */
+        $resource = $this->resource;
 
-        $result = $this->resource->query('SELECT DATABASE()');
+        $result = $resource->query('SELECT DATABASE()');
         if (! $result instanceof PDOStatement) {
             return false;
         }
@@ -186,4 +182,25 @@ public function getLastGeneratedValue(?string $name = null): string|int|false|nu
 
         return false;
     }
+
+    /**
+     * Return a value that is safe to interpolate into a generated DSN.
+     *
+     * @todo Promote to AbstractPdoConnection in php-db/phpdb as a protected method once a second
+     *       PDO driver package needs it — the validation is generic to all semicolon-delimited
+     *       PDO DSN formats and has no MySQL-specific dependencies.
+     *
+     * @throws Exception\InvalidConnectionParametersException If the value contains DSN control characters.
+     */
+    private function getDsnParameter(string $name, string $value): string
+    {
+        if (preg_match('/[;\x00-\x1f]/', $value) === 1) {
+            throw new Exception\InvalidConnectionParametersException(
+                sprintf('The "%s" connection parameter contains invalid characters', $name),
+                $this->connectionParameters,
+            );
+        }
+
+        return $value;
+    }
 }

src/Pdo/Driver.php

@@ -7,7 +7,6 @@
 use Override;
 use PDO;
 use PDOStatement;
-use PhpDb\Adapter\Driver\Feature\DriverFeatureProviderInterface;
 use PhpDb\Adapter\Driver\Pdo\AbstractPdo;
 use PhpDb\Adapter\Driver\Pdo\Result;
 use PhpDb\Adapter\Driver\Pdo\Statement;
@@ -24,6 +23,7 @@ final class Driver extends AbstractPdo
     /**
      * @param array<string, mixed> $features
      */
+    // @mago-expect analysis:unused-parameter
     public function __construct(
         (PdoConnectionInterface&PdoDriverAwareInterface)|PDO $connection,
         StatementInterface&PdoDriverAwareInterface $statementPrototype = new Statement(),
@@ -39,11 +39,6 @@ public function __construct(
         }
 
         $this->statementPrototype->setDriver($this);
-
-        // $features is not constructor promoted because $this->features is defined in the trait
-        if ([] !== $features && $this instanceof DriverFeatureProviderInterface) {
-            $this->addFeatures($features);
-        }
     }
 
     /**

src/Result.php

@@ -11,9 +11,12 @@
 use Override;
 use PhpDb\Adapter\Driver\ResultInterface;
 use PhpDb\Adapter\Exception;
+use PhpDb\ResultSet\ResultSet;
+use PhpDb\ResultSet\ResultSetInterface;
 // phpcs:ignore SlevomatCodingStandard.Namespaces.UnusedUses.UnusedUse
 use ReturnTypeWillChange;
 
+use function array_combine;
 use function array_fill;
 use function call_user_func_array;
 use function count;
@@ -140,6 +143,29 @@ public function getGeneratedValue(): string|int|false|null
         return $this->generatedValue;
     }
 
+    /**
+     * {@inheritDoc}
+     *
+     * @throws Exception\RuntimeException When isQueryResult() is false.
+     * @throws \Exception If the seeded result set rejects this result as its data source.
+     */
+    #[Override]
+    public function getQueryResult(?ResultSetInterface $resultPrototype = null): ResultSetInterface
+    {
+        if (! $this->isQueryResult()) {
+            throw new Exception\RuntimeException(
+                'Cannot produce a query result set from a result that is not a query result;'
+                    . ' check isQueryResult() first',
+            );
+        }
+
+        $resultPrototype ??= new ResultSet();
+        $resultSet       = clone $resultPrototype;
+        $resultSet->initialize($this);
+
+        return $resultSet;
+    }
+
     /**
      * {@inheritDoc}
      */
@@ -282,14 +308,13 @@ public function valid()
      */
     protected function loadDataFromMysqliStatement(): bool
     {
-        if (! $this->resource instanceof mysqli_stmt) {
-            throw new Exception\RuntimeException('Expected resource to be an instance of mysqli_stmt');
-        }
+        /** @var mysqli_stmt $statement */
+        $statement = $this->resource;
 
         // build the default reference based bind structure, if it does not already exist
         if (null === $this->statementBindValues['keys']) {
             $this->statementBindValues['keys'] = [];
-            $resultResource                    = $this->resource->result_metadata();
+            $resultResource                    = $statement->result_metadata();
             if (false === $resultResource) {
                 return $resultResource;
             }
@@ -307,24 +332,23 @@ protected function loadDataFromMysqliStatement(): bool
             foreach ($this->statementBindValues['values'] as $i => &$f) {
                 $refs[$i] = &$f;
             }
-            call_user_func_array([$this->resource, 'bind_result'], $this->statementBindValues['values']);
+            call_user_func_array([$statement, 'bind_result'], $this->statementBindValues['values']);
         }
 
-        if (($r = $this->resource->fetch()) === null) {
+        if (($r = $statement->fetch()) === null) {
             if (! $this->isBuffered) {
-                $this->resource->close();
+                $statement->close();
             }
             return false;
         }
 
         if (! $r) {
-            throw new Exception\RuntimeException($this->resource->error);
+            throw new Exception\RuntimeException($statement->error);
         }
 
-        // dereference
-        for ($i = 0, $count = count($this->statementBindValues['keys']); $i < $count; $i++) {
-            $this->currentData[$this->statementBindValues['keys'][$i]] = $this->statementBindValues['values'][$i];
-        }
+        // dereference: values was filled to the same length as keys when the bindings were built
+        $this->currentData = array_combine($this->statementBindValues['keys'], $this->statementBindValues['values']);
+
         $this->currentComplete = true;
         $this->nextComplete    = true;
         $this->position++;

src/Sql/ColumnFormatEnum.php

@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpDb\Mysql\Sql;
+
+/**
+ * Keywords accepted by the COLUMN_FORMAT column option.
+ *
+ * @see https://dev.mysql.com/doc/refman/8.4/en/create-table.html
+ */
+enum ColumnFormatEnum: string
+{
+    case Fixed   = 'FIXED';
+    case Dynamic = 'DYNAMIC';
+    case Default = 'DEFAULT';
+}