Handle repeated field lookups in calls to values_list #1441
Conversation
This file contains 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
sobolevn
reviewed
Apr 15, 2023
| content: | | ||
| from django.db import models | ||
| class MyUser(models.Model): | ||
| name = models.CharField(max_length=100) |
There was a problem hiding this comment.
Can we please have another field for this test? Something like age = models.IntegerField
There was a problem hiding this comment.
Done - good suggestion!
|
|
||
| # Values tuples can have the same field repeated | ||
| values_tuple = MyUser.objects.values_list('name', 'name').get() | ||
| reveal_type(values_tuple) # N: Revealed type is "Tuple[builtins.str, builtins.str]" |
There was a problem hiding this comment.
And let's use age here as well to be sure that this is not just a single type that repeats itself :)
There was a problem hiding this comment.
Done - good suggestion!. I've doubled-checked that without the fix the new version of the test does fail.
Prior to this change, if checked code was calling the values_list method
on a queryset with a repeated field lookup, for example
Model.objects.values_list("foo", "foo"), then we would fail to type the
resulting tuple correctly. The second argument would be untyped, and the
resulting tuple would have fewer fields than Django would actually give
it.
This problem only affects unnamed, non-flat tuples, as Django will error
if a repeating field lookups is attempted for these other variants.
This change ensures that when we type an unnamed tuple, we refer back to
the original field lookups when passing in the resolved values. We also
add a test to explain the issue, and prevent regressions.
leamingrad
force-pushed
the
handle-repeated-values-list-entries
branch
from
ba74bb3 to
f2b30cb
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.
Prior to this change, if checked code was calling the values_list method
on a queryset with a repeated field lookup, for example
Model.objects.values_list("foo", "foo"), then we would fail to type the
resulting tuple correctly. The second argument would be untyped, and the
resulting tuple would have fewer fields than Django would actually give
it.
This problem only affects unnamed, non-flat tuples, as Django will error
if a repeating field lookups is attempted for these other variants.
This change ensures that when we type an unnamed tuple, we refer back to
the original field lookups when passing in the resolved values. We also
add a test to explain the issue, and prevent regressions.
Related issues
I could not find a related issue for this, but I can raise one if that
would be helpful.