Fix to #16076 - Query: Nav rewrite type mismatch #16205
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Problem was that when rewriting collection navigations into IQueryable, if the collection is composed on, we would always removing MaterializeCollectionNavigation. However, if the method was an instance method, e.g. List<T>.ToArray, we should preserve the original collection type, so that the method call is still possible to make. Fix is to look at the declaring type of instance method, and only strip MaterializeCollectionNavigation if the instance type is IQueryable. For static methods, only remove MaterializeCollectionNavigation if the method is defined on Queryable or Enumerable
smitpatel
reviewed
Jun 27, 2019
| // for instance methods, make sure that the method caller is compatible with IQueryable | ||
| // otherwise, if we strip MaterializeCollectionNavigation we might no longer be able to construct the expression due to type mismatch | ||
| var newObject = Visit(methodCallExpression.Object); | ||
| if (methodCallerType != null && methodCallerType.IsQueryableType()) |
There was a problem hiding this comment.
Is all these other processing necessary?
Shouldn't it be as easy as, if it is a method on Queryable/Enumerable class then we strip off MaterializeCollectionNavigation. All other case, we leave it as is. In case if it was not necessary at some point (suppose some externally added method on IQueryable by provider), then at the translation time it can be handled easily.
p.s. Collection include can probably remove MaterializeCollectionNavigation too.
|
Superseded by #16785 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Problem was that when rewriting collection navigations into IQueryable, if the collection is composed on, we would always removing MaterializeCollectionNavigation. However, if the method was an instance method, e.g. List.ToArray, we should preserve the original collection type, so that the method call is still possible to make.
Fix is to look at the declaring type of instance method, and only strip MaterializeCollectionNavigation if the instance type is IQueryable.