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

Allow complex boolean expressions in projection #4266

Merged
merged 1 commit into from
Jan 12, 2016
Merged

Allow complex boolean expressions in projection #4266

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
17 changes: 13 additions & 4 deletions src/EntityFramework.MicrosoftSqlServer/Query/Sql/Internal/SqlServerQuerySqlGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,12 @@ public override Expression VisitSqlFunction(SqlFunctionExpression sqlFunctionExp

private class ProjectionComparisonTransformingVisitor : RelinqExpressionVisitor
{
private bool _insideConditionalTest = false;

protected override Expression VisitUnary(UnaryExpression node)
{
if (node.NodeType == ExpressionType.Not
if (!_insideConditionalTest
&& node.NodeType == ExpressionType.Not
&& node.Operand is AliasExpression)
{
return Expression.Condition(
Expand All @@ -118,8 +121,10 @@ protected override Expression VisitUnary(UnaryExpression node)

protected override Expression VisitBinary(BinaryExpression node)
{
if (node.IsComparisonOperation())
{
if (!_insideConditionalTest
&& (node.IsComparisonOperation()
|| node.IsLogicalOperation()))
{
return Expression.Condition(
node,
Expression.Constant(true, typeof(bool)),
Expand All @@ -132,7 +137,9 @@ protected override Expression VisitBinary(BinaryExpression node)

protected override Expression VisitConditional(ConditionalExpression node)
{
_insideConditionalTest = true;
var test = Visit(node.Test);
_insideConditionalTest = false;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does it matter if we re-enter here via nested conditionals?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Case block inside When part (node.Test) is not supported. There can be nested conditionals inside IfTrue & IfFalse but not inside Test. So we do not enter VisitConditional while _insideConditionalTest is true.
Also added test for nested conditionals.

if (test is AliasExpression)
{
return Expression.Condition(
Expand All @@ -149,7 +156,9 @@ protected override Expression VisitConditional(ConditionalExpression node)
Visit(node.IfTrue),
Visit(node.IfFalse));
}
return base.VisitConditional(node);
return Expression.Condition(test,
Visit(node.IfTrue),
Visit(node.IfFalse));
}
}

Expand Down
41 changes: 22 additions & 19 deletions src/EntityFramework.Relational/Query/Sql/DefaultQuerySqlGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,22 +174,7 @@ public virtual Expression VisitSelect(SelectExpression selectExpression)
}
else
{
var predicate
= new NullComparisonTransformingVisitor(_parametersValues)
.Visit(selectExpression.Predicate);

var relationalNullsOptimizedExpandingVisitor = new RelationalNullsOptimizedExpandingVisitor();
var newPredicate = relationalNullsOptimizedExpandingVisitor.Visit(predicate);

predicate
= relationalNullsOptimizedExpandingVisitor.IsOptimalExpansion
? newPredicate
: new RelationalNullsExpandingVisitor().Visit(predicate);

predicate = new PredicateNegationExpressionOptimizer().Visit(predicate);
predicate = new ReducingExpressionVisitor().Visit(predicate);

Visit(predicate);
Visit(ApplyNullSemantics(selectExpression.Predicate));

if (selectExpression.Predicate is ParameterExpression
|| selectExpression.Predicate.IsAliasWithColumnExpression()
Expand Down Expand Up @@ -227,13 +212,31 @@ var predicate
return selectExpression;
}

protected virtual void VisitProjection([NotNull] IReadOnlyList<Expression> projections)
private Expression ApplyNullSemantics(Expression expression)
{
var nullComparisonTransformer = new NullComparisonTransformingVisitor(_parametersValues);
var newExpression
= new NullComparisonTransformingVisitor(_parametersValues)
.Visit(expression);

var relationalNullsOptimizedExpandingVisitor = new RelationalNullsOptimizedExpandingVisitor();
var optimizedExpression = relationalNullsOptimizedExpandingVisitor.Visit(newExpression);

newExpression
= relationalNullsOptimizedExpandingVisitor.IsOptimalExpansion
? optimizedExpression
: new RelationalNullsExpandingVisitor().Visit(newExpression);

VisitJoin(projections.Select(e => nullComparisonTransformer.Visit(e)).ToList());
newExpression = new PredicateNegationExpressionOptimizer().Visit(newExpression);
newExpression = new ReducingExpressionVisitor().Visit(newExpression);

return newExpression;
}

protected virtual void VisitProjection([NotNull] IReadOnlyList<Expression> projections) => VisitJoin(
projections
.Select(ApplyNullSemantics)
.ToList());

protected virtual void GenerateOrderBy([NotNull] IReadOnlyList<Ordering> orderings)
{
_relationalCommandBuilder.Append("ORDER BY ");
Expand Down
75 changes: 71 additions & 4 deletions test/EntityFramework.Core.FunctionalTests/GearsOfWarQueryTestBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,23 +522,23 @@ public virtual void Select_comparison_with_null()
AmmunitionType? ammunitionType = AmmunitionType.Cartridge;
using (var context = CreateContext())
{
var cartidgeWeapons = context.Weapons
var cartridgeWeapons = context.Weapons
.Where(w => w.AmmunitionType == ammunitionType)
.Select(w => new { w.Id, Cartidge = w.AmmunitionType == ammunitionType })
.ToList();

Assert.True(cartidgeWeapons.All(t => t.Cartidge == true));
Assert.True(cartridgeWeapons.All(t => t.Cartidge == true));
}

ammunitionType = null;
using (var context = CreateContext())
{
var cartidgeWeapons = context.Weapons
var cartridgeWeapons = context.Weapons
.Where(w => w.AmmunitionType == ammunitionType)
.Select(w => new { w.Id, Cartidge = w.AmmunitionType == ammunitionType })
.ToList();

Assert.True(cartidgeWeapons.All(t => t.Cartidge == true));
Assert.True(cartridgeWeapons.All(t => t.Cartidge == true));
}
}

Expand Down Expand Up @@ -568,6 +568,73 @@ public virtual void Select_ternary_operation_with_inverted_boolean()
}
}

[ConditionalFact]
public virtual void Select_ternary_operation_with_has_value_not_null()
{
using (var context = CreateContext())
{
var cartridgeWeapons = context.Weapons
.Where(w => w.AmmunitionType.HasValue && w.AmmunitionType == AmmunitionType.Cartridge)
.Select(w => new { w.Id, IsCartidge = w.AmmunitionType.HasValue && w.AmmunitionType.Value == AmmunitionType.Cartridge ? "Yes" : "No"})
.ToList();

Assert.All(cartridgeWeapons,
t => Assert.Equal("Yes", t.IsCartidge));
}
}

[ConditionalFact]
public virtual void Select_ternary_operation_multiple_conditions()
{
using (var context = CreateContext())
{
var cartridgeWeapons = context.Weapons
.Select(w => new { w.Id, IsCartidge = w.AmmunitionType == AmmunitionType.Shell && w.SynergyWithId == 1 ? "Yes" : "No" })
.ToList();

Assert.Equal(9 , cartridgeWeapons.Count(w => w.IsCartidge == "No"));
}
}

[ConditionalFact]
public virtual void Select_ternary_operation_multiple_conditions_2()
{
using (var context = CreateContext())
{
var cartridgeWeapons = context.Weapons
.Select(w => new { w.Id, IsCartidge = !w.IsAutomatic && w.SynergyWithId == 1 ? "Yes" : "No" })
.ToList();

Assert.Equal(9, cartridgeWeapons.Count(w => w.IsCartidge == "No"));
}
}

[ConditionalFact]
public virtual void Select_multiple_conditions()
{
using (var context = CreateContext())
{
var cartridgeWeapons = context.Weapons
.Select(w => new { w.Id, IsCartidge = !w.IsAutomatic && w.SynergyWithId == 1})
.ToList();

Assert.Equal(9, cartridgeWeapons.Count(w => !w.IsCartidge));
}
}

[ConditionalFact]
public virtual void Select_nested_ternary_operations()
{
using (var context = CreateContext())
{
var cartridgeWeapons = context.Weapons
.Select(w => new { w.Id, IsManualCartidge = !w.IsAutomatic ? w.AmmunitionType == AmmunitionType.Cartridge ? "ManualCartridge" : "Manual" : "Auto" })
.ToList();

Assert.Equal(2, cartridgeWeapons.Count(w => w.IsManualCartidge == "ManualCartridge"));
}
}

[ConditionalFact]
public virtual void Select_Where_Navigation()
{
Expand Down
Loading