Added ability to use statements as fields

Author: rkrx

composer.json

@@ -7,7 +7,8 @@
 		"email": "[email protected]"
 	}],
 	"require": {
-		"php": ">= 5.4"
+		"php": ">= 5.4",
+		"psr/log": "~1"
 	},
 	"require-dev": {
 		"phpunit/phpunit": "~4.0",

src/Databases/MySQL.php

@@ -5,6 +5,10 @@
 use Kir\MySQL\Builder\Exception;
 use Kir\MySQL\Database;
 use Kir\MySQL\Tools\AliasRegistry;
+use PDO;
+use PDOStatement;
+use Psr\Log\LoggerInterface;
+use Psr\Log\NullLogger;
 use UnexpectedValueException;
 use Kir\MySQL\Builder\RunnableSelect;
 
@@ -16,7 +20,7 @@ class MySQL implements Database {
 	 */
 	private static $tableFields = array();
 	/**
-	 * @var \PDO
+	 * @var PDO
 	 */
 	private $pdo;
 	/**
@@ -27,12 +31,22 @@ class MySQL implements Database {
 	 * @var int
 	 */
 	private $transactionLevel = 0;
+	/**
+	 * @var LoggerInterface
+	 */
+	private $logger;
 
 	/**
-	 * @param \PDO $pdo
+	 * @param PDO $pdo
+	 * @param LoggerInterface $logger
 	 */
-	public function __construct(\PDO $pdo) {
+	public function __construct(PDO $pdo, LoggerInterface $logger = null) {
+		if($logger === null) {
+			$logger = new NullLogger();
+		}
+
 		$this->pdo = $pdo;
+		$this->logger = $logger;
 		$this->aliasRegistry = new AliasRegistry();
 	}
 
@@ -46,10 +60,13 @@ public function getAliasRegistry() {
 	/**
 	 * @param string $query
 	 * @throws Exception
-	 * @return \PDOStatement
+	 * @return PDOStatement
 	 */
 	public function query($query) {
+		$this->logger->info($query);
+		$timer = microtime(true);
 		$stmt = $this->pdo->query($query);
+		$this->logger->debug(sprintf("Last query duration: %0.5f sec.", microtime(true) - $timer));
 		if(!$stmt) {
 			throw new Exception("Could not execute statement:\n{$query}");
 		}
@@ -59,9 +76,10 @@ public function query($query) {
 	/**
 	 * @param string $query
 	 * @throws Exception
-	 * @return \PDOStatement
+	 * @return PDOStatement
 	 */
 	public function prepare($query) {
+		$this->logger->info("PREPARE: {$query}");
 		$stmt = $this->pdo->prepare($query);
 		if(!$stmt) {
 			throw new Exception("Could not execute statement:\n{$query}");
@@ -75,8 +93,11 @@ public function prepare($query) {
 	 * @return int
 	 */
 	public function exec($query, array $params = array()) {
+		$this->logger->info($query);
+		$timer = microtime(true);
 		$stmt = $this->pdo->prepare($query);
 		$stmt->execute($params);
+		$this->logger->debug(sprintf("Last query duration: %0.5f sec.", microtime(true) - $timer));
 		$result = $stmt->rowCount();
 		$stmt->closeCursor();
 		return $result;
@@ -99,7 +120,7 @@ public function getTableFields($table) {
 		}
 		$stmt = $this->pdo->query("DESCRIBE {$table}");
 		$stmt->execute();
-		$rows = $stmt->fetchAll(\PDO::FETCH_ASSOC);
+		$rows = $stmt->fetchAll(PDO::FETCH_ASSOC);
 		self::$tableFields[$table] = array_map(function ($row) { return $row['Field']; }, $rows);
 		$stmt->closeCursor();
 		return self::$tableFields[$table];