Fix primitive/complex collection handling on subtypes #37482
Merged
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
There was a problem hiding this comment.
Pull request overview
This pull request fixes issue #37478 by adding support for primitive and complex collection handling on derived types in inheritance hierarchies. The core change refactors the TryExpandRelationship method to properly handle both entity and complex types when binding collection properties.
Changes:
- Refactored
NavigationExpandingExpressionVisitorto use a switch expression for cleaner type handling and to properly bind primitive/complex collections on subtypes - Added
Intsprimitive collection property to theCoketest model (a derived type) - Added comprehensive test coverage for the new functionality across all inheritance strategies (TPH, TPT, TPC)
Reviewed changes
Copilot reviewed 16 out of 16 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
NavigationExpandingExpressionVisitor.ExpressionVisitors.cs |
Refactored TryExpandRelationship to use switch expression and moved collection binding logic after type-specific handling |
Coke.cs |
Added Ints primitive collection property to test derived type collection handling; fixed typo in existing comment |
InheritanceData.cs |
Added test data for the new Ints property |
InheritanceQueryTestBase.cs |
Added new test method Primitive_collection_on_subtype |
InheritanceQueryFixtureBase.cs |
Added assertion for the new Ints property |
TPH/TPT/TPCInheritanceQuerySqlServerTest.cs |
Added SQL Server-specific test implementations with expected SQL baselines |
TPH/TPT/TPCInheritanceTableSplittingQuerySqlServerTest.cs |
Updated SQL baselines to include Ints column |
TPH/TPT/TPCInheritanceJsonQuerySqlServerTest.cs |
Updated JSON-based SQL baselines to include Ints column |
IncompleteMappingInheritanceQuerySqlServerTest.cs |
Added test implementation for incomplete mapping scenario |
InheritanceQueryCosmosTest.cs |
Added Cosmos DB-specific test implementation |
src/EFCore/Query/Internal/NavigationExpandingExpressionVisitor.ExpressionVisitors.cs
Outdated
Show resolved
Hide resolved
….ExpressionVisitors.cs Co-authored-by: Copilot <[email protected]>
AndriySvyryd
approved these changes
Jan 13, 2026
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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 #37478