Skip to content

[release/11.0-rc1] Preserve discriminating ORDER BY for many-to-many collections - #38811

Merged
AndriySvyryd merged 2 commits into
release/11.0-rc1from
copilot/fix-many-to-many-order-by-regression
Aug 21, 2026
Merged

[release/11.0-rc1] Preserve discriminating ORDER BY for many-to-many collections#38811
AndriySvyryd merged 2 commits into
release/11.0-rc1from
copilot/fix-many-to-many-order-by-regression

Conversation

CopilotAI commented Aug 14, 2026•
edited
Loading

Copy link
Copy Markdown
Contributor

Many-to-many collection includes could omit their only varying identifier from ORDER BY, making materialization order depend on the provider’s physical access path.

  • Ordering logic

    • Retain the pending identifier when surviving identifiers only repeat the collection join key.
    • Preserve the existing omission when another identifier already discriminates collection elements.

  • Regression coverage

    • Seed SQLite join rows out of key order to expose physical-order dependencies.
    • Update SQL Server baselines to include the restored discriminator.
-- BeforeORDER BY [e].[Id], [s].[OneId]
-- AfterORDER BY [e].[Id], [s].[OneId], [s].[TwoId]

CopilotAI linked an issue Aug 14, 2026 that may be closed by this pull request
Many-to-many collection ORDER BY loses its only discriminating column (regression in 11.0) #38770
Closed
CopilotAI changed the title [WIP] Fix many-to-many collection ORDER BY regression in EFCore 11.0Preserve discriminating ORDER BY for many-to-many collectionsAug 14, 2026
CopilotAI requested a review from AndriySvyrydAugust 14, 2026 21:00
@AndriySvyryd
AndriySvyryd requested a balanced review from CopilotAugust 15, 2026 01:15
CopilotAI reviewed Aug 15, 2026
View reviewed changes

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Fixes nondeterministic many-to-many collection materialization by retaining the final discriminating identifier in generated ORDER BY clauses.

Changes:

  • Detects when surviving orderings contain only collection join keys.
  • Seeds SQLite join rows out of key order for regression coverage.
  • Updates SQL Server baselines across standard, temporal, TPT, and TPC queries.

Reviewed changes

Copilot reviewed 6 out of 6 changed files in this pull request and generated no comments.

Show a summary per file
FileDescription
src/EFCore.Relational/Query/SqlExpressions/SelectExpression.csPreserves the required collection discriminator ordering.
test/EFCore.Sqlite.FunctionalTests/ManyToManyLoadSqliteTestBase.csIntroduces non-key-ordered join rows.
test/EFCore.SqlServer.FunctionalTests/Query/ManyToManyQuerySqlServerTest.csUpdates SQL ordering baselines.
test/EFCore.SqlServer.FunctionalTests/Query/TemporalManyToManyQuerySqlServerTest.csUpdates temporal SQL baselines.
test/EFCore.SqlServer.FunctionalTests/Query/Inheritance/TPTManyToManyQuerySqlServerTest.csUpdates TPT SQL baselines.
test/EFCore.SqlServer.FunctionalTests/Query/Inheritance/TPCManyToManyQuerySqlServerTest.csUpdates TPC SQL baselines.

💡 Add a code-review agent skill for context-aware, tailored reviews. Learn more in the docs.

@AndriySvyryd
AndriySvyryd changed the base branch from main to release/11.0-rc1August 17, 2026 18:14
@AndriySvyryd
Fix many-to-many collection ordering
c819f61
Fixes#38770
Co-authored-by: AndriySvyryd <6539701+AndriySvyryd@users.noreply.github.com>
@AndriySvyryd
AndriySvyrydforce-pushed the copilot/fix-many-to-many-order-by-regression branch from ad45764 to c819f61CompareAugust 17, 2026 19:32
@AndriySvyryd
AndriySvyryd marked this pull request as ready for review August 17, 2026 19:34
@AndriySvyryd
AndriySvyryd requested a review from a team as a code ownerAugust 17, 2026 19:34
CopilotAI reviewed Aug 17, 2026
View reviewed changes

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 50 out of 50 changed files in this pull request and generated no new comments.

Suppressed comments (3)

