Merge pull request #4512 from cakephp/3.0-fix-contain-count

3.0 fix contain count
cakephp · Sep 6, 2014 · 994ceed · 994ceed
2 parents c134428 + be67ce8
commit 994ceed
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/src/ORM/Association/SelectableAssociationTrait.php b/src/ORM/Association/SelectableAssociationTrait.php
@@ -160,6 +160,7 @@ protected abstract function _linkField($options);
  */
 	protected function _buildSubquery($query) {
 		$filterQuery = $query->cleanCopy();
+		$filterQuery->contain([], true);
 
 		$joins = $filterQuery->join();
 		foreach ($joins as $i => $join) {

diff --git a/src/ORM/Query.php b/src/ORM/Query.php
@@ -492,7 +492,6 @@ public function cleanCopy() {
 		$query->offset(null);
 		$query->mapReduce(null, null, true);
 		$query->formatResults(null, true);
-		$query->contain([], true);
 		return $query;
 	}
 

diff --git a/tests/TestCase/ORM/QueryRegressionTest.php b/tests/TestCase/ORM/QueryRegressionTest.php
@@ -439,4 +439,24 @@ public function testDeepBelongsToManySubqueryStrategy() {
 			collection($result[2]->articles[0]->tags)->extract('name')->toArray()
 		);
 	}
+
+/**
+ * Tests that getting the count of a query having containments return
+ * the correct results
+ *
+ * @see https://github.com/cakephp/cakephp/issues/4511
+ * @return void
+ */
+	public function testCountWithContain() {
+		$table = TableRegistry::get('Articles');
+		$table->belongsTo('Authors', ['joinType' => 'inner']);
+		$count = $table
+			->find()
+			->contain(['Authors' => function($q) {
+				return $q->where(['Authors.id' => 1]);
+			}])
+			->count();
+		$this->assertEquals(2, $count);
+	}
+
 }