Refactoring

src/DsnBuilder.php

@@ -4,19 +4,52 @@
 
 class DsnBuilder
 {
-    public const PREFIX_MYSQL = "mysql";
-    public const PREFIX_POSTGRES = "pgsql";
-    public const PREFIX_CUBRID = "cubrid";
-    public const PREFIX_ORACLE = "oci";
-    public const PREFIX_SQLITE = "sqlite";
-    public const PREFIX_ODBC = "odbc";
-    public const PREFIX_IBM = "ibm";
-    public const PREFIX_MS_SQL = "sqlsrv";
-    public const PREFIX_MS_SQL_LIB = "sybase";
-    public const PREFIX_INFORMIX = "informix";
-    public const PREFIX_FIREBIRD = "firebird";
+    /**
+     * @deprecated use {@link DsnPrefix} cases instead.
+     */
+    public const PREFIX_MYSQL = DsnPrefix::MYSQL;
+    /**
+     * @deprecated use {@link DsnPrefix} cases instead.
+     */
+    public const PREFIX_POSTGRES = DsnPrefix::POSTGRES;
+    /**
+     * @deprecated use {@link DsnPrefix} cases instead.
+     */
+    public const PREFIX_CUBRID = DsnPrefix::CUBRID;
+    /**
+     * @deprecated use {@link DsnPrefix} cases instead.
+     */
+    public const PREFIX_ORACLE = DsnPrefix::ORACLE;
+    /**
+     * @deprecated use {@link DsnPrefix} cases instead.
+     */
+    public const PREFIX_SQLITE = DsnPrefix::SQLITE;
+    /**
+     * @deprecated use {@link DsnPrefix} cases instead.
+     */
+    public const PREFIX_ODBC = DsnPrefix::ODBC;
+    /**
+     * @deprecated use {@link DsnPrefix} cases instead.
+     */
+    public const PREFIX_IBM = DsnPrefix::IBM;
+    /**
+     * @deprecated use {@link DsnPrefix} cases instead.
+     */
+    public const PREFIX_MS_SQL = DsnPrefix::MS_SQL;
+    /**
+     * @deprecated use {@link DsnPrefix} cases instead.
+     */
+    public const PREFIX_MS_SQL_LIB = DsnPrefix::MS_SQL_LIB;
+    /**
+     * @deprecated use {@link DsnPrefix} cases instead.
+     */
+    public const PREFIX_INFORMIX = DsnPrefix::INFORMIX;
+    /**
+     * @deprecated use {@link DsnPrefix} cases instead.
+     */
+    public const PREFIX_FIREBIRD = DsnPrefix::FIREBIRD;
 
-    protected string $prefix = self::PREFIX_MYSQL;
+    protected DsnPrefix $prefix = DsnPrefix::MYSQL;
     protected array $config = [];
 
     public static function createMySQLDsn(
@@ -39,12 +72,16 @@ public static function createPostgresDsn(
     ): self {
         $dsn = new self();
         $dsn->config = compact('host', 'port', 'dbname', 'sslMode');
-        $dsn->prefix = self::PREFIX_POSTGRES;
+        $dsn->prefix = DsnPrefix::POSTGRES;
         return $dsn;
     }
 
-    public function setPrefix(string $prefix): self
+    public function setPrefix(string|DsnPrefix $prefix): self
     {
+        if (is_string($prefix)) {
+            $prefix = DsnPrefix::from($prefix);
+        }
+
         $this->prefix = $prefix;
         return $this;
     }
@@ -60,9 +97,13 @@ public function getDsnProp(string $prop): string|int|null
         return $this->config[$prop] ?? null;
     }
 
-    public static function buildDsn(string $prefix, array $props): string
+    public static function buildDsn(string|DsnPrefix $prefix, array $props): string
     {
-        $dsn = "{$prefix}:";
+        if (is_string($prefix)) {
+            $prefix = DsnPrefix::from($prefix);
+        }
+
+        $dsn = "{$prefix->value}:";
         foreach ($props as $name => $value) {
             if ($value === null) {
                 continue;
@@ -76,7 +117,7 @@ public static function buildDsn(string $prefix, array $props): string
 
     public function __toString(): string
     {
-        return $this->buildDsn($this->prefix, $this->config);
+        return static::buildDsn($this->prefix->value, $this->config);
     }
 
     public static function new(): self

src/DsnPrefix.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace Tnapf\Driver;
+
+enum DsnPrefix: string
+{
+    case MYSQL = "mysql";
+    case POSTGRES = "pgsql";
+    case CUBRID = "cubrid";
+    case ORACLE = "oci";
+    case SQLITE = "sqlite";
+    case ODBC = "odbc";
+    case IBM = "ibm";
+    case MS_SQL = "sqlsrv";
+    case MS_SQL_LIB = "sybase";
+    case INFORMIX = "informix";
+    case FIREBIRD = "firebird";
+}

src/PDODriver.php

@@ -8,9 +8,6 @@
 use Tnapf\Driver\Interfaces\DriverInterface;
 use Tnapf\Driver\Interfaces\PreparedQueryInterface;
 use Tnapf\Driver\Interfaces\QueryInterface;
-use Tnapf\Driver\PreparedQuery;
-use Tnapf\Driver\Query;
-use Tnapf\Driver\Interfaces\QueryResponseInterface;
 
 class PDODriver implements DriverInterface
 {
@@ -39,6 +36,9 @@ public function preparedQuery(string $query): PreparedQueryInterface
         return new PreparedQuery($query, $this);
     }
 
+    /**
+     * @throws DriverException
+     */
     public function connect(): void
     {
         if ($this->isConnected()) {

src/PreparedQuery.php

@@ -2,6 +2,8 @@
 
 namespace Tnapf\Driver;
 
+use Exception;
+use PDOException;
 use PDOStatement;
 use Tnapf\Driver\Exceptions\QueryException;
 use Tnapf\Driver\Interfaces\DriverInterface;
@@ -19,9 +21,16 @@ public function __construct(
         $this->stmt = $this->driver->pdo->prepare($this->query);
     }
 
+    /**
+     * @throws QueryException
+     */
     public function bindValue(string $name, mixed $value): void
     {
-        $result = $this->stmt->bindValue($name, $value);
+        try {
+            $result = $this->stmt->bindValue($name, $value);
+        } catch (PDOException $e) {
+            throw new QueryException($this, $e->getMessage(), $e->getCode(), $e);
+        }
 
         if ($result === false) {
             [$sqlState, $errorCode, $errorMessage] = $this->stmt->errorInfo();
@@ -33,16 +42,26 @@ public function bindValue(string $name, mixed $value): void
         }
     }
 
+    /**
+     * @throws QueryException
+     */
     public function bindValues(array $values): void
     {
         foreach ($values as $name => $value) {
             $this->bindValue($name, $value);
         }
     }
 
+    /**
+     * @throws QueryException
+     */
     public function execute(): QueryResponseInterface
     {
-        $result = $this->stmt->execute();
+        try {
+            $result = $this->stmt->execute();
+        } catch (PDOException $e) {
+            throw new QueryException($this, $e->getMessage(), $e->getCode(), $e);
+        }
 
         if ($result === false) {
             [$sqlState, $errorCode, $errorMessage] = $this->stmt->errorInfo();