dbal 5.0: implement processing of unique joins

composer.json

@@ -25,7 +25,7 @@
 		"nette/caching": "~2.5 || ~3.0",
 		"nette/utils": "~2.5 || ~3.0",
 		"nette/tokenizer": "~2.3 || ~3.0",
-		"nextras/dbal": "~4.0"
+		"nextras/dbal": "~5.0@dev"
 	},
 	"require-dev": {
 		"nette/bootstrap": "~2.4 || ~3.0",

src/Collection/DbalCollection.php

@@ -120,7 +120,7 @@ public function findBy(array $conds): ICollection
 		$expression = $collection->getHelper()->processFilterFunction($collection->queryBuilder, $conds, null);
 		$expression = $expression->applyAggregator($collection->queryBuilder);
 
-		foreach ($expression->joins as $join) {
+		foreach ($expression->getUniqueJoins($collection->queryBuilder) as $join) {
 			$join->applyJoin($collection->queryBuilder);
 		}
 

src/Collection/Helpers/DbalExpressionResult.php

@@ -3,6 +3,7 @@
 namespace Nextras\Orm\Collection\Helpers;
 
 
+use MongoDB\Driver\Query;
 use Nextras\Dbal\QueryBuilder\QueryBuilder;
 use Nextras\Orm\Entity\Reflection\PropertyMetadata;
 use Nextras\Orm\Exception\InvalidArgumentException;
@@ -117,4 +118,26 @@ public function applyAggregator(QueryBuilder $queryBuilder): DbalExpressionResul
 
 		return $this->aggregator->aggregate($queryBuilder, $this);
 	}
+
+
+	/**
+	 * @return array<DbalJoinEntry>
+	 */
+	public function getUniqueJoins(QueryBuilder $queryBuilder): array
+	{
+		$known = [];
+		foreach ($queryBuilder->getClause('join')[0] ?? [] as $join) {
+			$known[$join['table'] . $join['on']] = true; // $from$on
+		}
+		$missing = [];
+		foreach ($this->joins as $join) {
+			$key = "$join->toExpression AS %table" . $join->onExpression;
+			if (isset($known[$key])) {
+				continue;
+			}
+			$known[$key] = true;
+			$missing[] = $join;
+		}
+		return $missing;
+	}
 }

src/Collection/Helpers/DbalQueryBuilderHelper.php

@@ -130,7 +130,7 @@ public function processFilterFunction(
 	public function processOrder(QueryBuilder $builder, $expr, string $direction): void
 	{
 		$expressionResult = $this->processPropertyExpr($builder, $expr);
-		foreach ($expressionResult->joins as $join) {
+		foreach ($expressionResult->getUniqueJoins($builder) as $join) {
 			$join->applyJoin($builder);
 		}
 		$orderingExpression = $this->processOrderDirection($expressionResult, $direction);