Merge pull request #401 from nextras/count-bugfix

relationships: fixed counting entities when multiplied by joins
nextras · Apr 6, 2020 · 1fc1c9c · 1fc1c9c
2 parents 6eee323 + 75f70c5
commit 1fc1c9c
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 2 deletions.
diff --git a/src/Mapper/Dbal/RelationshipMapperManyHasMany.php b/src/Mapper/Dbal/RelationshipMapperManyHasMany.php
@@ -222,7 +222,7 @@ private function fetchCounts(QueryBuilder $builder, array $values)
 			$result = $this->processMultiCountResult($builder, $values);
 
 		} else {
-			$builder->addSelect('COUNT(%column) as count', "$targetTable.$this->primaryKeyTo");
+			$builder->addSelect('COUNT(DISTINCT %column) AS [count]', "$targetTable.$this->primaryKeyTo");
 			$builder->orderBy(null);
 			$builder->andWhere('%column IN %any', "$targetTable.$this->primaryKeyFrom", $values);
 			$builder->groupBy('%column', "$targetTable.$this->primaryKeyFrom");

diff --git a/src/Mapper/Dbal/RelationshipMapperOneHasMany.php b/src/Mapper/Dbal/RelationshipMapperOneHasMany.php
@@ -230,7 +230,7 @@ private function fetchCounts(QueryBuilder $builder, array $values)
 
 		} else {
 			$builder->orderBy(null);
-			$builder->addSelect('COUNT(%column) AS [count]', "{$sourceTable}.{$targetStoragePrimaryKey}");
+			$builder->addSelect('COUNT(DISTINCT %column) AS [count]', "{$sourceTable}.{$targetStoragePrimaryKey}");
 			$builder->andWhere('%column IN %any', "{$sourceTable}.{$this->joinStorageKey}", $values);
 			$builder->groupBy('%column', "{$sourceTable}.{$this->joinStorageKey}");
 			$result = $this->connection->queryArgs($builder->getQuerySql(), $builder->getQueryParameters());

diff --git a/tests/cases/integration/Relationships/relationships.manyHasMany.phpt b/tests/cases/integration/Relationships/relationships.manyHasMany.phpt
@@ -277,6 +277,21 @@ class RelationshipManyHasManyTest extends DataTestCase
 
 		Assert::same(1, \count($tag->books));
 	}
+
+
+	public function testCountStoredOnManyHasManyRelationshipCondition()
+	{
+		$tag = $this->orm->tags->getByIdChecked(1);
+		$books = $tag->books->toCollection()->findBy([
+			'author->id' => 1,
+		]);
+		Assert::same(1, $books->countStored());
+
+		$books = $tag->books->toCollection()->findBy([
+			'author->tagFollowers->author->id' => 1,
+		]);
+		Assert::same(1, $books->countStored());
+	}
 }
 
 

diff --git a/tests/cases/integration/Relationships/relationships.oneHasMany.phpt b/tests/cases/integration/Relationships/relationships.oneHasMany.phpt
@@ -284,6 +284,23 @@ class RelationshipOneHasManyTest extends DataTestCase
 
 		Assert::same(1, \count($author->books));
 	}
+
+
+	public function testCountStoredOnOneHasManyRelationshipCondition()
+	{
+		$publisher = $this->orm->publishers->getByIdChecked(1);
+		$books = $publisher->books->toCollection()->findBy([
+			'tags->id' => 1,
+		]);
+		Assert::same(1, $books->countStored());
+
+		$books = $publisher->books->toCollection()->findBy([
+			ICollection::OR,
+			'title' => 'Book 1',
+			'tags->id' => 1,
+		]);
+		Assert::same(1, $books->countStored());
+	}
 }