- Added Kir\MySQL\Builder\RunnableSelect::fetchRowsLazy(Closure $callback = null) to make use of PHP5.5's yield

Author: rkrx

src/Builder/Helpers/FieldTypeProvider.php

@@ -0,0 +1,41 @@
+<?php
+namespace Kir\MySQL\Builder\Helpers;
+
+use Kir\MySQL\Builder\QueryStatement;
+
+abstract class FieldTypeProvider {
+	/**
+	 * @param QueryStatement $statement
+	 * @return array
+	 */
+	public static function getFieldTypes(QueryStatement $statement) {
+		$c = $statement->columnCount();
+		$fieldTypes = array();
+		for($i=0; $i<$c+20; $i++) {
+			$column = $statement->getColumnMeta($i);
+			$fieldTypes[$column['name']] = self::getTypeFromNativeType($column['native_type']);
+		}
+		return $fieldTypes;
+	}
+
+	/**
+	 * @param string $type
+	 * @return string
+	 */
+	private static 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;
+	}
+}

src/Builder/Helpers/FieldValueConverter.php

@@ -0,0 +1,33 @@
+<?php
+namespace Kir\MySQL\Builder\Helpers;
+
+class FieldValueConverter {
+	/**
+	 * @param array $row
+	 * @param array $columnDefinitions
+	 * @return array
+	 */
+	public static function convertValues(array $row, array $columnDefinitions) {
+		foreach($row as $key => &$value) {
+			if($value !== null) {
+				$value = self::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/Builder/Helpers/LazyRowGenerator.php

@@ -0,0 +1,41 @@
+<?php
+namespace Kir\MySQL\Builder\Helpers;
+
+use Closure;
+use Generator;
+use Kir\MySQL\Builder\QueryStatement;
+
+class LazyRowGenerator {
+	/** @var bool */
+	private $preserveTypes;
+
+	/**
+	 * @param bool $preserveTypes
+	 */
+	public function __construct($preserveTypes) {
+		$this->preserveTypes = $preserveTypes;
+	}
+
+	/**
+	 * @param QueryStatement $statement
+	 * @param Closure $callback
+	 * @return array[]|Generator
+	 */
+	public function generate(QueryStatement $statement, Closure $callback) {
+		while($row = $statement->fetch(\PDO::FETCH_ASSOC)) {
+			if($this->preserveTypes) {
+				$columnDefinitions = FieldTypeProvider::getFieldTypes($statement);
+				$row = FieldValueConverter::convertValues($row, $columnDefinitions);
+			}
+			if($callback !== null) {
+				$row = call_user_func($callback);
+				if($row !== null) {
+					yield $row;
+				}
+			} else {
+				yield $row;
+			}
+		}
+		$statement->closeCursor();
+	}
+}

src/Builder/RunnableSelect.php

@@ -1,6 +1,11 @@
 <?php
 namespace Kir\MySQL\Builder;
 
+use Generator;
+use Kir\MySQL\Builder\Helpers\FieldTypeProvider;
+use Kir\MySQL\Builder\Helpers\FieldValueConverter;
+use Kir\MySQL\Builder\Helpers\LazyRowGenerator;
+
 /**
  */
 class RunnableSelect extends Select {
@@ -55,9 +60,9 @@ public function fetchRows(\Closure $callback = null) {
 		$statement = $this->createStatement();
 		$data = $statement->fetchAll(\PDO::FETCH_ASSOC);
 		if($this->preserveTypes) {
-			$columnDefinitions = $this->getFieldTypes($statement);
+			$columnDefinitions = FieldTypeProvider::getFieldTypes($statement);
 			foreach($data as &$row) {
-				$row = $this->convertValues($row, $columnDefinitions);
+				$row = FieldValueConverter::convertValues($row, $columnDefinitions);
 			}
 		}
 		if($callback !== null) {
@@ -67,6 +72,19 @@ public function fetchRows(\Closure $callback = null) {
 		return $data;
 	}
 
+	/**
+	 * @param \Closure $callback
+	 * @return array[]|Generator
+	 */
+	public function fetchRowsLazy(\Closure $callback = null) {
+		if(version_compare(PHP_VERSION, '5.5', '<=')) {
+			return $this->fetchRows($callback);
+		}
+		$statement = $this->createStatement();
+		$generator = new LazyRowGenerator($this->preserveTypes);
+		return $generator->generate($statement, $callback);
+	}
+
 	/**
 	 * @return string[]
 	 */
@@ -78,8 +96,8 @@ public function fetchRow() {
 			return array();
 		}
 		if($this->preserveTypes) {
-			$columnDefinitions = $this->getFieldTypes($statement);
-			$row = $this->convertValues($row, $columnDefinitions);
+			$columnDefinitions = FieldTypeProvider::getFieldTypes($statement);
+			$row = FieldValueConverter::convertValues($row, $columnDefinitions);
 		}
 		$statement->closeCursor();
 		return $row;
@@ -174,68 +192,4 @@ private function createStatement() {
 		}
 		return $statement;
 	}
-
-	/**
-	 * @param QueryStatement $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) {
-			if($value !== null) {
-				$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;
-	}
 }