From e92bda53734ca87f3bc8c08eaad57dd267a558db Mon Sep 17 00:00:00 2001 From: "J. King" Date: Tue, 15 Jan 2019 08:58:11 -0500 Subject: [PATCH] Various changes: - Fix handling of binary data and long strings - Simplify handling of socket connections - Fix coverage --- lib/Conf.php | 2 ++ lib/Db/MySQL/Driver.php | 14 +++-------- lib/Db/MySQL/ExceptionBuilder.php | 6 +---- lib/Db/MySQL/PDODriver.php | 17 ++++++------- lib/Db/MySQL/Statement.php | 24 ++++++++++++++----- lib/Db/PostgreSQL/Dispatch.php | 1 + lib/Db/PostgreSQL/PDOStatement.php | 1 + lib/Db/SQLState.php | 2 +- tests/cases/Db/BaseStatement.php | 2 +- tests/cases/Db/MySQL/TestDriver.php | 4 +++- tests/cases/Db/MySQL/TestResult.php | 3 ++- tests/cases/Db/MySQL/TestStatement.php | 16 ++++++++++++- tests/cases/Db/MySQL/TestUpdate.php | 4 +++- tests/cases/Db/MySQLPDO/TestDriver.php | 4 +++- tests/cases/Db/MySQLPDO/TestResult.php | 4 +++- tests/cases/Db/MySQLPDO/TestStatement.php | 4 +++- tests/cases/Db/MySQLPDO/TestUpdate.php | 5 +++- tests/cases/Db/PostgreSQL/TestDriver.php | 3 ++- tests/cases/Db/PostgreSQL/TestStatement.php | 3 ++- tests/cases/Db/PostgreSQL/TestUpdate.php | 3 ++- tests/cases/Db/PostgreSQLPDO/TestDriver.php | 3 ++- .../cases/Db/PostgreSQLPDO/TestStatement.php | 3 ++- tests/cases/Db/PostgreSQLPDO/TestUpdate.php | 4 +++- tests/cases/Db/SQLite3PDO/TestCreation.php | 3 ++- tests/cases/Db/SQLite3PDO/TestDriver.php | 3 ++- tests/cases/Db/SQLite3PDO/TestStatement.php | 3 ++- tests/cases/Db/SQLite3PDO/TestUpdate.php | 4 +++- 27 files changed, 93 insertions(+), 52 deletions(-) diff --git a/lib/Conf.php b/lib/Conf.php index cfdb1fb..271a3cd 100644 --- a/lib/Conf.php +++ b/lib/Conf.php @@ -53,6 +53,8 @@ class Conf { public $dbMySQLPort = 3306; /** @var string Database name on MySQL/MariaDB database server (if using MySQL/MariaDB) */ public $dbMySQLDb = "arsse"; + /** @var string Unix domain socket or named pipe to use for MySQL when not connecting over TCP */ + public $dbMySQLSocket = ""; /** @var string Class of the user management driver in use (Internal by default) */ public $userDriver = User\Internal\Driver::class; diff --git a/lib/Db/MySQL/Driver.php b/lib/Db/MySQL/Driver.php index 8a2ab62..8357e48 100644 --- a/lib/Db/MySQL/Driver.php +++ b/lib/Db/MySQL/Driver.php @@ -28,22 +28,14 @@ class Driver extends \JKingWeb\Arsse\Db\AbstractDriver { if (!static::requirementsMet()) { throw new Exception("extMissing", static::driverName()); // @codeCoverageIgnore } - $host = Arsse::$conf->dbMySQLHost; - if ($host[0] === "/") { - // host is a Unix socket - $socket = $host; - $host = ""; - } elseif(substr($host, 0, 9) === "\\\\.\\pipe\\") { - // host is a Windows named piple - $socket = substr($host, 10); - $host = ""; - } + $host = strtolower(!strlen((string) Arsse::$conf->dbMySQLHost) ? "localhost" : Arsse::$conf->dbMySQLHost); + $socket = strlen((string) Arsse::$conf->dbMySQLSocket) ? Arsse::$conf->dbMySQLSocket : ini_get("mysqli.default_socket"); $user = Arsse::$conf->dbMySQLUser ?? ""; $pass = Arsse::$conf->dbMySQLPass ?? ""; $port = Arsse::$conf->dbMySQLPost ?? 3306; $db = Arsse::$conf->dbMySQLDb ?? "arsse"; // make the connection - $this->makeConnection($user, $pass, $db, $host, $port, $socket ?? ""); + $this->makeConnection($user, $pass, $db, $host, $port, $socket); // set session variables foreach (static::makeSetupQueries() as $q) { $this->exec($q); diff --git a/lib/Db/MySQL/ExceptionBuilder.php b/lib/Db/MySQL/ExceptionBuilder.php index b801d7d..53cf671 100644 --- a/lib/Db/MySQL/ExceptionBuilder.php +++ b/lib/Db/MySQL/ExceptionBuilder.php @@ -11,16 +11,12 @@ use JKingWeb\Arsse\Db\ExceptionInput; use JKingWeb\Arsse\Db\ExceptionTimeout; trait ExceptionBuilder { - protected function buildException(): array { - return self::buildEngineException($this->db->errno, $this->db->error); - } - public static function buildEngineException($code, string $msg): array { switch ($code) { case 1205: return [ExceptionTimeout::class, 'general', $msg]; case 1364: - return [ExceptionInput::class, "constraintViolation", $msg]; + return [ExceptionInput::class, "engineConstraintViolation", $msg]; case 1366: return [ExceptionInput::class, 'engineTypeViolation', $msg]; default: diff --git a/lib/Db/MySQL/PDODriver.php b/lib/Db/MySQL/PDODriver.php index abc97f4..4c47a29 100644 --- a/lib/Db/MySQL/PDODriver.php +++ b/lib/Db/MySQL/PDODriver.php @@ -21,16 +21,13 @@ class PDODriver extends Driver { } protected function makeConnection(string $db, string $user, string $password, string $host, int $port, string $socket) { - $dsn = []; - $dsn[] = "charset=utf8mb4"; - $dsn[] = "dbname=$db"; - if (strlen($host)) { - $dsn[] = "host=$host"; - $dsn[] = "port=$port"; - } elseif (strlen($socket)) { - $dsn[] = "socket=$socket"; - } - $dsn = "mysql:".implode(";", $dsn); + $dsn = "mysql:".implode(";", [ + "charset=utf8mb4", + "dbname=$db", + "host=$host", + "socket=$socket", + "port=$port", + ]); $this->db = new \PDO($dsn, $user, $password, [ \PDO::ATTR_ERRMODE => \PDO::ERRMODE_EXCEPTION, ]); diff --git a/lib/Db/MySQL/Statement.php b/lib/Db/MySQL/Statement.php index ca0405e..8af64f4 100644 --- a/lib/Db/MySQL/Statement.php +++ b/lib/Db/MySQL/Statement.php @@ -28,6 +28,7 @@ class Statement extends \JKingWeb\Arsse\Db\AbstractStatement { protected $packetSize; protected $values; + protected $longs; protected $binds = ""; public function __construct(\mysqli $db, string $query, array $bindings = [], int $packetSize = 4194304) { @@ -39,9 +40,9 @@ class Statement extends \JKingWeb\Arsse\Db\AbstractStatement { protected function prepare(string $query): bool { $this->st = $this->db->prepare($query); - if (!$this->st) { - list($excClass, $excMsg, $excData) = $this->buildEngineException($this->db->errno, $this->db->error); - throw new $excClass($excMsg, $excData); + if (!$this->st) { // @codeCoverageIgnore + list($excClass, $excMsg, $excData) = $this->buildEngineException($this->db->errno, $this->db->error); // @codeCoverageIgnore + throw new $excClass($excMsg, $excData); // @codeCoverageIgnore } return true; } @@ -56,16 +57,26 @@ class Statement extends \JKingWeb\Arsse\Db\AbstractStatement { public function runArray(array $values = []): \JKingWeb\Arsse\Db\Result { $this->st->reset(); + // clear normalized values + $this->binds = ""; + $this->values = []; + $this->longs = []; // prepare values and them all at once $this->bindValues($values); if ($this->values) { $this->st->bind_param($this->binds, ...$this->values); } + // packetize any large values + foreach ($this->longs as $pos => $data) { + $this->st->send_long_data($pos, $data); + unset($data); + } // execute the statement $this->st->execute(); // clear normalized values $this->binds = ""; $this->values = []; + $this->longs = []; // check for errors if ($this->st->sqlstate !== "00000") { if ($this->st->sqlstate === "HY000") { @@ -85,14 +96,15 @@ class Statement extends \JKingWeb\Arsse\Db\AbstractStatement { protected function bindValue($value, string $type, int $position): bool { // this is a bit of a hack: we collect values (and MySQL bind types) here so that we can take // advantage of the work done by bindValues() even though MySQL requires everything to be bound - // all at once; we also packetize large values here if necessary + // all at once; we also segregate large values for later packetization if (($type === "binary" && !is_null($value)) || (is_string($value) && strlen($value) > $this->packetSize)) { $this->values[] = null; - $this->st->send_long_data($position - 1, $value); + $this->longs[$position - 1] = $value; + $this->binds .= "b"; } else { $this->values[] = $value; + $this->binds .= self::BINDINGS[$type]; } - $this->binds .= self::BINDINGS[$type]; return true; } public static function mungeQuery(string $query, array $types, ...$extraData): string { diff --git a/lib/Db/PostgreSQL/Dispatch.php b/lib/Db/PostgreSQL/Dispatch.php index 6f4c89d..220dda2 100644 --- a/lib/Db/PostgreSQL/Dispatch.php +++ b/lib/Db/PostgreSQL/Dispatch.php @@ -17,6 +17,7 @@ trait Dispatch { } } + /** @codeCoverageIgnore */ public static function buildEngineException($code, string $msg): array { // PostgreSQL uses SQLSTATE exclusively, so this is not used return []; diff --git a/lib/Db/PostgreSQL/PDOStatement.php b/lib/Db/PostgreSQL/PDOStatement.php index 4bb32cb..c9b7b82 100644 --- a/lib/Db/PostgreSQL/PDOStatement.php +++ b/lib/Db/PostgreSQL/PDOStatement.php @@ -11,6 +11,7 @@ class PDOStatement extends \JKingWeb\Arsse\Db\PDOStatement { return Statement::mungeQuery($query, $types, false); } + /** @codeCoverageIgnore */ public static function buildEngineException($code, string $msg): array { // PostgreSQL uses SQLSTATE exclusively, so this is not used return []; diff --git a/lib/Db/SQLState.php b/lib/Db/SQLState.php index 7448798..7e4fa29 100644 --- a/lib/Db/SQLState.php +++ b/lib/Db/SQLState.php @@ -20,7 +20,7 @@ trait SQLState { case "23000": case "23502": case "23505": - return [ExceptionInput::class, "constraintViolation", $msg]; + return [ExceptionInput::class, "engineConstraintViolation", $msg]; case "55P03": case "57014": return [ExceptionTimeout::class, 'general', $msg]; diff --git a/tests/cases/Db/BaseStatement.php b/tests/cases/Db/BaseStatement.php index 94922e6..bd719aa 100644 --- a/tests/cases/Db/BaseStatement.php +++ b/tests/cases/Db/BaseStatement.php @@ -67,7 +67,7 @@ abstract class BaseStatement extends \JKingWeb\Arsse\Test\AbstractTest { /** @dataProvider provideBinaryBindings */ public function testHandleBinaryData($value, string $type, string $exp) { - if (in_array(static::$implementation, ["MySQL", "PostgreSQL", "PDO PostgreSQL"])) { + if (in_array(static::$implementation, ["PostgreSQL", "PDO PostgreSQL"])) { $this->markTestSkipped("Correct handling of binary data with PostgreSQL and native MySQL is currently unknown"); } if ($exp === "null") { diff --git a/tests/cases/Db/MySQL/TestDriver.php b/tests/cases/Db/MySQL/TestDriver.php index 9b08395..d3059ba 100644 --- a/tests/cases/Db/MySQL/TestDriver.php +++ b/tests/cases/Db/MySQL/TestDriver.php @@ -8,7 +8,9 @@ namespace JKingWeb\Arsse\TestCase\Db\MySQL; /** * @group slow - * @covers \JKingWeb\Arsse\Db\MySQL\Driver */ + * @covers \JKingWeb\Arsse\Db\MySQL\Driver + * @covers \JKingWeb\Arsse\Db\MySQL\ExceptionBuilder + * @covers \JKingWeb\Arsse\Db\SQLState */ class TestDriver extends \JKingWeb\Arsse\TestCase\Db\BaseDriver { use \JKingWeb\Arsse\TestCase\DatabaseDrivers\MySQL; diff --git a/tests/cases/Db/MySQL/TestResult.php b/tests/cases/Db/MySQL/TestResult.php index f0520e2..2d58aa4 100644 --- a/tests/cases/Db/MySQL/TestResult.php +++ b/tests/cases/Db/MySQL/TestResult.php @@ -11,7 +11,8 @@ use JKingWeb\Arsse\Test\DatabaseInformation; /** * @group slow * @covers \JKingWeb\Arsse\Db\MySQL\Result - */ + * @covers \JKingWeb\Arsse\Db\MySQL\ExceptionBuilder + * @covers \JKingWeb\Arsse\Db\SQLState */ class TestResult extends \JKingWeb\Arsse\TestCase\Db\BaseResult { use \JKingWeb\Arsse\TestCase\DatabaseDrivers\MySQL; diff --git a/tests/cases/Db/MySQL/TestStatement.php b/tests/cases/Db/MySQL/TestStatement.php index ccda364..ba07835 100644 --- a/tests/cases/Db/MySQL/TestStatement.php +++ b/tests/cases/Db/MySQL/TestStatement.php @@ -8,7 +8,9 @@ namespace JKingWeb\Arsse\TestCase\Db\MySQL; /** * @group slow - * @covers \JKingWeb\Arsse\Db\MySQL\Statement */ + * @covers \JKingWeb\Arsse\Db\MySQL\Statement + * @covers \JKingWeb\Arsse\Db\MySQL\ExceptionBuilder + * @covers \JKingWeb\Arsse\Db\SQLState */ class TestStatement extends \JKingWeb\Arsse\TestCase\Db\BaseStatement { use \JKingWeb\Arsse\TestCase\DatabaseDrivers\MySQL; @@ -31,4 +33,16 @@ class TestStatement extends \JKingWeb\Arsse\TestCase\Db\BaseStatement { return $value; } } + + public function testBindLongString() { + // this test requires some set-up to be effective + static::$interface->query("CREATE TABLE arsse_test(`value` longtext not null) character set utf8mb4"); + // we'll use an unrealistic packet size of 1 byte to trigger special handling for strings which are too long for the maximum packet size + $str = "long string"; + $s = new \JKingWeb\Arsse\Db\MySQL\Statement(static::$interface, "INSERT INTO arsse_test values(?)", ["str"], 1); + $s->runArray([$str]); + $s = new \JKingWeb\Arsse\Db\MySQL\Statement(static::$interface, "SELECT * from arsse_test", []); + $val = $s->run()->getValue(); + $this->assertSame($str, $val); + } } diff --git a/tests/cases/Db/MySQL/TestUpdate.php b/tests/cases/Db/MySQL/TestUpdate.php index c2cf7a1..09c5261 100644 --- a/tests/cases/Db/MySQL/TestUpdate.php +++ b/tests/cases/Db/MySQL/TestUpdate.php @@ -8,7 +8,9 @@ namespace JKingWeb\Arsse\TestCase\Db\MySQL; /** * @group slow - * @covers \JKingWeb\Arsse\Db\MySQL\Driver */ + * @covers \JKingWeb\Arsse\Db\MySQL\Driver + * @covers \JKingWeb\Arsse\Db\MySQL\ExceptionBuilder + * @covers \JKingWeb\Arsse\Db\SQLState */ class TestUpdate extends \JKingWeb\Arsse\TestCase\Db\BaseUpdate { use \JKingWeb\Arsse\TestCase\DatabaseDrivers\MySQL; diff --git a/tests/cases/Db/MySQLPDO/TestDriver.php b/tests/cases/Db/MySQLPDO/TestDriver.php index 93d0dea..3380a82 100644 --- a/tests/cases/Db/MySQLPDO/TestDriver.php +++ b/tests/cases/Db/MySQLPDO/TestDriver.php @@ -9,8 +9,10 @@ namespace JKingWeb\Arsse\TestCase\Db\MySQLPDO; /** * @group slow * @covers \JKingWeb\Arsse\Db\MySQL\PDODriver + * @covers \JKingWeb\Arsse\Db\MySQL\ExceptionBuilder * @covers \JKingWeb\Arsse\Db\PDODriver - * @covers \JKingWeb\Arsse\Db\PDOError */ + * @covers \JKingWeb\Arsse\Db\PDOError + * @covers \JKingWeb\Arsse\Db\SQLState */ class TestDriver extends \JKingWeb\Arsse\TestCase\Db\BaseDriver { use \JKingWeb\Arsse\TestCase\DatabaseDrivers\MySQLPDO; diff --git a/tests/cases/Db/MySQLPDO/TestResult.php b/tests/cases/Db/MySQLPDO/TestResult.php index f52ccc7..5c31c54 100644 --- a/tests/cases/Db/MySQLPDO/TestResult.php +++ b/tests/cases/Db/MySQLPDO/TestResult.php @@ -11,7 +11,9 @@ use JKingWeb\Arsse\Test\DatabaseInformation; /** * @group slow * @covers \JKingWeb\Arsse\Db\PDOResult - */ + * @covers \JKingWeb\Arsse\Db\MySQL\ExceptionBuilder + * @covers \JKingWeb\Arsse\Db\PDOError + * @covers \JKingWeb\Arsse\Db\SQLState */ class TestResult extends \JKingWeb\Arsse\TestCase\Db\BaseResult { use \JKingWeb\Arsse\TestCase\DatabaseDrivers\MySQLPDO; diff --git a/tests/cases/Db/MySQLPDO/TestStatement.php b/tests/cases/Db/MySQLPDO/TestStatement.php index 30b09a0..0f4572e 100644 --- a/tests/cases/Db/MySQLPDO/TestStatement.php +++ b/tests/cases/Db/MySQLPDO/TestStatement.php @@ -9,7 +9,9 @@ namespace JKingWeb\Arsse\TestCase\Db\MySQLPDO; /** * @group slow * @covers \JKingWeb\Arsse\Db\MySQL\PDOStatement - * @covers \JKingWeb\Arsse\Db\PDOError */ + * @covers \JKingWeb\Arsse\Db\MySQL\ExceptionBuilder + * @covers \JKingWeb\Arsse\Db\PDOError + * @covers \JKingWeb\Arsse\Db\SQLState */ class TestStatement extends \JKingWeb\Arsse\TestCase\Db\BaseStatement { use \JKingWeb\Arsse\TestCase\DatabaseDrivers\MySQLPDO; diff --git a/tests/cases/Db/MySQLPDO/TestUpdate.php b/tests/cases/Db/MySQLPDO/TestUpdate.php index 28e3864..e0c2e24 100644 --- a/tests/cases/Db/MySQLPDO/TestUpdate.php +++ b/tests/cases/Db/MySQLPDO/TestUpdate.php @@ -9,7 +9,10 @@ namespace JKingWeb\Arsse\TestCase\Db\MySQLPDO; /** * @group slow * @covers \JKingWeb\Arsse\Db\MySQL\PDODriver - * @covers \JKingWeb\Arsse\Db\PDOError */ + * @covers \JKingWeb\Arsse\Db\MySQL\ExceptionBuilder + * @covers \JKingWeb\Arsse\Db\PDODriver + * @covers \JKingWeb\Arsse\Db\PDOError + * @covers \JKingWeb\Arsse\Db\SQLState */ class TestUpdate extends \JKingWeb\Arsse\TestCase\Db\BaseUpdate { use \JKingWeb\Arsse\TestCase\DatabaseDrivers\MySQLPDO; diff --git a/tests/cases/Db/PostgreSQL/TestDriver.php b/tests/cases/Db/PostgreSQL/TestDriver.php index 1cf9bc8..119e6c0 100644 --- a/tests/cases/Db/PostgreSQL/TestDriver.php +++ b/tests/cases/Db/PostgreSQL/TestDriver.php @@ -9,7 +9,8 @@ namespace JKingWeb\Arsse\TestCase\Db\PostgreSQL; /** * @group slow * @covers \JKingWeb\Arsse\Db\PostgreSQL\Driver - * @covers \JKingWeb\Arsse\Db\PostgreSQL\Dispatch */ + * @covers \JKingWeb\Arsse\Db\PostgreSQL\Dispatch + * @covers \JKingWeb\Arsse\Db\SQLState */ class TestDriver extends \JKingWeb\Arsse\TestCase\Db\BaseDriver { use \JKingWeb\Arsse\TestCase\DatabaseDrivers\PostgreSQL; diff --git a/tests/cases/Db/PostgreSQL/TestStatement.php b/tests/cases/Db/PostgreSQL/TestStatement.php index 94fdc70..d181881 100644 --- a/tests/cases/Db/PostgreSQL/TestStatement.php +++ b/tests/cases/Db/PostgreSQL/TestStatement.php @@ -9,7 +9,8 @@ namespace JKingWeb\Arsse\TestCase\Db\PostgreSQL; /** * @group slow * @covers \JKingWeb\Arsse\Db\PostgreSQL\Statement - * @covers \JKingWeb\Arsse\Db\PostgreSQL\Dispatch */ + * @covers \JKingWeb\Arsse\Db\PostgreSQL\Dispatch + * @covers \JKingWeb\Arsse\Db\SQLState */ class TestStatement extends \JKingWeb\Arsse\TestCase\Db\BaseStatement { use \JKingWeb\Arsse\TestCase\DatabaseDrivers\PostgreSQL; diff --git a/tests/cases/Db/PostgreSQL/TestUpdate.php b/tests/cases/Db/PostgreSQL/TestUpdate.php index d8e23e8..ce54eb0 100644 --- a/tests/cases/Db/PostgreSQL/TestUpdate.php +++ b/tests/cases/Db/PostgreSQL/TestUpdate.php @@ -8,7 +8,8 @@ namespace JKingWeb\Arsse\TestCase\Db\PostgreSQL; /** * @group slow - * @covers \JKingWeb\Arsse\Db\PostgreSQL\Driver */ + * @covers \JKingWeb\Arsse\Db\PostgreSQL\Driver + * @covers \JKingWeb\Arsse\Db\SQLState */ class TestUpdate extends \JKingWeb\Arsse\TestCase\Db\BaseUpdate { use \JKingWeb\Arsse\TestCase\DatabaseDrivers\PostgreSQL; diff --git a/tests/cases/Db/PostgreSQLPDO/TestDriver.php b/tests/cases/Db/PostgreSQLPDO/TestDriver.php index 9dcb986..58b793f 100644 --- a/tests/cases/Db/PostgreSQLPDO/TestDriver.php +++ b/tests/cases/Db/PostgreSQLPDO/TestDriver.php @@ -10,7 +10,8 @@ namespace JKingWeb\Arsse\TestCase\Db\PostgreSQLPDO; * @group slow * @covers \JKingWeb\Arsse\Db\PostgreSQL\PDODriver * @covers \JKingWeb\Arsse\Db\PDODriver - * @covers \JKingWeb\Arsse\Db\PDOError */ + * @covers \JKingWeb\Arsse\Db\PDOError + * @covers \JKingWeb\Arsse\Db\SQLState */ class TestDriver extends \JKingWeb\Arsse\TestCase\Db\BaseDriver { use \JKingWeb\Arsse\TestCase\DatabaseDrivers\PostgreSQLPDO; diff --git a/tests/cases/Db/PostgreSQLPDO/TestStatement.php b/tests/cases/Db/PostgreSQLPDO/TestStatement.php index 60701ff..7730dc8 100644 --- a/tests/cases/Db/PostgreSQLPDO/TestStatement.php +++ b/tests/cases/Db/PostgreSQLPDO/TestStatement.php @@ -9,7 +9,8 @@ namespace JKingWeb\Arsse\TestCase\Db\PostgreSQLPDO; /** * @group slow * @covers \JKingWeb\Arsse\Db\PostgreSQL\PDOStatement - * @covers \JKingWeb\Arsse\Db\PDOError */ + * @covers \JKingWeb\Arsse\Db\PDOError + * @covers \JKingWeb\Arsse\Db\SQLState */ class TestStatement extends \JKingWeb\Arsse\TestCase\Db\BaseStatement { use \JKingWeb\Arsse\TestCase\DatabaseDrivers\PostgreSQLPDO; diff --git a/tests/cases/Db/PostgreSQLPDO/TestUpdate.php b/tests/cases/Db/PostgreSQLPDO/TestUpdate.php index 53d12da..c7cba92 100644 --- a/tests/cases/Db/PostgreSQLPDO/TestUpdate.php +++ b/tests/cases/Db/PostgreSQLPDO/TestUpdate.php @@ -9,7 +9,9 @@ namespace JKingWeb\Arsse\TestCase\Db\PostgreSQLPDO; /** * @group slow * @covers \JKingWeb\Arsse\Db\PostgreSQL\PDODriver - * @covers \JKingWeb\Arsse\Db\PDOError */ + * @covers \JKingWeb\Arsse\Db\PDODriver + * @covers \JKingWeb\Arsse\Db\PDOError + * @covers \JKingWeb\Arsse\Db\SQLState */ class TestUpdate extends \JKingWeb\Arsse\TestCase\Db\BaseUpdate { use \JKingWeb\Arsse\TestCase\DatabaseDrivers\PostgreSQLPDO; diff --git a/tests/cases/Db/SQLite3PDO/TestCreation.php b/tests/cases/Db/SQLite3PDO/TestCreation.php index 526400b..2d8a6f1 100644 --- a/tests/cases/Db/SQLite3PDO/TestCreation.php +++ b/tests/cases/Db/SQLite3PDO/TestCreation.php @@ -15,7 +15,8 @@ use Phake; /** * @covers \JKingWeb\Arsse\Db\SQLite3\PDODriver * @covers \JKingWeb\Arsse\Db\PDODriver - * @covers \JKingWeb\Arsse\Db\PDOError */ + * @covers \JKingWeb\Arsse\Db\PDOError + * @covers \JKingWeb\Arsse\Db\SQLState */ class TestCreation extends \JKingWeb\Arsse\Test\AbstractTest { protected $data; protected $drv; diff --git a/tests/cases/Db/SQLite3PDO/TestDriver.php b/tests/cases/Db/SQLite3PDO/TestDriver.php index 03294e9..def1e82 100644 --- a/tests/cases/Db/SQLite3PDO/TestDriver.php +++ b/tests/cases/Db/SQLite3PDO/TestDriver.php @@ -9,7 +9,8 @@ namespace JKingWeb\Arsse\TestCase\Db\SQLite3PDO; /** * @covers \JKingWeb\Arsse\Db\SQLite3\PDODriver * @covers \JKingWeb\Arsse\Db\PDODriver - * @covers \JKingWeb\Arsse\Db\PDOError */ + * @covers \JKingWeb\Arsse\Db\PDOError + * @covers \JKingWeb\Arsse\Db\SQLState */ class TestDriver extends \JKingWeb\Arsse\TestCase\Db\BaseDriver { use \JKingWeb\Arsse\TestCase\DatabaseDrivers\SQLite3PDO; diff --git a/tests/cases/Db/SQLite3PDO/TestStatement.php b/tests/cases/Db/SQLite3PDO/TestStatement.php index 29da22d..e25b661 100644 --- a/tests/cases/Db/SQLite3PDO/TestStatement.php +++ b/tests/cases/Db/SQLite3PDO/TestStatement.php @@ -8,7 +8,8 @@ namespace JKingWeb\Arsse\TestCase\Db\SQLite3PDO; /** * @covers \JKingWeb\Arsse\Db\PDOStatement - * @covers \JKingWeb\Arsse\Db\PDOError */ + * @covers \JKingWeb\Arsse\Db\PDOError + * @covers \JKingWeb\Arsse\Db\SQLState */ class TestStatement extends \JKingWeb\Arsse\TestCase\Db\BaseStatement { use \JKingWeb\Arsse\TestCase\DatabaseDrivers\SQLite3PDO; diff --git a/tests/cases/Db/SQLite3PDO/TestUpdate.php b/tests/cases/Db/SQLite3PDO/TestUpdate.php index 0fa1505..33904e7 100644 --- a/tests/cases/Db/SQLite3PDO/TestUpdate.php +++ b/tests/cases/Db/SQLite3PDO/TestUpdate.php @@ -8,7 +8,9 @@ namespace JKingWeb\Arsse\TestCase\Db\SQLite3PDO; /** * @covers \JKingWeb\Arsse\Db\SQLite3\PDODriver - * @covers \JKingWeb\Arsse\Db\PDOError */ + * @covers \JKingWeb\Arsse\Db\PDODriver + * @covers \JKingWeb\Arsse\Db\PDOError + * @covers \JKingWeb\Arsse\Db\SQLState */ class TestUpdate extends \JKingWeb\Arsse\TestCase\Db\BaseUpdate { use \JKingWeb\Arsse\TestCase\DatabaseDrivers\SQLite3PDO;