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

Use some C# 8 switch expressions #16421

Merged
merged 1 commit into from
Jul 3, 2019
Merged

Use some C# 8 switch expressions #16421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
60 changes: 17 additions & 43 deletions src/EFCore.Relational/Query/Pipeline/RelationalSqlTranslatingExpressionVisitor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,30 +286,16 @@ protected override Expression VisitMethodCall(MethodCallExpression methodCallExp
&& methodCallExpression.Arguments.Count > 0
&& methodCallExpression.Arguments[0] is GroupByShaperExpression groupByShaperExpression)
{
switch (methodCallExpression.Method.Name)
return methodCallExpression.Method.Name switch
{
case nameof(Enumerable.Average):
return TranslateAverage(GetSelector(methodCallExpression, groupByShaperExpression));

case nameof(Enumerable.Count):
return TranslateCount();

case nameof(Enumerable.LongCount):
return TranslateLongCount();

case nameof(Enumerable.Max):
return TranslateMax(GetSelector(methodCallExpression, groupByShaperExpression));

case nameof(Enumerable.Min):
return TranslateMin(GetSelector(methodCallExpression, groupByShaperExpression));

case nameof(Enumerable.Sum):
return TranslateSum(GetSelector(methodCallExpression, groupByShaperExpression));

default:
throw new InvalidOperationException("Unknown aggregate operator encountered.");
}

nameof(Enumerable.Average) => TranslateAverage(GetSelector(methodCallExpression, groupByShaperExpression)),
nameof(Enumerable.Count) => TranslateCount(),
nameof(Enumerable.LongCount) => TranslateLongCount(),
nameof(Enumerable.Max) => TranslateMax(GetSelector(methodCallExpression, groupByShaperExpression)),
nameof(Enumerable.Min) => TranslateMin(GetSelector(methodCallExpression, groupByShaperExpression)),
nameof(Enumerable.Sum) => TranslateSum(GetSelector(methodCallExpression, groupByShaperExpression)),
_ => throw new InvalidOperationException("Unknown aggregate operator encountered.")
};
}

// Subquery case
Expand Down Expand Up @@ -473,27 +459,15 @@ protected override Expression VisitParameter(ParameterExpression parameterExpres
=> new SqlParameterExpression(parameterExpression, null);

protected override Expression VisitExtension(Expression extensionExpression)
{
switch (extensionExpression)
=> extensionExpression switch
{
case EntityShaperExpression _:
case SqlExpression _:
return extensionExpression;

case NullConditionalExpression nullConditionalExpression:
return Visit(nullConditionalExpression.AccessOperation);

case CorrelationPredicateExpression correlationPredicateExpression:
return Visit(correlationPredicateExpression.EqualExpression);

case ProjectionBindingExpression projectionBindingExpression:
var selectExpression = (SelectExpression)projectionBindingExpression.QueryExpression;
return selectExpression.GetMappedProjection(projectionBindingExpression.ProjectionMember);

default:
return null;
}
}
EntityShaperExpression e => e,
SqlExpression e => e,
NullConditionalExpression e => Visit(e.AccessOperation),
CorrelationPredicateExpression e => Visit(e.EqualExpression),
ProjectionBindingExpression e => ((SelectExpression)e.QueryExpression).GetMappedProjection(e.ProjectionMember),
_ => null
};

protected override Expression VisitConditional(ConditionalExpression conditionalExpression)
{
Expand Down
22 changes: 6 additions & 16 deletions src/EFCore.Relational/Query/Pipeline/SqlExpressions/SelectExpression.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,35 +252,25 @@ public void ApplyPredicate(SqlExpression expression)

if (_groupBy.Count > 0)
{
if (HavingExpression == null)
{
HavingExpression = expression;
}
else
{
HavingExpression = new SqlBinaryExpression(
HavingExpression = HavingExpression == null
? expression
: new SqlBinaryExpression(
ExpressionType.AndAlso,
HavingExpression,
expression,
typeof(bool),
expression.TypeMapping);
}
}
else
{
if (Predicate == null)
{
Predicate = expression;
}
else
{
Predicate = new SqlBinaryExpression(
Predicate = Predicate == null
? expression
: new SqlBinaryExpression(
ExpressionType.AndAlso,
Predicate,
expression,
typeof(bool),
expression.TypeMapping);
}
}
}

Expand Down