Fixed #36431 -- Returned tuples for multi-column ForeignObject in values()/values_list().
#19771
+33
−4
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
ForeignObject in values()/values_list().
charettes
reviewed
Aug 25, 2025
ea5d607 to
010dd4e
Compare
charettes
reviewed
Aug 25, 2025
charettes
reviewed
Aug 25, 2025
010dd4e to
2a50a5d
Compare
sarahboyce
reviewed
Aug 28, 2025
There was a problem hiding this comment.
Thank you @JaeHyuckSa
I made this a release blocker for 5.2, could you rebase main and add a release note to 5.2.6. Something like
* Fixed a bug where using ``QuerySet.values()`` or ``values_list()`` with a
``ForeignObject`` composed of multiple fields returned incorrect results
instead of tuples of the referenced fields (:ticket:`36431`).
|
In good news, this PR passes this test case if I comment out the ValueError raising the message "The QuerySet value for the 'in' lookup must have 2 selected fields..." given that diff --git a/tests/composite_pk/test_filter.py b/tests/composite_pk/test_filter.py
index d7ecfbec11..c4b393d6ea 100644
--- a/tests/composite_pk/test_filter.py
+++ b/tests/composite_pk/test_filter.py
@@ -460,6 +460,11 @@ class CompositePKFilterTests(TestCase):
queryset = User.objects.filter(comments__in=subquery)
self.assertSequenceEqual(queryset, (self.user_2,))
+ def test_filter_comments_by_users_subquery(self):
+ subquery = Comment.objects.filter(id=3).values("user")
+ queryset = Comment.objects.filter(user__in=subquery)
+ self.assertSequenceEqual(queryset, (self.comment_3,))
+
def test_cannot_cast_pk(self):
msg = "Cast expression does not support composite primary keys."
with self.assertRaisesMessage(ValueError, msg):Opened ticket-36584 for this. |
2a50a5d to
076cf81
Compare
@jacobtylerwalls Interesting — I’ll pick this up as a follow-up to the current PR. Thank you very much for flagging it. |
…ues()/values_list(). Thanks Jacob Walls and Simon Charette for tests. Signed-off-by: SaJH <wogur981208@gmail.com>
076cf81 to
26ec033
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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-36431
Branch description
Thanks to @jacobtylerwalls and @charettes for the tests.
Checklist
mainbranch.