Improve pgsql SQRT infering

Author: janedbal

src/Type/Doctrine/Query/QueryResultTypeWalker.php

@@ -595,6 +595,7 @@ public function walkFunction($function): string
 				//  SQRT(col_bigint) =>  float      float        string     float
 
 				$exprType = $this->unmarshalType($this->walkSimpleArithmeticExpression($function->simpleArithmeticExpression));
+				$exprTypeNoNull = TypeCombinator::removeNull($exprType);
 
 				$driverType = DriverType::detect($this->em->getConnection());
 
@@ -614,15 +615,18 @@ public function walkFunction($function): string
 					]);
 
 				} elseif ($driverType === DriverType::PGSQL) {
-					// numeric-string for decimal
-					// float for int and float
-					$type = TypeCombinator::union(
-						new FloatType(),
-						new IntersectionType([
-							new StringType(),
-							new AccessoryNumericStringType(),
-						])
-					);
+					$castedExprType = $this->castStringLiteralForNumericExpression($exprTypeNoNull);
+
+					if ($castedExprType->isInteger()->yes() || $castedExprType->isFloat()->yes()) {
+						$type = $this->createFloat(false);
+
+					} elseif ($castedExprType->isNumericString()->yes()) {
+						$type = $this->createNumericString(false);
+
+					} else {
+						$type = TypeCombinator::union($this->createFloat(false), $this->createNumericString(false));
+					}
+
 				} else {
 					$type = new MixedType();
 				}
@@ -1251,11 +1255,6 @@ public function walkAggregateExpression($aggExpression): string
 		}
 	}
 
-	/**
-	 * Numeric strings are kept as strings in literal usage, but casted to numeric value once used in numeric expression
-	 *  - SELECT '1'     => '1'
-	 *  - SELECT 1 * '1' => 1
-	 */
 	private function castStringLiteralForFloatExpression(Type $type): Type
 	{
 		if (!$type instanceof DqlConstantStringType || $type->getOriginLiteralType() !== AST\Literal::STRING) {

tests/Platform/QueryResultTypeWalkerFetchTypeMatrixTest.php

@@ -3082,7 +3082,7 @@ public static function provideCases(): iterable
 			'mysql' => self::floatOrNull(),
 			'sqlite' => self::floatOrNull(),
 			'pdo_pgsql' => self::numericString(),
-			'pgsql' => TypeCombinator::union(self::float(), self::numericString()),
+			'pgsql' => self::float(),
 			'mssql' => new MixedType(),
 			'mysqlResult' => 1.0,
 			'sqliteResult' => 1.0,
@@ -3100,7 +3100,7 @@ public static function provideCases(): iterable
 			'mysql' => self::floatOrNull(),
 			'sqlite' => self::floatOrNull(),
 			'pdo_pgsql' => self::numericString(),
-			'pgsql' => TypeCombinator::union(self::float(), self::numericString()),
+			'pgsql' => self::numericString(),
 			'mssql' => new MixedType(),
 			'mysqlResult' => 1.0,
 			'sqliteResult' => 1.0,
@@ -3118,7 +3118,7 @@ public static function provideCases(): iterable
 			'mysql' => self::floatOrNull(),
 			'sqlite' => self::floatOrNull(),
 			'pdo_pgsql' => self::numericString(),
-			'pgsql' => TypeCombinator::union(self::float(), self::numericString()),
+			'pgsql' => self::float(),
 			'mssql' => new MixedType(),
 			'mysqlResult' => 3.0,
 			'sqliteResult' => 3.0,
@@ -3154,7 +3154,7 @@ public static function provideCases(): iterable
 			'mysql' => self::floatOrNull(),
 			'sqlite' => PHP_VERSION_ID >= 80100 ? null : self::floatOrNull(), // fails in UDF since PHP 8.1: sqrt(): Passing null to parameter #1 ($num) of type float is deprecated
 			'pdo_pgsql' => self::numericStringOrNull(),
-			'pgsql' => TypeCombinator::union(self::floatOrNull(), self::numericStringOrNull()),
+			'pgsql' => self::floatOrNull(),
 			'mssql' => new MixedType(),
 			'mysqlResult' => null,
 			'sqliteResult' => 0.0, // caused by UDF wired through PHP's sqrt() which returns 0.0 for null
@@ -3190,7 +3190,7 @@ public static function provideCases(): iterable
 			'mysql' => self::float(),
 			'sqlite' => self::float(),
 			'pdo_pgsql' => self::numericString(),
-			'pgsql' => TypeCombinator::union(self::float(), self::numericString()),
+			'pgsql' => self::float(),
 			'mssql' => new MixedType(),
 			'mysqlResult' => 1.0,
 			'sqliteResult' => 1.0,
@@ -3208,7 +3208,7 @@ public static function provideCases(): iterable
 			'mysql' => self::float(),
 			'sqlite' => self::float(),
 			'pdo_pgsql' => self::numericString(),
-			'pgsql' => TypeCombinator::union(self::float(), self::numericString()),
+			'pgsql' => self::float(),
 			'mssql' => new MixedType(),
 			'mysqlResult' => 1.0,
 			'sqliteResult' => 1.0,
@@ -3226,7 +3226,7 @@ public static function provideCases(): iterable
 			'mysql' => self::float(),
 			'sqlite' => self::float(),
 			'pdo_pgsql' => self::numericString(),
-			'pgsql' => TypeCombinator::union(self::float(), self::numericString()),
+			'pgsql' => self::float(),
 			'mssql' => new MixedType(),
 			'mysqlResult' => 1.0,
 			'sqliteResult' => 1.0,
@@ -3244,7 +3244,7 @@ public static function provideCases(): iterable
 			'mysql' => self::float(),
 			'sqlite' => self::float(),
 			'pdo_pgsql' => self::numericString(),
-			'pgsql' => TypeCombinator::union(self::float(), self::numericString()),
+			'pgsql' => self::float(),
 			'mssql' => new MixedType(),
 			'mysqlResult' => 1.0,
 			'sqliteResult' => 1.0,
@@ -3298,7 +3298,7 @@ public static function provideCases(): iterable
 			'mysql' => self::float(),
 			'sqlite' => self::float(),
 			'pdo_pgsql' => self::numericString(),
-			'pgsql' => TypeCombinator::union(self::float(), self::numericString()),
+			'pgsql' => self::numericString(),
 			'mssql' => new MixedType(),
 			'mysqlResult' => 1.0,
 			'sqliteResult' => 1.0,
@@ -3457,7 +3457,8 @@ public static function provideCases(): iterable
 		// TODO string TypedExpression does not cast to string
 		// TODO would col_numeric_string differ from col_string results ?
 		// TODO dbal/orm versions
-		// TODO double check all inferred unions
+		// TODO also wrap driver to test alternative driver detection
+		// TODO run sqlsrv with custom setup (numeric, leading zero, native datetimes), check if implementable with current API
 	}
 
 	/**