Merge bc517ac into d24fc4d

dg · Jun 22, 2021 · f2b17ff · f2b17ff
2 parents d24fc4d + bc517ac
commit f2b17ff
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/src/Dibi/Drivers/PdoDriver.php b/src/Dibi/Drivers/PdoDriver.php
@@ -12,6 +12,7 @@
 use Dibi;
 use Dibi\Helpers;
 use PDO;
+use PDOException;
 
 
 /**
@@ -57,8 +58,8 @@ public function __construct(array $config)
 			$this->connection = $config['resource'];
 			unset($config['resource'], $config['pdo']);
 
-			if ($this->connection->getAttribute(PDO::ATTR_ERRMODE) !== PDO::ERRMODE_SILENT) {
-				throw new Dibi\DriverException('PDO connection in exception or warning error mode is not supported.');
+			if ($this->connection->getAttribute(PDO::ATTR_ERRMODE) === PDO::ERRMODE_WARNING) {
+				throw new Dibi\DriverException('PDO connection in warning error mode is not supported.');
 			}
 
 		} else {
@@ -93,15 +94,18 @@ public function disconnect(): void
 	 */
 	public function query(string $sql): ?Dibi\ResultDriver
 	{
-		$res = $this->connection->query($sql);
-		if ($res) {
-			$this->affectedRows = $res->rowCount();
-			return $res->columnCount() ? $this->createResultDriver($res) : null;
+		try {
+			$res = $this->connection->query($sql);
+			if ($res) {
+				$this->affectedRows = $res->rowCount();
+				return $res->columnCount() ? $this->createResultDriver($res) : null;
+			}
+			[$sqlState, $code, $message] = $this->connection->errorInfo();
+		} catch (PDOException $e) {
+			[$sqlState, $code, $message] = $e->errorInfo;
 		}
-
 		$this->affectedRows = null;
 
-		[$sqlState, $code, $message] = $this->connection->errorInfo();
 		$message = "SQLSTATE[$sqlState]: $message";
 		switch ($this->driverName) {
 			case 'mysql':

diff --git a/tests/dibi/PdoDriver.providedConnection.phpt b/tests/dibi/PdoDriver.providedConnection.phpt
@@ -17,16 +17,14 @@ function buildPdoDriver(?int $errorMode)
 }
 
 
-// PDO error mode: exception
-Assert::exception(function () {
-	buildPdoDriver(PDO::ERRMODE_EXCEPTION);
-}, Dibi\DriverException::class, 'PDO connection in exception or warning error mode is not supported.');
+// PDO error mode: exception is accepted
+buildPdoDriver(PDO::ERRMODE_EXCEPTION);
 
 
 // PDO error mode: warning
 Assert::exception(function () {
 	buildPdoDriver(PDO::ERRMODE_WARNING);
-}, Dibi\DriverException::class, 'PDO connection in exception or warning error mode is not supported.');
+}, Dibi\DriverException::class, 'PDO connection in warning error mode is not supported.');
 
 
 test('PDO error mode: explicitly set silent', function () {