Fixed #35442 -- Prevented N+1 queries in RelatedManager with only(). #20495
+24
−12
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.
ticket-35442
Branch description
This PR prevents N+1 queries when iterating over a
RelatedManager queryset that uses.only()to exclude the foreign key field.Previously,
ModelIterablewould attempt to optimize the relationship population by accessing the foreign key on the child object. If that key was deferred (via .only()), accessing it triggered an immediate SQL query for every row.The fix modifies
ModelIterableto checkobj.__dict__ first. If the foreign key attributes are missing (deferred), the optimization is skipped, preserving the lazy loading behavior requested by the user.Tests:
test_only_related_manager_optimizationindefer.teststo verify query count is 1 (previously N+1).defer.tests.DeferTests.test_onlyto assert the correct number of deferred fields (3 instead of 2), reflecting that the foreign key is now correctly deferred.Checklist
mainbranch.