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

Assumptions are correct till they are not #22254

Merged
1 commit merged into from
Aug 27, 2020
Merged

Assumptions are correct till they are not #22254

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
14 changes: 2 additions & 12 deletions src/EFCore.InMemory/Query/Internal/InMemoryProjectionBindingExpressionVisitor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,9 +237,8 @@ protected override Expression VisitExtension(Expression extensionExpression)
EntityProjectionExpression entityProjectionExpression;
if (entityShaperExpression.ValueBufferExpression is ProjectionBindingExpression projectionBindingExpression)
{
VerifyQueryExpression(projectionBindingExpression);
entityProjectionExpression = (EntityProjectionExpression)_queryExpression.GetMappedProjection(
projectionBindingExpression.ProjectionMember);
entityProjectionExpression = (EntityProjectionExpression)((InMemoryQueryExpression)projectionBindingExpression.QueryExpression)
.GetMappedProjection(projectionBindingExpression.ProjectionMember);
}
else
{
Expand Down Expand Up @@ -486,15 +485,6 @@ protected override Expression VisitUnary(UnaryExpression unaryExpression)
: unaryExpression.Update(MatchTypes(operand, unaryExpression.Operand.Type));
}

// TODO: Debugging
private void VerifyQueryExpression(ProjectionBindingExpression projectionBindingExpression)
{
if (projectionBindingExpression.QueryExpression != _queryExpression)
{
throw new InvalidOperationException(CoreStrings.QueryFailed(projectionBindingExpression.Print(), GetType().Name));
}
}

private CollectionShaperExpression AddCollectionProjection(
ShapedQueryExpression subquery,
INavigationBase navigation,
Expand Down
18 changes: 4 additions & 14 deletions src/EFCore.Relational/Query/Internal/RelationalProjectionBindingExpressionVisitor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,8 @@ public override Expression Visit(Expression expression)
if (projectionBindingExpression.ProjectionMember != null)
{
// This would be SqlExpression. EntityProjectionExpression would be wrapped inside EntityShaperExpression.
var mappedProjection = (SqlExpression)_selectExpression.GetMappedProjection(
projectionBindingExpression.ProjectionMember);
var mappedProjection = (SqlExpression)((SelectExpression)projectionBindingExpression.QueryExpression)
.GetMappedProjection(projectionBindingExpression.ProjectionMember);

return new ProjectionBindingExpression(
_selectExpression, _selectExpression.AddToProjection(mappedProjection), expression.Type);
Expand Down Expand Up @@ -299,7 +299,6 @@ protected override Expression VisitExtension(Expression extensionExpression)
EntityProjectionExpression entityProjectionExpression;
if (entityShaperExpression.ValueBufferExpression is ProjectionBindingExpression projectionBindingExpression)
{
VerifySelectExpression(projectionBindingExpression);
// If projectionBinding is not mapped then SelectExpression has client projection
// Hence force client eval
if (projectionBindingExpression.ProjectionMember == null)
Expand All @@ -318,8 +317,8 @@ protected override Expression VisitExtension(Expression extensionExpression)
return null;
}

entityProjectionExpression = (EntityProjectionExpression)_selectExpression.GetMappedProjection(
projectionBindingExpression.ProjectionMember);
entityProjectionExpression = (EntityProjectionExpression)((SelectExpression)projectionBindingExpression.QueryExpression)
.GetMappedProjection(projectionBindingExpression.ProjectionMember);
}
else
{
Expand Down Expand Up @@ -570,15 +569,6 @@ protected override Expression VisitUnary(UnaryExpression unaryExpression)
: unaryExpression.Update(MatchTypes(operand, unaryExpression.Operand.Type));
}

// TODO: Debugging
private void VerifySelectExpression(ProjectionBindingExpression projectionBindingExpression)
{
if (projectionBindingExpression.QueryExpression != _selectExpression)
{
throw new InvalidOperationException(CoreStrings.QueryFailed(projectionBindingExpression.Print(), GetType().Name));
}
}

private static Expression MatchTypes(Expression expression, Type targetType)
{
if (targetType != expression.Type
Expand Down
22 changes: 22 additions & 0 deletions test/EFCore.Specification.Tests/Query/NorthwindJoinQueryTestBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -878,5 +878,27 @@ private bool Equals(OrderDetailViewModel orderDetailViewModel)
public override int GetHashCode()
=> HashCode.Combine(_orderID, _productID);
}

[ConditionalTheory]
[MemberData(nameof(IsAsyncData))]
public virtual Task SelectMany_with_selecting_outer_entity(bool async)
{
return AssertQuery(
async,
ss => ss.Set<Customer>()
.SelectMany(c => c.Orders.Select(o => c)),
entryCount: 89);
}

[ConditionalTheory]
[MemberData(nameof(IsAsyncData))]
public virtual Task SelectMany_with_selecting_outer_element(bool async)
{
return AssertQuery(
async,
ss => ss.Set<Customer>()
.Select(e => new { e, Complex = e.CustomerID + e.City })
.SelectMany(c => c.e.Orders.Select(o => c.Complex)));
}
}
}
28 changes: 28 additions & 0 deletions test/EFCore.SqlServer.FunctionalTests/Query/NorthwindJoinQuerySqlServerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -583,6 +583,34 @@ WHERE [c].[CustomerID] LIKE N'A%'
ORDER BY [c].[CustomerID], [t0].[OrderID0], [t0].[OrderID1], [t0].[ProductID0]");
}

