Skip to content

Preserve identifiers across to-one joins - #38771

Open
XX-Q wants to merge 2 commits into
dotnet:mainfrom
XX-Q:codex/preserve-identifiers-to-one-join-38660
Open

Preserve identifiers across to-one joins#38771
XX-Q wants to merge 2 commits into
dotnet:mainfrom
XX-Q:codex/preserve-identifiers-to-one-join-38660

Conversation

@XX-Q

@XX-Q XX-Q commented Aug 10, 2026

Copy link
Copy Markdown

Summary

  • keep outer collection identifiers when a to-one join has a keyless inner source
  • add regression coverage for sync/async single-query and split-query materialization

When the inner side of a cardinality-preserving join has no identifiers, clearing the outer identifiers loses the collection element identity. Single-query materialization then collapses rows, while split-query materialization indexes an empty comparer list. A to-one join cannot increase cardinality, so the existing outer identifiers remain sufficient.

Fixes #38660

Validation

  • Regression test with the source fix reverted: 4/4 cases fail with the reported missing-element and ArgumentOutOfRangeException behaviors
  • Focused regression test with the fix: 4 passed
  • AdHocQuerySplittingQuerySqliteTest: 21 passed
  • EFCore.Relational.Tests: 1,480 passed, 1 skipped
  • Full EFCore.Sqlite.FunctionalTests: 37,917 passed, 283 skipped
  • ./build.sh --build: passed with 0 warnings and 0 errors
  • Original standalone reproduction: all single/split and keyed/keyless comparison cases return both elements after the fix

SQL Server functional tests were not run locally because no SQL Server instance is available; the shared relational test will exercise the SQL Server provider in CI.

Checklist

  • I have read the contributing guidelines and walkthrough
  • I posted the implementation plan and validation evidence on the issue; the fix follows the maintainer-confirmed direction
  • The code builds and tests pass locally
  • The commit message follows the repository format and includes Fixes #38660
  • Regression tests have been added
  • The code follows existing patterns and style

AI assistance

OpenAI Codex assisted with implementation and test execution. The final diff was reviewed against the maintainer-provided root cause and validated with the commands above.

Keep the outer collection identifiers when a to-one join has a keyless inner source, and cover single/split sync/async materialization.\n\nFixes dotnet#38660

Signed-off-by: XX-Q <52606527+XX-Q@users.noreply.github.com>
@XX-Q
XX-Q requested a review from a team as a code owner August 10, 2026 01:24
@AndriySvyryd AndriySvyryd self-assigned this Aug 10, 2026
@AndriySvyryd
AndriySvyryd requested a lite review from Copilot August 10, 2026 16:40
@dotnet-policy-service

Copy link
Copy Markdown
Contributor

@XX-Q please read the following Contributor License Agreement(CLA). If you agree with the CLA, please reply with the following information.

@dotnet-policy-service agree [company="{your company}"]

Options:

  • (default - no company specified) I have sole ownership of intellectual property rights to my Submissions and I am not making Submissions in the course of work for my employer.
@dotnet-policy-service agree
  • (when company given) I am making Submissions in the course of work for my employer (or my employer has intellectual property rights in my Submissions by contract or applicable law). I have permission from my employer to make Submissions and enter into this Agreement on behalf of my employer. By signing below, the defined term “You” includes me and my employer.
@dotnet-policy-service agree company="Microsoft"
Contributor License Agreement

Contribution License Agreement

This Contribution License Agreement ( “Agreement” ) is agreed to by the party signing below ( “You” ),
and conveys certain license rights to the .NET Foundation ( “.NET Foundation” ) for Your contributions to
.NET Foundation open source projects. This Agreement is effective as of the latest signature date below.

1. Definitions.

“Code” means the computer software code, whether in human-readable or machine-executable form,
that is delivered by You to .NET Foundation under this Agreement.

“Project” means any of the projects owned or managed by .NET Foundation and offered under a license
approved by the Open Source Initiative (www.opensource.org).

“Submit” is the act of uploading, submitting, transmitting, or distributing code or other content to any
Project, including but not limited to communication on electronic mailing lists, source code control
systems, and issue tracking systems that are managed by, or on behalf of, the Project for the purpose of
discussing and improving that Project, but excluding communication that is conspicuously marked or
otherwise designated in writing by You as “Not a Submission.”

“Submission” means the Code and any other copyrightable material Submitted by You, including any
associated comments and documentation.

2. Your Submission. You must agree to the terms of this Agreement before making a Submission to any
Project. This Agreement covers any and all Submissions that You, now or in the future (except as
described in Section 4 below), Submit to any Project.

3. Originality of Work. You represent that each of Your Submissions is entirely Your
original work. Should You wish to Submit materials that are not Your original work,
You may Submit them separately to the Project if You (a) retain all copyright and
license information that was in the materials as you received them, (b) in the
description accompanying your Submission, include the phrase "Submission
containing materials of a third party:" followed by the names of the third party and any
licenses or other restrictions of which You are aware, and (c) follow any other
instructions in the Project's written guidelines concerning Submissions.

