Skip to content

Stop generating includes in nav expansion for primitive collection properties #34047

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 1 commit into from
Jun 21, 2024
Merged

Stop generating includes in nav expansion for primitive collection properties #34047

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
28 changes: 8 additions & 20 deletions src/EFCore.Cosmos/Query/Internal/CosmosProjectionBindingExpressionVisitor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,8 +236,7 @@ protected override Expression VisitExtension(Expression extensionExpression)
return QueryCompilationContext.NotTranslatedExpression;
}

if (!(includeExpression.Navigation is INavigation includableNavigation
&& includableNavigation.IsEmbedded()))
if (includeExpression.Navigation is not INavigation includableNavigation || !includableNavigation.IsEmbedded())
Copy link
Copy Markdown
Member Author

@roji roji Jun 21, 2024

Choose a reason for hiding this comment

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

Cleanup only

{
throw new InvalidOperationException(
CosmosStrings.NonEmbeddedIncludeNotSupported(includeExpression.Navigation));
Expand Down Expand Up @@ -459,26 +458,16 @@ protected override Expression VisitMethodCall(MethodCallExpression methodCallExp
StructuralTypeShaperExpression? shaperExpression;
switch (visitedSource)
{
case StructuralTypeShaperExpression shaper:
shaperExpression = shaper;
case StructuralTypeShaperExpression s:
shaperExpression = s;
break;

case UnaryExpression unaryExpression:
shaperExpression = unaryExpression.Operand as StructuralTypeShaperExpression;
if (shaperExpression == null
|| unaryExpression.NodeType != ExpressionType.Convert)
{
return QueryCompilationContext.NotTranslatedExpression;
}

case UnaryExpression { NodeType: ExpressionType.Convert, Operand: StructuralTypeShaperExpression s }:
shaperExpression = s;
break;

case ParameterExpression parameterExpression:
if (!_collectionShaperMapping.TryGetValue(parameterExpression, out var collectionShaper))
{
return QueryCompilationContext.NotTranslatedExpression;
}

case ParameterExpression parameterExpression
when _collectionShaperMapping.TryGetValue(parameterExpression, out var collectionShaper):
shaperExpression = (StructuralTypeShaperExpression)collectionShaper.InnerShaper;
break;

Expand Down Expand Up @@ -507,8 +496,7 @@ UnaryExpression unaryExpression
navigationProjection = innerEntityProjection.BindMember(
memberName, visitedSource.Type, clientEval: true, out var propertyBase);

if (propertyBase is not INavigation projectedNavigation
|| !projectedNavigation.IsEmbedded())
if (propertyBase is not INavigation projectedNavigation || !projectedNavigation.IsEmbedded())
{
return QueryCompilationContext.NotTranslatedExpression;
}
Expand Down
1 change: 1 addition & 0 deletions src/EFCore/Query/Internal/NavigationExpandingExpressionVisitor.ExpressionVisitors.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -564,6 +564,7 @@ protected override Expression VisitExtension(Expression extensionExpression)

case MaterializeCollectionNavigationExpression:
case IncludeExpression:
case PrimitiveCollectionReference:
Copy link
Copy Markdown
Member Author

@roji roji Jun 21, 2024

Choose a reason for hiding this comment

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

This is the fix

return extensionExpression;
Copy link
Copy Markdown
Contributor

@ajcvickers ajcvickers Jun 21, 2024

Choose a reason for hiding this comment

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

👍

}

Expand Down
Loading