- Support for Named-Parameters

- Option for preserving field-types in the result-set

Author: rkrx

.gitignore

@@ -1,4 +1,5 @@
 /.idea
 /vendor
 /composer.lock
-/atlassian-ide-plugin.xml
+/atlassian-ide-plugin.xml
+/test.php

src/Kir/MySQL/Builder/RunnableSelect.php

@@ -5,18 +5,75 @@
 use PDO;
 use PDOStatement;
 
+/**
+ */
 class RunnableSelect extends Select {
+	/**
+	 * @var array
+	 */
+	private $values = array();
+
+	/**
+	 * @var bool
+	 */
+	private $preserveTypes;
+
+	/**
+	 * @param array $values
+	 * @return $this
+	 */
+	public function bindValues(array $values) {
+		$this->values = array_merge($this->values, $values);
+		return $this;
+	}
+
+	/**
+	 * @param string $key
+	 * @param string|int|bool|float|null $value
+	 * @return $this
+	 */
+	public function bindValue($key, $value) {
+		$this->values[$key] = $value;
+		return $this;
+	}
+
+	/**
+	 * @return $this
+	 */
+	public function clearValues() {
+		$this->values = array();
+		return $this;
+	}
+
+	/**
+	 * @param bool $preserveTypes
+	 * @return $this
+	 */
+	public function setPreserveTypes($preserveTypes = true) {
+		$this->preserveTypes = $preserveTypes;
+		return $this;
+	}
+
 	/**
 	 * @param Closure $callback
 	 * @return array[]
 	 */
 	public function fetchRows(Closure $callback = null) {
 		$statement = $this->createStatement();
+		$statement->execute($this->values);
 		$data = $statement->fetchAll(PDO::FETCH_ASSOC);
 		if($callback !== null) {
 			$data = array_map($callback, $data);
 		}
 		$statement->closeCursor();
+
+		if($this->preserveTypes) {
+			$columnDefinitions = $this->getFieldTypes($statement);
+			foreach($data as &$row) {
+				$row = $this->convertValues($row, $columnDefinitions);
+			}
+		}
+
 		return $data;
 	}
 
@@ -25,10 +82,18 @@ public function fetchRows(Closure $callback = null) {
 	 */
 	public function fetchRow() {
 		$statement = $this->createStatement();
+		$statement->execute($this->values);
 		$row = $statement->fetch(PDO::FETCH_ASSOC);
 		if(!is_array($row)) {
 			return array();
 		}
+		if($this->preserveTypes) {
+			$columnDefinitions = $this->getFieldTypes($statement);
+			$row = $this->convertValues($row, $columnDefinitions);
+		}
+
+		$statement->closeCursor();
+
 		return $row;
 	}
 
@@ -48,6 +113,7 @@ public function fetchArray() {
 	 */
 	public function fetchValue($default = null) {
 		$statement = $this->createStatement();
+		$statement->execute($this->values);
 		$row = $statement->fetch(PDO::FETCH_ASSOC);
 		if(!is_array($row)) {
 			return $default;
@@ -62,6 +128,68 @@ public function fetchValue($default = null) {
 	 * @return PDOStatement
 	 */
 	private function createStatement() {
-		return $this->db()->query($this->__toString());
+		return $this->db()->prepare($this->__toString());
+	}
+
+	/**
+	 * @param PDOStatement $statement
+	 * @return array
+	 */
+	private function getFieldTypes($statement) {
+		$c = $statement->columnCount();
+		$fieldTypes = array();
+		for($i=0; $i<$c+20; $i++) {
+			$column = $statement->getColumnMeta($i);
+			$fieldTypes[$column['name']] = $this->getTypeFromNativeType($column['native_type']);
+		}
+		return $fieldTypes;
+	}
+
+	/**
+	 * @param string $type
+	 * @return string
+	 */
+	private function getTypeFromNativeType($type) {
+		switch ($type) {
+			case 'NEWDECIMAL':
+			case 'DECIMAL':
+			case 'FLOAT':
+			case 'DOUBLE':
+				return 'f';
+			case 'TINY':
+			case 'SHORT':
+			case 'LONG':
+			case 'LONGLONG':
+			case 'INT24':
+				return 'i';
+		}
+		return $type;
+	}
+
+	/**
+	 * @param array $row
+	 * @param array $columnDefinitions
+	 * @return mixed
+	 */
+	private function convertValues(array $row, array $columnDefinitions) {
+		foreach($row as $key => &$value) {
+			$value = $this->convertValue($value, $columnDefinitions[$key]);
+		}
+		return $row;
+	}
+
+	/**
+	 * @param mixed $value
+	 * @param string $type
+	 * @return mixed
+	 */
+	private function convertValue($value, $type) {
+		switch ($type) {
+			case 'i':
+				return (int) $value;
+			case 'f':
+				return (float) $value;
+		}
+		return $value;
 	}
 }

src/Kir/MySQL/Database.php

@@ -10,6 +10,12 @@ interface Database {
 	 */
 	public function query($query);
 
+	/**
+	 * @param string $query
+	 * @return PDOStatement
+	 */
+	public function prepare($query);
+
 	/**
 	 * @param string $query
 	 * @return int
@@ -66,4 +72,5 @@ public function update();
 	 * @return Builder\RunnableDelete
 	 */
 	public function delete();
+
 }

src/Kir/MySQL/Databases/MySQL.php

@@ -41,6 +41,19 @@ public function query($query) {
 		return $stmt;
 	}
 
+	/**
+	 * @param string $query
+	 * @throws Exception
+	 * @return PDOStatement
+	 */
+	public function prepare($query) {
+		$stmt = $this->pdo->prepare($query);
+		if(!$stmt) {
+			throw new Exception("Could not execute statement:\n{$query}");
+		}
+		return $stmt;
+	}
+
 	/**
 	 * @param string $query
 	 * @return int

tests/Kir/MySQL/Databases/Mock.php

@@ -27,6 +27,14 @@ public function query($query) {
 		return null;
 	}
 
+	/**
+	 * @param string $query
+	 * @return PDOStatement
+	 */
+	public function prepare($query) {
+		return null;
+	}
+
 	/**
 	 * @param string $query
 	 * @return int