- Better exception handling

Author: rkr

src/Builder/QueryStatement.php

@@ -45,12 +45,7 @@ public function getStatement() {
 	public function execute(array $params = []) {
 		return $this->exceptionHandler(function () use ($params) {
 			$timer = microtime(true);
-			try {
-				$response = $this->statement->execute($params);
-			} catch (PDOException $e) {
-				/** @link http://php.net/manual/en/class.exception.php#Hcom115813 (cHao's comment) */
-				throw new PDOException($e->getMessage(), (int) $e->getCode());
-			}
+			$response = $this->statement->execute($params);
 			$this->queryLoggers->log($this->query, microtime(true) - $timer);
 			return $response;
 		});
@@ -125,7 +120,6 @@ private function exceptionHandler($fn) {
 			return call_user_func($fn);
 		} catch (PDOException $e) {
 			$this->exceptionInterpreter->throwMoreConcreteException($e);
-			throw $e;
 		}
 	}
 }

src/Databases/MySQL.php

@@ -88,18 +88,15 @@ public function prepare($query) {
 	 * @return int
 	 */
 	public function exec($query, array $params = array()) {
-		try {
+		$this->exceptionHandler(function () use ($query, $params) {
 			$stmt = $this->pdo->prepare($query);
 			$timer = microtime(true);
 			$stmt->execute($params);
 			$this->queryLoggers->log($query, microtime(true) - $timer);
 			$result = $stmt->rowCount();
 			$stmt->closeCursor();
 			return $result;
-		} catch (PDOException $e) {
-			$this->exceptionInterpreter->throwMoreConcreteException($e);
-			throw $e;
-		}
+		});
 	}
 
 	/**
@@ -158,8 +155,6 @@ public function quote($value) {
 			$result = sprintf('(%s)', (string) $value);
 		} elseif(is_array($value)) {
 			$result = join(', ', array_map(function ($value) { return $this->quote($value); }, $value));
-		/*} elseif(is_int(trim($value)) && strpos('123456789', substr(0, 1, trim($value))) !== null) {
-			$result = $value;*/
 		} else {
 			$result = $this->pdo->quote($value);
 		}
@@ -321,4 +316,16 @@ private function buildQueryStatement($query, $fn) {
 		$stmtWrapper = new QueryStatement($stmt, $query, $this->exceptionInterpreter, $this->queryLoggers);
 		return $stmtWrapper;
 	}
+
+	/**
+	 * @param callable $fn
+	 * @return mixed
+	 */
+	private function exceptionHandler($fn) {
+		try {
+			return call_user_func($fn);
+		} catch (PDOException $e) {
+			$this->exceptionInterpreter->throwMoreConcreteException($e);
+		}
+	}
 }

src/Databases/MySQL/MySQLExceptionInterpreter.php

@@ -1,6 +1,8 @@
 <?php
 namespace Kir\MySQL\Databases\MySQL;
 
+use Kir\MySQL\Exceptions\DatabaseHasGoneAwayException;
+use Kir\MySQL\Exceptions\SqlException;
 use PDOException;
 use Kir\MySQL\Exceptions\SqlDeadLockException;
 use Kir\MySQL\Exceptions\DuplicateUniqueKeyException;
@@ -12,16 +14,17 @@ class MySQLExceptionInterpreter {
 	 * @throw PDOException
 	 */
 	public function throwMoreConcreteException(PDOException $exception) {
-		$code = (int) $exception->errorInfo[1];
+		$code = $exception->errorInfo[1];
 		$message = (string) $exception->errorInfo[2];
-		if($code === 1213) {
-			throw new SqlDeadLockException($message, $code, $exception);
+		switch($code) {
+			case 2006: throw new DatabaseHasGoneAwayException($message, $code, $exception);
+			case 1213: throw new SqlDeadLockException($message, $code, $exception);
+			case 1205: throw new LockWaitTimeoutExceededException($message, $code, $exception);
+			case 1062: throw new DuplicateUniqueKeyException($message, $code, $exception);
 		}
-		if($code === 1205) {
-			throw new LockWaitTimeoutExceededException($message, $code, $exception);
-		}
-		if($code === 1062) {
-			throw new DuplicateUniqueKeyException($message, $code, $exception);
+		/** @link http://php.net/manual/en/class.exception.php#Hcom115813 (cHao's comment) */
+		if(!is_string($message) || !is_int($code)) {
+			throw new SqlException((string) $message, (int) $code, $exception);
 		}
 		throw $exception;
 	}

src/Exceptions/DatabaseHasGoneAwayException.php

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