4. Your Employer. References to “employer” in this Agreement include Your employer or anyone else
for whom You are acting in making Your Submission, e.g. as a contractor, vendor, or agent. If Your
Submission is made in the course of Your work for an employer or Your employer has intellectual
property rights in Your Submission by contract or applicable law, You must secure permission from Your
employer to make the Submission before signing this Agreement. In that case, the term “You” in this
Agreement will refer to You and the employer collectively. If You change employers in the future and
desire to Submit additional Submissions for the new employer, then You agree to sign a new Agreement
and secure permission from the new employer before Submitting those Submissions.

5. Licenses.

a. Copyright License. You grant .NET Foundation, and those who receive the Submission directly
or indirectly from .NET Foundation, a perpetual, worldwide, non-exclusive, royalty-free, irrevocable
license in the Submission to reproduce, prepare derivative works of, publicly display, publicly perform,
and distribute the Submission and such derivative works, and to sublicense any or all of the foregoing
rights to third parties.

b. Patent License. You grant .NET Foundation, and those who receive the Submission directly or
indirectly from .NET Foundation, a perpetual, worldwide, non-exclusive, royalty-free, irrevocable license
under Your patent claims that are necessarily infringed by the Submission or the combination of the
Submission with the Project to which it was Submitted to make, have made, use, offer to sell, sell and
import or otherwise dispose of the Submission alone or with the Project.

c. Other Rights Reserved. Each party reserves all rights not expressly granted in this Agreement.
No additional licenses or rights whatsoever (including, without limitation, any implied licenses) are
granted by implication, exhaustion, estoppel or otherwise.

6. Representations and Warranties. You represent that You are legally entitled to grant the above
licenses. You represent that each of Your Submissions is entirely Your original work (except as You may
have disclosed under Section 3 ). You represent that You have secured permission from Your employer to
make the Submission in cases where Your Submission is made in the course of Your work for Your
employer or Your employer has intellectual property rights in Your Submission by contract or applicable
law. If You are signing this Agreement on behalf of Your employer, You represent and warrant that You
have the necessary authority to bind the listed employer to the obligations contained in this Agreement.
You are not expected to provide support for Your Submission, unless You choose to do so. UNLESS
REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING, AND EXCEPT FOR THE WARRANTIES
EXPRESSLY STATED IN SECTIONS 3, 4, AND 6 , THE SUBMISSION PROVIDED UNDER THIS AGREEMENT IS
PROVIDED WITHOUT WARRANTY OF ANY KIND, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY OF
NONINFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE.

7. Notice to .NET Foundation. You agree to notify .NET Foundation in writing of any facts or
circumstances of which You later become aware that would make Your representations in this
Agreement inaccurate in any respect.

8. Information about Submissions. You agree that contributions to Projects and information about
contributions may be maintained indefinitely and disclosed publicly, including Your name and other
information that You submit with Your Submission.

9. Governing Law/Jurisdiction. This Agreement is governed by the laws of the State of Washington, and
the parties consent to exclusive jurisdiction and venue in the federal courts sitting in King County,
Washington, unless no federal subject matter jurisdiction exists, in which case the parties consent to
exclusive jurisdiction and venue in the Superior Court of King County, Washington. The parties waive all
defenses of lack of personal jurisdiction and forum non-conveniens.

10. Entire Agreement/Assignment. This Agreement is the entire agreement between the parties, and
supersedes any and all prior agreements, understandings or communications, written or oral, between
the parties relating to the subject matter hereof. This Agreement may be assigned by .NET Foundation.

.NET Foundation dedicates this Contribution License Agreement to the public domain according to the Creative Commons CC0 1.

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Pull request overview

Fixes a relational query materialization bug where a cardinality-preserving (to-one) join with a keyless inner source could incorrectly clear outer collection identifiers, leading to silently missing collection elements in single-query mode and an ArgumentOutOfRangeException in split-query mode. The change updates identifier handling during join composition and adds a regression test covering sync/async and single/split query execution.

Changes:

  • Adjust join identifier propagation logic in SelectExpression.AddJoin to preserve outer identifiers for to-one joins even when the inner side has no identifiers.
  • Add a new regression test reproducing the keyless set-operation inner source scenario and validating correct collection materialization across sync/async and single/split query modes.

Reviewed changes

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

File Description
test/EFCore.Relational.Specification.Tests/Query/AdHocQuerySplittingQueryTestBase.cs Adds regression coverage for the keyless-inner to-one join scenario across sync/async and single/split query materialization.
src/EFCore.Relational/Query/SqlExpressions/SelectExpression.cs Updates join identifier clearing logic to avoid dropping outer collection identifiers for to-one joins with keyless inner sources.

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

protected override void OnModelCreating(ModelBuilder modelBuilder)
{
modelBuilder.Entity<OrderLine>().HasKey(l => new { l.OrderId, l.LineNo });
modelBuilder.Entity<Order>().HasMany(o => o.Lines).WithOne().HasForeignKey(l => l.OrderId);

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

You need to disable value generation for Order.Id

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Fixed in 0f8a433: Order.Id now uses ValueGeneratedNever(), and TaxA/TaxB no longer seed explicit identity values. The focused 4-case regression test and the full 21-test SQLite class both pass locally.

Signed-off-by: XX-Q <52606527+XX-Q@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

3 participants