public override async Task SelectMany_with_selecting_outer_entity(bool async)
{
await base.SelectMany_with_selecting_outer_entity(async);

AssertSql(
@"SELECT [t].[CustomerID], [t].[Address], [t].[City], [t].[CompanyName], [t].[ContactName], [t].[ContactTitle], [t].[Country], [t].[Fax], [t].[Phone], [t].[PostalCode], [t].[Region]
FROM [Customers] AS [c]
CROSS APPLY (
SELECT [c].[CustomerID], [c].[Address], [c].[City], [c].[CompanyName], [c].[ContactName], [c].[ContactTitle], [c].[Country], [c].[Fax], [c].[Phone], [c].[PostalCode], [c].[Region]
FROM [Orders] AS [o]
WHERE [c].[CustomerID] = [o].[CustomerID]
) AS [t]");
}

public override async Task SelectMany_with_selecting_outer_element(bool async)
{
await base.SelectMany_with_selecting_outer_element(async);

AssertSql(
@"SELECT [t].[c]
FROM [Customers] AS [c]
CROSS APPLY (
SELECT [c].[CustomerID] + COALESCE([c].[City], N'') AS [c]
FROM [Orders] AS [o]
WHERE [c].[CustomerID] = [o].[CustomerID]
) AS [t]");
}

private void AssertSql(params string[] expected)
=> Fixture.TestSqlLoggerFactory.AssertBaseline(expected);

Expand Down
12 changes: 12 additions & 0 deletions test/EFCore.Sqlite.FunctionalTests/Query/NorthwindJoinQuerySqliteTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,17 @@ public override async Task SelectMany_with_client_eval_with_collection_shaper_ig
SqliteStrings.ApplyNotSupported,
(await Assert.ThrowsAsync<InvalidOperationException>(
() => base.SelectMany_with_client_eval_with_collection_shaper_ignored(async))).Message);

public override async Task SelectMany_with_selecting_outer_entity(bool async)
=> Assert.Equal(
SqliteStrings.ApplyNotSupported,
(await Assert.ThrowsAsync<InvalidOperationException>(
() => base.SelectMany_with_selecting_outer_entity(async))).Message);

public override async Task SelectMany_with_selecting_outer_element(bool async)
=> Assert.Equal(
SqliteStrings.ApplyNotSupported,
(await Assert.ThrowsAsync<InvalidOperationException>(
() => base.SelectMany_with_selecting_outer_element(async))).Message);
}
}