VimPlug/django-stubs
1
0
Fork 0
mirror of https://github.com/davidhalter/django-stubs.git synced 2025-12-14 07:47:09 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix type for related fields in values_list querysets (#955)

Browse Source 
When fetching a related field in a values_list queryset Django will
return the object primary key, not model instances as was previously
what the mypy plugin assumed.
This commit is contained in:
Sigurd Ljødal
2022-05-12 08:14:17 +02:00
committed by GitHub
parent 724442b241
commit ccef6779ad
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mypy_django_plugin/django/context.py
View File

@@ -306,7 +306,7 @@ class DjangoContext:
if related_model_cls is None: if related_model_cls is None:
return AnyType(TypeOfAny.from_error) return AnyType(TypeOfAny.from_error)
if method == "values": if method in ("values", "values_list"):
primary_key_field = self.get_primary_key_field(related_model_cls) primary_key_field = self.get_primary_key_field(related_model_cls)
return self.get_field_get_type(api, primary_key_field, method=method) return self.get_field_get_type(api, primary_key_field, method=method)

5
tests/typecheck/managers/querysets/test_values_list.yml
View File

@@ -53,9 +53,9 @@
main: | main: |
from myapp.models import Post, Blog from myapp.models import Post, Blog
values_tuple = Post.objects.values_list('blog', 'blog__num_posts', 'blog__publisher', 'blog__publisher__name').get() values_tuple = Post.objects.values_list('blog', 'blog__num_posts', 'blog__publisher', 'blog__publisher__name').get()
reveal_type(values_tuple[0]) # N: Revealed type is "myapp.models.Blog" reveal_type(values_tuple[0]) # N: Revealed type is "builtins.int"
reveal_type(values_tuple[1]) # N: Revealed type is "builtins.int" reveal_type(values_tuple[1]) # N: Revealed type is "builtins.int"
reveal_type(values_tuple[2]) # N: Revealed type is "myapp.models.Publisher" reveal_type(values_tuple[2]) # N: Revealed type is "builtins.int"
reveal_type(values_tuple[3]) # N: Revealed type is "builtins.str" reveal_type(values_tuple[3]) # N: Revealed type is "builtins.str"
reverse_fields_list = Blog.objects.values_list('post__text').get() reverse_fields_list = Blog.objects.values_list('post__text').get()
@@ -215,6 +215,7 @@
main: | main: |
from myapp.models import Blog, Publisher from myapp.models import Blog, Publisher
reveal_type(Blog.objects.values_list('id', flat=True)) # N: Revealed type is "django.db.models.query._QuerySet[myapp.models.Blog, builtins.int]" reveal_type(Blog.objects.values_list('id', flat=True)) # N: Revealed type is "django.db.models.query._QuerySet[myapp.models.Blog, builtins.int]"
reveal_type(Blog.objects.values_list('publisher', flat=True)) # N: Revealed type is "django.db.models.query._QuerySet[myapp.models.Blog, builtins.int]"
reveal_type(Blog.objects.values_list('publisher_id', flat=True)) # N: Revealed type is "django.db.models.query._QuerySet[myapp.models.Blog, builtins.int]" reveal_type(Blog.objects.values_list('publisher_id', flat=True)) # N: Revealed type is "django.db.models.query._QuerySet[myapp.models.Blog, builtins.int]"
# is Iterable[int] # is Iterable[int]
reveal_type(list(Blog.objects.values_list('id', flat=True))) # N: Revealed type is "builtins.list[builtins.int]" reveal_type(list(Blog.objects.values_list('id', flat=True))) # N: Revealed type is "builtins.list[builtins.int]"