Improve relational model integration in Query#38346
Open
AndriySvyryd wants to merge 1 commit into
Open
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
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 #38060
Fixes #35466
The query pipeline previously fell back to model‑wide accessors (
GetJsonPropertyName, container‑column‑by‑name scans) at translation time, which produced wrong/ambiguous results under entity splitting, TPT, and JSON‑on‑view scenarios. This change threads the actual table set and JSON element metadata through the existing relational query expressions and consolidates priority logic in one place.Changes
GetQueryMappings()internal helper (RelationalTypeBaseExtensions) returns storage mappings in priority order — default SQL query → default function → view → table — and replaces allGetViewOrTableMappings()call sites in the query pipeline. Casts directly to the concreteList<TMapping>runtime type and filters in place to avoid LINQ allocations.StructuralTypeProjectionExpression.TableMap(optionalIReadOnlyDictionary<ITableBase, string>) — threaded through TPT, single‑table, entity‑splitting and TPCCreateSelectbranches, preserved acrossMakeNullable,UpdateEntityType,VisitChildren, set‑op merge, and subquery lift.BindProperty,TryRewriteEntityEquality, andGenerateMaterializationConditionnow scope their principal‑split‑table lookup to the actually‑projected tables.JsonQueryExpression.FindJsonElement(IPropertyBase)— returns theIRelationalJsonElementwhose containing column matchesJsonColumnwhen available, otherwise the first element from the property's mappings.BindProperty/BindStructuralPropertyand the OPENJSON/json_each translators inRelationalQueryableMethodTranslatingExpressionVisitor,SqlServer, andSqlitenow use this instead of model‑wideGetJsonPropertyName().JsonProjectionInfo.JsonColumn+ColumnExpression.Columnpreservation inMakeNullable/ApplyTypeMapping— the shaper now uses the column resolved at CreateSelect time, falling back to a model scan only when there's no underlyingIColumnBase(synthetic JSON columns over OPENJSON/json_each).