Fix to #5454 - Error when using Where with reference #5796
Merged
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
| @@ -650,9 +650,22 @@ private static Expression HandleSkip(HandlerContext handlerContext) | |||
| { | |||
| var skipResultOperator = (SkipResultOperator)handlerContext.ResultOperator; | |||
|
|
|||
| handlerContext.SelectExpression.Offset = skipResultOperator.Count; | |||
| var sqlTranslatingExpressionVisitor | |||
There was a problem hiding this comment.
Can you move this visitor creation into a method on HandlerContext and update all of the places we do it?. I.e. handlerContext.CreateSqlTranslatingVisitor
|
|
|
Is there a test for the Skip/Take change? |
|
Reminder to also do a R# pass. |
|
tests are: 'Optional_navigation_type_compensation_works_with_skip' and 'Optional_navigation_type_compensation_works_with_take' |
Problem was for happening for queries with optional navigations like so: context.Orders.Where(o => o.Customer.IsVip) In this case Customer can be nullable, so IsVip can also be nullable. We compensate for this by introducing the following: context.Orders.Where(o => o.Customer != null ? (bool?)o.Customer.IsVip : (bool?)null) However, we didn't convert it back to the original type (users had to introduce those casts themselves). Without the cast, those queries were throwing compile-time exceptions that were not very informative. Fix is to cast back to the original type requested by user: context.Orders.Where(o => (bool)(o.Customer != null ? (bool?)o.Customer.IsVip : (bool?)null)) This still may cause runtime errors if o.Customer is actually null, but those are much more understandable now. Also fixed compilation errors for complex Skip/Take arguments. Those are evaluated on the client for the time being. CR: Andrew, Smit
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.
Fixes #5454
Problem was for happening for queries with optional navigations like so:
context.Orders.Where(o => o.Customer.IsVip)
In this case Customer can be nullable, so IsVip can also be nullable. We compensate for this by introducing the following:
context.Orders.Where(o => o.Customer != null ? (bool?)o.Customer.IsVip : (bool?)null)
However, we didn't convert it back to the original type (users had to introduce those casts themselves). Without the cast, those queries were throwing compile-time exceptions that were not very informative.
Fix is to cast back to the original type requested by user:
context.Orders.Where(o => (bool)(o.Customer != null ? (bool?)o.Customer.IsVip : (bool?)null))
This still may cause runtime errors if o.Customer is actually null, but those are much more understandable now.
Also fixed compilation errors for complex Skip/Take arguments. Those are evaluated on the client for the time being.