Fix check for where condition

Author: VincentLanglet

src/Type/Doctrine/Query/QueryResultTypeWalker.php

@@ -109,7 +109,7 @@ class QueryResultTypeWalker extends SqlWalker
 	private $hasGroupByClause;
 
 	/** @var bool */
-	private $hasCondition;
+	private $hasWhereClause;
 
 	/**
 	 * @param Query<mixed> $query
@@ -139,7 +139,7 @@ public function __construct($query, $parserResult, array $queryComponents)
 		$this->nullableQueryComponents = [];
 		$this->hasAggregateFunction = false;
 		$this->hasGroupByClause = false;
-		$this->hasCondition = false;
+		$this->hasWhereClause = false;
 
 		// The object is instantiated by Doctrine\ORM\Query\Parser, so receiving
 		// dependencies through the constructor is not an option. Instead, we
@@ -179,6 +179,7 @@ public function walkSelectStatement(AST\SelectStatement $AST): string
 		$this->typeBuilder->setSelectQuery();
 		$this->hasAggregateFunction = $this->hasAggregateFunction($AST);
 		$this->hasGroupByClause = $AST->groupByClause !== null;
+		$this->hasWhereClause = $AST->whereClause !== null;
 
 		$this->walkFromClause($AST->fromClause);
 
@@ -596,8 +597,6 @@ public function walkOrderByItem($orderByItem): string
 	 */
 	public function walkHavingClause($havingClause): string
 	{
-		$this->hasCondition = true;
-
 		return $this->marshalType(new MixedType());
 	}
 
@@ -1033,8 +1032,6 @@ public function walkWhereClause($whereClause): string
 	 */
 	public function walkConditionalExpression($condExpr): string
 	{
-		$this->hasCondition = true;
-
 		return $this->marshalType(new MixedType());
 	}
 
@@ -1322,10 +1319,10 @@ public function walkResultVariable($resultVariable): string
 	 */
 	private function addScalar($alias, Type $type): void
 	{
-		// Since we don't check the condition inside the WHERE or HAVING
+		// Since we don't check the condition inside the WHERE
 		// conditions, we cannot be sure all the union types are correct.
 		// For exemple, a condition `WHERE foo.bar IS NOT NULL` could be added.
-		if ($this->hasCondition && $type instanceof UnionType) {
+		if ($this->hasWhereClause && $type instanceof UnionType) {
 			$type = TypeUtils::toBenevolentUnion($type);
 		}
 

tests/Type/Doctrine/Query/QueryResultTypeWalkerTest.php

@@ -449,6 +449,25 @@ public function getTestData(): iterable
 			',
 		];
 
+		yield 'scalar with where condition' => [
+			$this->constantArray([
+				[new ConstantStringType('intColumn'), new IntegerType()],
+				[new ConstantStringType('stringColumn'), new StringType()],
+				[
+					new ConstantStringType('stringNullColumn'),
+					TypeUtils::toBenevolentUnion(TypeCombinator::addNull(new StringType()))
+				],
+				[new ConstantStringType('datetimeColumn'), new ObjectType(DateTime::class)],
+				[new ConstantStringType('datetimeImmutableColumn'), new ObjectType(DateTimeImmutable::class)],
+			]),
+			'
+				SELECT		m.intColumn, m.stringColumn, m.stringNullColumn,
+							m.datetimeColumn, m.datetimeImmutableColumn
+				FROM		QueryResult\Entities\Many m
+				WHERE       m.stringNullColumn IS NOT NULL
+			',
+		];
+
 		yield 'scalar with alias' => [
 			$this->constantArray([
 				[new ConstantStringType('i'), new IntegerType()],