Throw more concrete exceptiontypes. E.g. for dead-locks

Author: rkrx

src/Databases/MySQL.php

@@ -1,15 +1,17 @@
 <?php
 namespace Kir\MySQL\Databases;
 
+use PDO;
+use PDOException;
+use UnexpectedValueException;
+use Kir\MySQL\Builder\RunnableSelect;
 use Kir\MySQL\Builder;
 use Kir\MySQL\Builder\Exception;
 use Kir\MySQL\Builder\QueryStatement;
 use Kir\MySQL\Database;
+use Kir\MySQL\Databases\MySQL\MySQLExceptionInterpreter;
 use Kir\MySQL\QueryLogger\QueryLoggers;
 use Kir\MySQL\Tools\AliasRegistry;
-use PDO;
-use UnexpectedValueException;
-use Kir\MySQL\Builder\RunnableSelect;
 
 /**
  */
@@ -32,6 +34,7 @@ public function __construct(PDO $pdo) {
 		$this->pdo = $pdo;
 		$this->aliasRegistry = new AliasRegistry();
 		$this->queryLoggers = new QueryLoggers();
+		$this->exceptionInterpreter = new MySQLExceptionInterpreter($pdo);
 	}
 
 	/**
@@ -84,7 +87,11 @@ public function prepare($query) {
 	public function exec($query, array $params = array()) {
 		$stmt = $this->pdo->prepare($query);
 		$timer = microtime(true);
-		$stmt->execute($params);
+		try {
+			$stmt->execute($params);
+		} catch (PDOException $e) {
+			$this->exceptionInterpreter->throwMoreConcreteException($e);
+		}
 		$this->queryLoggers->log($query, microtime(true) - $timer);
 		$result = $stmt->rowCount();
 		$stmt->closeCursor();
@@ -216,12 +223,12 @@ public function transactionStart() {
 
 	/**
 	 * @return $this
-	 * @throws Exception
+	 * @throws \Exception
 	 */
 	public function transactionCommit() {
 		$this->transactionLevel--;
 		if($this->transactionLevel < 0) {
-			throw new Exception("Transaction-Nesting-Problem: Trying to invoke commit on a already closed transaction");
+			throw new \Exception("Transaction-Nesting-Problem: Trying to invoke commit on a already closed transaction");
 		}
 		if((int) $this->transactionLevel === 0) {
 			$this->pdo->commit();
@@ -231,12 +238,12 @@ public function transactionCommit() {
 
 	/**
 	 * @return $this
-	 * @throws Exception
+	 * @throws \Exception
 	 */
 	public function transactionRollback() {
 		$this->transactionLevel--;
 		if($this->transactionLevel < 0) {
-			throw new Exception("Transaction-Nesting-Problem: Trying to invoke rollback on a already closed transaction");
+			throw new \Exception("Transaction-Nesting-Problem: Trying to invoke rollback on a already closed transaction");
 		}
 		if((int) $this->transactionLevel === 0) {
 			$this->pdo->rollBack();
@@ -249,6 +256,7 @@ public function transactionRollback() {
 	 * @param callable|null $callback
 	 * @return mixed
 	 * @throws \Exception
+	 * @throws null
 	 */
 	public function transaction($tries = 1, $callback = null) {
 		if(is_callable($tries)) {

src/Databases/MySQL/MySQLExceptionInterpreter.php

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

src/Exceptions/SqlDeadLockException.php

@@ -0,0 +1,5 @@
+<?php
+namespace Kir\MySQL\Exceptions;
+
+class SqlDeadLockException extends SqlException {
+}

src/Exceptions/SqlException.php

@@ -0,0 +1,7 @@
+<?php
+namespace Kir\MySQL\Exceptions;
+
+use PDOException;
+
+class SqlException extends PDOException {
+}