Apply fix from #34729 to Cosmos SqlExpressionFactory to keep it in sync (#34964)

ChrisJollyAU · web-flow · commit 5c2afbb7c9af · 2025-02-07T18:54:34.000+01:00
diff --git a/src/EFCore.Cosmos/Query/Internal/SqlExpressionFactory.cs b/src/EFCore.Cosmos/Query/Internal/SqlExpressionFactory.cs
@@ -156,7 +156,7 @@ private SqlExpression ApplyTypeMappingOnSqlBinary(
             case ExpressionType.Coalesce:
             {
                 inferredTypeMapping = typeMapping ?? ExpressionExtensions.InferTypeMapping(left, right);
-                resultType = inferredTypeMapping?.ClrType ?? left.Type;
+                resultType = inferredTypeMapping?.ClrType ?? (left.Type != typeof(object) ? left.Type : right.Type);
                 resultTypeMapping = inferredTypeMapping;
                 break;
             }

Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ private SqlExpression ApplyTypeMappingOnSqlBinary(`
`156`	`156`	`case ExpressionType.Coalesce:`
`157`	`157`	`{`
`158`	`158`	`inferredTypeMapping = typeMapping ?? ExpressionExtensions.InferTypeMapping(left, right);`
`159`		`- resultType = inferredTypeMapping?.ClrType ?? left.Type;`
	`159`	`+ resultType = inferredTypeMapping?.ClrType ?? (left.Type != typeof(object) ? left.Type : right.Type);`
`160`	`160`	`resultTypeMapping = inferredTypeMapping;`
`161`	`161`	`break;`
`162`	`162`	`}`