Fixed #36432 -- Fixed a prefetch_related crash on related target subclass queryset. #19523
+25
−1
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
charettes
commented
Jun 4, 2025
Comment on lines
+173
to
+176
There was a problem hiding this comment.
We assumed the foreign_related_fields would always be resolved as they are local to the foreign target but when a target subclass is provided (target being Employee and target subclass being SelfDirectedEmployee) it's not necessarily the case (as related fields might be inherited and thus not local) so we must ensure they are resolved so the parent tables are JOIN'ed.
In a world where we truly support composite fields and would have the equivalent of F(*fields) we could simply pass it to TupleIn so it gets resolved explicitly. e.g.
TupleIn(
F(*(field.name for field in self.field.foreign_related_fields)),
list(instances_dict)
)…lass queryset. Regression in 626d77e. Refs #36116. Thanks Cornelis Poppema for the excellent report.
sarahboyce
approved these changes
Jun 4, 2025
There was a problem hiding this comment.
Thank you for picking this up and resolving so quickly @charettes
This looks good to me ⭐
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.
Trac ticket number
ticket-36432
Branch description
Regression in 626d77e.
Refs ticket-36116.
Thanks @cpoppema for the excellent report.