Stop moving pending selector after DefaultIfEmpty in nav expansion #36241
Conversation
This file contains hidden or 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
roji
force-pushed
the
DefaultIfEmptySelect
branch
3 times, most recently
from
67e5859 to
bb3024a
Compare
roji
force-pushed
the
DefaultIfEmptySelect
branch
from
bb3024a to
c44c567
Compare
roji
commented
Jun 14, 2025
| _entityReferenceOptionalMarkingExpressionVisitor.Visit(pendingSelector); | ||
| if (!pendingSelector.Type.IsNullableType()) | ||
| { | ||
| pendingSelector = Expression.Coalesce( |
There was a problem hiding this comment.
Note the removal of Coalesce which was added (see main PR notes for context).
cincuranet
approved these changes
Jun 23, 2025
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.
This changes the NavigationExpandingExpressionVisitor around DefaultIfEmpty, applying any pending selector; this prevents any Select prior to the DIE from being moved after it.
This unfortunately caused some complications... Nav expansion was also previously responsible for adding a coalesce for value types, and relied on the fact that the Select gets moved after the DIE. Now that the Select stays before the DIE, the coalesce gets optimized away as it's not yet needed (the column hasn't yet been made nullable by DIE).
This logic doesn't strictly-speaking belong in nav expansion (or anywhere in preprocessing), and this PR moves it to the translation phase of DIE instead (translation was already handling making projected columns nullable, and is the right place for also applying a COALESCE when necessary).
Fixes #36208