Skip to content
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

Jump to bottom

Query: Read Avg/Min/Max as nullable from database to throw exception … #18971

Merged
merged 2 commits into from
Nov 26, 2019
Merged

Query: Read Avg/Min/Max as nullable from database to throw exception … #18971

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
e2928ae
Query: Read Avg/Min/Max as nullable from database to throw exception …
smitpatel Nov 18, 2019
68bc900
Update FloatTypeMapping.cs
smitpatel Nov 19, 2019
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
42 changes: 16 additions & 26 deletions src/EFCore.Cosmos/Query/Internal/CosmosQueryableMethodTranslatingExpressionVisitor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -779,43 +779,33 @@ private ShapedQueryExpression AggregateResultShaper(

selectExpression.ClearOrdering();

Expression shaper = new ProjectionBindingExpression(source.QueryExpression, new ProjectionMember(), projection.Type);
var nullableResultType = resultType.MakeNullable();
Expression shaper = new ProjectionBindingExpression(
source.QueryExpression, new ProjectionMember(), throwOnNullResult ? nullableResultType : projection.Type);

if (throwOnNullResult
&& resultType.IsNullableType())
if (throwOnNullResult)
{
var resultVariable = Expression.Variable(projection.Type, "result");
var resultVariable = Expression.Variable(nullableResultType, "result");
var returnValueForNull = resultType.IsNullableType()
? (Expression)Expression.Constant(null, resultType)
: Expression.Throw(
Expression.New(
typeof(InvalidOperationException).GetConstructors()
.Single(ci => ci.GetParameters().Length == 1),
Expression.Constant(CoreStrings.NoElements)),
resultType);

shaper = Expression.Block(
new[] { resultVariable },
Expression.Assign(resultVariable, shaper),
Expression.Condition(
Expression.Equal(resultVariable, Expression.Default(projection.Type)),
Expression.Constant(null, resultType),
Expression.Equal(resultVariable, Expression.Default(nullableResultType)),
returnValueForNull,
resultType != resultVariable.Type
? Expression.Convert(resultVariable, resultType)
: (Expression)resultVariable));
}
else if (throwOnNullResult)
{
var resultVariable = Expression.Variable(projection.Type, "result");

shaper = Expression.Block(
new[] { resultVariable },
Expression.Assign(resultVariable, shaper),
Expression.Condition(
Expression.Equal(resultVariable, Expression.Default(projection.Type)),
Expression.Throw(
Expression.New(
typeof(InvalidOperationException).GetConstructors()
.Single(ci => ci.GetParameters().Length == 1),
Expression.Constant(CoreStrings.NoElements)),
resultType),
resultType != resultVariable.Type
? Expression.Convert(resultVariable, resultType)
: (Expression)resultVariable));
}
else if (resultType.IsNullableType())
else if (resultType != shaper.Type)
{
shaper = Expression.Convert(shaper, resultType);
}
Expand Down
15 changes: 7 additions & 8 deletions src/EFCore.Relational/Query/RelationalQueryableMethodTranslatingExpressionVisitor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1143,11 +1143,13 @@ private ShapedQueryExpression AggregateResultShaper(

selectExpression.ClearOrdering();

Expression shaper = new ProjectionBindingExpression(source.QueryExpression, new ProjectionMember(), projection.Type);
var nullableResultType = resultType.MakeNullable();
Expression shaper = new ProjectionBindingExpression(
source.QueryExpression, new ProjectionMember(), throwOnNullResult ? nullableResultType : projection.Type);

if (throwOnNullResult)
{
var resultVariable = Expression.Variable(projection.Type, "result");
var resultVariable = Expression.Variable(nullableResultType, "result");
var returnValueForNull = resultType.IsNullableType()
? (Expression)Expression.Constant(null, resultType)
: Expression.Throw(
Expand All @@ -1161,18 +1163,15 @@ private ShapedQueryExpression AggregateResultShaper(
new[] { resultVariable },
Expression.Assign(resultVariable, shaper),
Expression.Condition(
Expression.Equal(resultVariable, Expression.Default(projection.Type)),
Expression.Equal(resultVariable, Expression.Default(nullableResultType)),
returnValueForNull,
resultType != resultVariable.Type
? Expression.Convert(resultVariable, resultType)
: (Expression)resultVariable));
}
else
else if (resultType != shaper.Type)
{
if (resultType.IsNullableType())
{
shaper = Expression.Convert(shaper, resultType);
}
shaper = Expression.Convert(shaper, resultType);
}

source.ShaperExpression = shaper;
Expand Down
3 changes: 2 additions & 1 deletion src/EFCore.Relational/Storage/FloatTypeMapping.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.

using System;
using System.Data;
using System.Globalization;
using JetBrains.Annotations;
Expand Down Expand Up @@ -55,6 +56,6 @@ protected override RelationalTypeMapping Clone(RelationalTypeMappingParameters p
/// The generated string.
/// </returns>
protected override string GenerateNonNullSqlLiteral(object value)
=> ((float)value).ToString("R", CultureInfo.InvariantCulture);
=> Convert.ToSingle(value).ToString("R", CultureInfo.InvariantCulture);
}
}
3 changes: 2 additions & 1 deletion src/EFCore.SqlServer/Storage/Internal/SqlServerDoubleTypeMapping.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.

using System;
using System.Data;
using System.Data.Common;
using JetBrains.Annotations;
Expand Down Expand Up @@ -58,7 +59,7 @@ protected override string GenerateNonNullSqlLiteral(object value)
{
var literal = base.GenerateNonNullSqlLiteral(value);

var doubleValue = (double)value;
var doubleValue = Convert.ToDouble(value);
return !literal.Contains("E")
&& !literal.Contains("e")
&& !double.IsNaN(doubleValue)
Expand Down
41 changes: 39 additions & 2 deletions test/EFCore.Specification.Tests/Query/SimpleQueryTestBase.ResultOperators.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1885,9 +1885,46 @@ await AssertCount(
ss => ss.Set<Order>().Select(o => new { Id = CodeFormat(o.OrderID) }));
}

private static string CodeFormat(int str)
private static string CodeFormat(int str) => str.ToString();

[ConditionalTheory]
[MemberData(nameof(IsAsyncData))]
public virtual Task Sum_over_empty_returns_zero(bool isAsync)
{
return AssertSum(
isAsync,
ss => ss.Set<Order>().Where(o => o.OrderID == 42),
o => o.OrderID);
}

[ConditionalTheory]
[MemberData(nameof(IsAsyncData))]
public virtual Task Average_over_default_returns_default(bool isAsync)
{
return AssertAverage(
isAsync,
ss => ss.Set<Order>().Where(o => o.OrderID == 10248),
o => o.OrderID - 10248);
}

[ConditionalTheory]
[MemberData(nameof(IsAsyncData))]
public virtual Task Max_over_default_returns_default(bool isAsync)
{
return str.ToString();
return AssertMax(
isAsync,
ss => ss.Set<Order>().Where(o => o.OrderID == 10248),
o => o.OrderID - 10248);
}

[ConditionalTheory]
[MemberData(nameof(IsAsyncData))]
public virtual Task Min_over_default_returns_default(bool isAsync)
{
return AssertMin(
isAsync,
ss => ss.Set<Order>().Where(o => o.OrderID == 10248),
o => o.OrderID - 10248);
}
}
}