Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FIX Ensure eagerLoading don't load has_one twice (#11170) #11185

Merged
merged 1 commit into from Apr 18, 2024

Conversation

beerbohmdo
Copy link
Contributor

@beerbohmdo beerbohmdo commented Mar 26, 2024

Description

Currently if you call eagerLoad() to a list with repeating has_one objects only the last one will be eager loaded, the other will trigger a new database query.

This should fix this issue.

Manual testing steps

Issues

Pull request checklist

  • The target branch is correct
  • All commits are relevant to the purpose of the PR (e.g. no debug statements, unrelated refactoring, or arbitrary linting)
    • Small amounts of additional linting are usually okay, but if it makes it hard to concentrate on the relevant changes, ask for the unrelated changes to be reverted, and submitted as a separate PR.
  • The commit messages follow our commit message guidelines
  • The PR follows our contribution guidelines
  • Code changes follow our coding conventions
  • This change is covered with tests (or tests aren't necessary for this change)
  • Any relevant User Help/Developer documentation is updated; for impactful changes, information is added to the changelog for the intended release
  • CI is green

@GuySartorelli
Copy link
Member

Retargetted to 5.2 and rebased.

Copy link
Member

@GuySartorelli GuySartorelli left a comment

Choose a reason for hiding this comment

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

LGTM, confirmed to fix the problem locally.
Thank you for taking the time to report and fix this, especially with unit testing.

I'll merge once CI has gone green.

@GuySartorelli GuySartorelli merged commit cfeb678 into silverstripe:5.2 Apr 18, 2024
15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants