- Throw more specific exception for "Integrity constraint violation: Duplicate entry"

Author: rkrx

composer.json

@@ -15,7 +15,7 @@
 	"require-dev": {
 		"phpunit/phpunit": "~4.0",
 		"phake/phake": "1.0.5",
-		"rkr/fakepdo": "0.1"
+		"rkr/fakepdo": "0.1.*"
 	},
 	"autoload": {
 		"psr-4": {

src/Builder/QueryStatement.php

@@ -1,7 +1,9 @@
 <?php
 namespace Kir\MySQL\Builder;
 
+use Kir\MySQL\Databases\MySQL\MySQLExceptionInterpreter;
 use PDO;
+use PDOException;
 use PDOStatement;
 use Kir\MySQL\Database\DatabaseStatement;
 use Kir\MySQL\QueryLogger\QueryLoggers;
@@ -13,16 +15,20 @@ class QueryStatement implements DatabaseStatement {
 	private $queryLoggers;
 	/** @var string */
 	private $query;
+	/** @var MySQLExceptionInterpreter */
+	private $exceptionInterpreter;
 
 	/**
 	 * @param PDOStatement $stmt
 	 * @param string $query
+	 * @param MySQLExceptionInterpreter $exceptionInterpreter
 	 * @param QueryLoggers $queryLoggers
 	 */
-	public function __construct(PDOStatement $stmt, $query, QueryLoggers $queryLoggers) {
+	public function __construct(PDOStatement $stmt, $query, MySQLExceptionInterpreter $exceptionInterpreter, QueryLoggers $queryLoggers) {
 		$this->statement = $stmt;
 		$this->queryLoggers = $queryLoggers;
 		$this->query = $query;
+		$this->exceptionInterpreter = $exceptionInterpreter;
 	}
 
 	/**
@@ -37,18 +43,22 @@ public function getStatement() {
 	 * @return bool
 	 */
 	public function execute(array $params = []) {
-		$timer = microtime(true);
-		$response = $this->statement->execute($params);
-		$this->queryLoggers->log($this->query, microtime(true) - $timer);
-		return $response;
+		return $this->exceptionHandler(function () use ($params) {
+			$timer = microtime(true);
+			$response = $this->statement->execute($params);
+			$this->queryLoggers->log($this->query, microtime(true) - $timer);
+			return $response;
+		});
 	}
 
 	/**
 	 * @return array
 	 */
 	public function fetchAll() {
 		$args = func_get_args();
-		return call_user_func_array([$this->statement, 'fetchAll'], $args);
+		return $this->exceptionHandler(function () use ($args) {
+			return call_user_func_array([$this->statement, 'fetchAll'], $args);
+		});
 	}
 
 	/**
@@ -58,36 +68,59 @@ public function fetchAll() {
 	 * @return mixed
 	 */
 	public function fetch($fetchStyle = PDO::FETCH_ASSOC, $cursorOrientation = PDO::FETCH_ORI_NEXT, $cursorOffset = 0) {
-		return $this->statement->fetch($fetchStyle, $cursorOrientation, $cursorOffset);
+		return $this->exceptionHandler(function () use ($fetchStyle, $cursorOrientation, $cursorOffset) {
+			return $this->statement->fetch($fetchStyle, $cursorOrientation, $cursorOffset);
+		});
 	}
 
 	/**
 	 * @param int $columnNo
 	 * @return mixed
 	 */
 	public function fetchColumn($columnNo = 0) {
-		return $this->statement->fetchColumn($columnNo);
+		return $this->exceptionHandler(function () use ($columnNo) {
+			return $this->statement->fetchColumn($columnNo);
+		});
 	}
 
 	/**
 	 * @return bool
 	 */
 	public function closeCursor() {
-		return $this->statement->closeCursor();
+		return $this->exceptionHandler(function () {
+			return $this->statement->closeCursor();
+		});
 	}
 
 	/**
 	 * @return int
 	 */
 	public function columnCount() {
-		return $this->statement->columnCount();
+		return $this->exceptionHandler(function () {
+			return $this->statement->columnCount();
+		});
 	}
 
 	/**
 	 * @param int $columnNo
 	 * @return array
 	 */
 	public function getColumnMeta($columnNo) {
-		return $this->statement->getColumnMeta($columnNo);
+		return $this->exceptionHandler(function () use ($columnNo) {
+			return $this->statement->getColumnMeta($columnNo);
+		});
+	}
+
+	/**
+	 * @param callable $fn
+	 * @return mixed
+	 */
+	private function exceptionHandler($fn) {
+		try {
+			return call_user_func($fn);
+		} catch (PDOException $e) {
+			$this->exceptionInterpreter->throwMoreConcreteException($e);
+			throw $e;
+		}
 	}
 }

src/Databases/MySQL.php

@@ -35,6 +35,9 @@ class MySQL implements Database {
 	 * @param PDO $pdo
 	 */
 	public function __construct(PDO $pdo) {
+		if($pdo->getAttribute(PDO::ATTR_ERRMODE) === PDO::ERRMODE_SILENT) {
+			$pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+		}
 		$this->pdo = $pdo;
 		$this->aliasRegistry = new AliasRegistry();
 		$this->queryLoggers = new QueryLoggers();
@@ -320,7 +323,7 @@ private function buildQueryStatement($query, $fn) {
 		if(!$stmt) {
 			throw new Exception("Could not execute statement:\n{$query}");
 		}
-		$stmtWrapper = new QueryStatement($stmt, $query, $this->queryLoggers);
+		$stmtWrapper = new QueryStatement($stmt, $query, $this->exceptionInterpreter, $this->queryLoggers);
 		return $stmtWrapper;
 	}
 }

src/Databases/MySQL/MySQLExceptionInterpreter.php

@@ -1,11 +1,11 @@
 <?php
 namespace Kir\MySQL\Databases\MySQL;
 
-use Kir\MySQL\Exceptions\DuplicateUniqueKeyException;
-use Kir\MySQL\Exceptions\LockWaitTimeoutExceededException;
-use Kir\MySQL\Exceptions\SqlDeadLockException;
 use PDO;
 use PDOException;
+use Kir\MySQL\Exceptions\SqlDeadLockException;
+use Kir\MySQL\Exceptions\DuplicateUniqueKeyException;
+use Kir\MySQL\Exceptions\LockWaitTimeoutExceededException;
 
 class MySQLExceptionInterpreter {
 	/** @var PDO */
@@ -23,9 +23,8 @@ public function __construct(PDO $pdo) {
 	 * @throw PDOException
 	 */
 	public function throwMoreConcreteException(PDOException $exception) {
-		$errorInfo = $this->pdo->errorInfo();
-		$code = $errorInfo[1];
-		$message = $errorInfo[2];
+		$code = $exception->errorInfo[1];
+		$message = $exception->errorInfo[2];
 		if($code === 1213) {
 			throw new SqlDeadLockException($message, $code, $exception);
 		}