Skip to content

Use the proper type mapping for the result of AVG #35023

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
roji merged 2 commits into from
Oct 31, 2024
+17 −23
Merged

Use the proper type mapping for the result of AVG #35023

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cee3f89
Use the proper type mapping for the result of AVG
ChrisJollyAU Oct 31, 2024
93d2596
Remove unneeded fallback
ChrisJollyAU Oct 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/EFCore.Cosmos/Query/Internal/CosmosQueryableMethodTranslatingExpressionVisitor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,7 @@ private ShapedQueryExpression CreateShapedQueryExpression(SelectExpression selec
}

var projection = (SqlExpression)selectExpression.GetMappedProjection(new ProjectionMember());
projection = _sqlExpressionFactory.Function("AVG", new[] { projection }, projection.Type, projection.TypeMapping);
projection = _sqlExpressionFactory.Function("AVG", new[] { projection }, resultType, _typeMappingSource.FindMapping(resultType));

return AggregateResultShaper(source, projection, throwOnNullResult: true, resultType);
}
Expand Down
38 changes: 16 additions & 22 deletions test/EFCore.Cosmos.FunctionalTests/Query/NorthwindAggregateOperatorsQueryCosmosTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -699,22 +699,19 @@ public override async Task Min_no_data_subquery(bool async)
AssertSql();
}

public override async Task Average_with_no_arg(bool async)
{
// Always throws for sync.
if (async)
{
// Average truncates. Issue #26378.
await Assert.ThrowsAsync<EqualException>(async () => await base.Average_with_no_arg(async));
public override Task Average_with_no_arg(bool async)
=> Fixture.NoSyncTest(
async, async a =>
{
await base.Average_with_no_arg(a);

AssertSql(
"""
AssertSql(
"""
SELECT VALUE AVG(c["OrderID"])
FROM root c
WHERE (c["$type"] = "Order")
""");
}
}
});

public override Task Average_with_binary_expression(bool async)
=> Fixture.NoSyncTest(
Expand All @@ -730,22 +727,19 @@ FROM root c
""");
});

public override async Task Average_with_arg(bool async)
{
// Always throws for sync.
if (async)
{
// Average truncates. Issue #26378.
await Assert.ThrowsAsync<EqualException>(async () => await base.Average_with_arg(async));
public override Task Average_with_arg(bool async)
=> Fixture.NoSyncTest(
async, async a =>
{
await base.Average_with_arg(a);

AssertSql(
"""
AssertSql(
"""
SELECT VALUE AVG(c["OrderID"])
FROM root c
WHERE (c["$type"] = "Order")
""");
}
}
});

public override Task Average_with_arg_expression(bool async)
=> Fixture.NoSyncTest(
Expand Down