Fixing various faling tests. The problem was not closing the statemen…

…ts, among other things
cakephp · Feb 12, 2014 · 70e3ef0 · markstory · Feb 13, 2014 · lorenzo
1 parent 645fd49
commit 70e3ef0
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 7 deletions.
diff --git a/src/Database/Expression/TupleComparison.php b/src/Database/Expression/TupleComparison.php
@@ -88,7 +88,8 @@ protected function _stringifyValues($generator) {
 			$type = $this->_type;
 			$multiType = is_array($type);
 			$isMulti = $this->isMulti($i, $type);
-			$type = $isMulti ? str_replace('[]', '', $type) : $type;
+			$type = $multiType ? $type : str_replace('[]', '', $type);
+			$type = $type ?: null;
 
 			if ($isMulti) {
 				$bound = [];

diff --git a/src/ORM/Association/ExternalAssociationTrait.php b/src/ORM/Association/ExternalAssociationTrait.php
@@ -313,6 +313,7 @@ protected function _linkField($options) {
  */
 	protected function _buildSubquery($query, $foreignKey) {
 		$filterQuery = clone $query;
+		$filterQuery->limit(null);
 		$filterQuery->contain([], true);
 		$joins = $filterQuery->join();
 		foreach ($joins as $i => $join) {

diff --git a/src/ORM/Query.php b/src/ORM/Query.php
@@ -780,8 +780,7 @@ public function first() {
 		if ($this->_dirty) {
 			$this->limit(1);
 		}
-		$this->_results = $this->all();
+		return $this->all()->first();
-		return $this->_results->first();
 	}
 
 /**

diff --git a/src/ORM/ResultSet.php b/src/ORM/ResultSet.php
@@ -113,6 +113,13 @@ class ResultSet implements Countable, Iterator, Serializable, JsonSerializable {
  */
 	protected $_useBuffering = true;
 
+/**
+ * Holds the count of records in this result set
+ *
+ * @var integer
+ */
+	protected $_count;
+
 /**
  * Constructor
  *
@@ -128,6 +135,10 @@ public function __construct($query, $statement) {
 		$this->_hydrate = $this->_query->hydrate();
 		$this->_entityClass = $query->repository()->entityClass();
 		$this->_useBuffering = $query->bufferResults();
+
+		if ($statement) {
+			$this->count();
+		}
 	}
 
 /**
@@ -199,8 +210,9 @@ public function valid() {
 
 		$this->_current = $this->_fetchResult();
 		$valid = $this->_current !== false;
+		$hasNext = $this->_index < $this->_count;
 
-		if (!$valid && $this->_statement) {
+		if ($this->_statement && !($valid && $hasNext)) {
 			$this->_statement->closeCursor();
 		}
 
@@ -271,10 +283,13 @@ public function first() {
  * @return integer
  */
 	public function count() {
+		if ($this->_count !== null) {
+			return $this->_count;
+		}
 		if ($this->_statement) {
-			return $this->_statement->rowCount();
+			return $this->_count = $this->_statement->rowCount();
 		}
-		return count($this->_results);
+		return $this->_count = count($this->_results);
 	}
 
 /**

diff --git a/tests/TestCase/Model/Behavior/TranslateBehaviorTest.php b/tests/TestCase/Model/Behavior/TranslateBehaviorTest.php
@@ -426,6 +426,7 @@ public function testFindSingleLocaleBelongsto() {
 
 		$results = $table->find()
 			->select(['title', 'body'])
+			->order(['title' => 'asc'])
 			->contain(['Authors' => function($q) {
 				return $q->select(['id', 'name']);
 			}]);

diff --git a/tests/TestCase/ORM/QueryTest.php b/tests/TestCase/ORM/QueryTest.php
@@ -885,7 +885,10 @@ public function testResultsAreWrappedInMapReduce() {
 		$params = [$this->connection, $this->table];
 		$query = $this->getMock('\Cake\ORM\Query', ['execute'], $params);
 
-		$statement = $this->getMock('\Database\StatementInterface', ['fetch', 'closeCursor']);
+		$statement = $this->getMock(
+			'\Database\StatementInterface',
+			['fetch', 'closeCursor', 'rowCount']
+		);
 		$statement->expects($this->exactly(3))
 			->method('fetch')
 			->will($this->onConsecutiveCalls(['a' => 1], ['a' => 2], false));