test/EFCore.Sqlite.FunctionalTests/ManyToManyLoadSqliteTestBase.cs:23

  • Configure the raw-SQL await not to capture a synchronization context, consistent with the repository's async-call requirement.
    test/EFCore.Sqlite.FunctionalTests/ManyToManyLoadSqliteTestBase.cs:28
  • Configure this new asynchronous database call not to capture a synchronization context.
    test/EFCore.Sqlite.FunctionalTests/ManyToManyLoadSqliteTestBase.cs:21
  • Configure the new await not to capture a synchronization context, as required for asynchronous calls in this repository.

This issue also appears in the following locations of the same file:

  • line 23
  • line 26

@AndriySvyrydAndriySvyryd changed the title Preserve discriminating ORDER BY for many-to-many collections[release/11.0-rc1] Preserve discriminating ORDER BY for many-to-many collectionsAug 18, 2026
@AndriySvyryd
Fix SQL Server 2019 include baselines
8632343
Co-authored-by: AndriySvyryd <6539701+AndriySvyryd@users.noreply.github.com>
CopilotAI review requested due to automatic review settings August 18, 2026 00:37
CopilotAI requested a review from AndriySvyrydAugust 18, 2026 00:38
CopilotAI reviewed Aug 18, 2026
View reviewed changes

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 50 out of 50 changed files in this pull request and generated no new comments.

@dotnet-milestone-botdotnet-milestone-botBot added this to the 11.0-rc1 milestone Aug 18, 2026
@AndriySvyryd
AndriySvyryd enabled auto-merge (squash) August 21, 2026 19:37
@AndriySvyryd
AndriySvyryd merged commit c22dd77 into release/11.0-rc1Aug 21, 2026
16 checks passed
@AndriySvyryd
AndriySvyryd deleted the copilot/fix-many-to-many-order-by-regression branch August 21, 2026 19:40
@dotnet-maestrodotnet-maestroBot mentioned this pull request Aug 21, 2026
Merged
wtgodbe added a commit that referenced this pull request Aug 22, 2026
@wtgodbe@dotnet-maestro
@AndriySvyryd
[automated] Merge branch 'release/11.0-rc1' => 'release/11.0' (#38843)
f631bd7
* Merge pull request #38837 from dotnet/darc-release/11.0-rc1-397e9f16-6eec-4c2a-a4d8-e46b06f86e54
[release/11.0-rc1] Source code updates from dotnet/dotnet
* [release/11.0-rc1] Source code updates from dotnet/dotnet (#38841)
Updated Dependencies:
Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Helix.Sdk (Version 11.0.0-beta.26420.118 -> 11.0.0-beta.26421.101)
Microsoft.Extensions.Caching.Memory, Microsoft.Extensions.Configuration, Microsoft.Extensions.Configuration.EnvironmentVariables, Microsoft.Extensions.Configuration.Json, Microsoft.Extensions.DependencyInjection, Microsoft.Extensions.DependencyModel, Microsoft.Extensions.HostFactoryResolver.Sources, Microsoft.Extensions.Logging, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, System.Formats.Asn1, System.Runtime.Caching, System.Text.Encodings.Web, System.Text.Json (Version 11.0.0-rc.1.26420.118 -> 11.0.0-rc.1.26421.101)
[[ commit created by automation ]]
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
* [release/11.0-rc1] Fix query shaping for native primitive collections (#38810)
Co-authored-by: AndriySvyryd <6539701+AndriySvyryd@users.noreply.github.com>
* [release/11.0-rc1] Preserve discriminating ORDER BY for many-to-many collections (#38811)
Fixes#38770
Co-authored-by: AndriySvyryd <6539701+AndriySvyryd@users.noreply.github.com>
---------
Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com>
Co-authored-by: AndriySvyryd <6539701+AndriySvyryd@users.noreply.github.com>
This was referenced Aug 22, 2026
Merged
Merged
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

Copilot code reviewCopilot
Copilot review effort, defaults to Balanced
Applies to this pull request for everyone.Learn more about Copilot code review.
Copilot left review comments
@wtgodbewtgodbewtgodbe approved these changes
@SamMonoRTSamMonoRTSamMonoRT approved these changes
@cincuranetcincuranetAwaiting requested review from cincuranet
@AndriySvyrydAndriySvyrydAwaiting requested review from AndriySvyryd

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

11.0-rc1

Development

Successfully merging this pull request may close these issues.

Many-to-many collection ORDER BY loses its only discriminating column (regression in 11.0)

5 participants

@AndriySvyryd@wtgodbe@SamMonoRT