mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-03-12 18:30:48 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #35426 -- Updated querysets to be a required argument of GenericPrefetch.

Browse Source
This commit is contained in:
sobolevn 2024-05-03 11:40:50 +03:00 committed by Sarah Boyce
parent 32d163e680
commit 9a27c76021
4 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/contrib/contenttypes/prefetch.py
View File

@ -3,7 +3,7 @@ from django.db.models.query import ModelIterable, RawQuerySet
class GenericPrefetch(Prefetch): class GenericPrefetch(Prefetch):
def __init__(self, lookup, querysets=None, to_attr=None): def __init__(self, lookup, querysets, to_attr=None):
for queryset in querysets: for queryset in querysets:
if queryset is not None and ( if queryset is not None and (
isinstance(queryset, RawQuerySet) isinstance(queryset, RawQuerySet)

2
docs/ref/contrib/contenttypes.txt
View File

@ -603,7 +603,7 @@ information.
.. versionadded:: 5.0 .. versionadded:: 5.0
.. class:: GenericPrefetch(lookup, querysets=None, to_attr=None) .. class:: GenericPrefetch(lookup, querysets, to_attr=None)
This lookup is similar to ``Prefetch()`` and it should only be used on This lookup is similar to ``Prefetch()`` and it should only be used on
``GenericForeignKey``. The ``querysets`` argument accepts a list of querysets, ``GenericForeignKey``. The ``querysets`` argument accepts a list of querysets,

3
docs/releases/5.0.5.txt
View File

@ -30,3 +30,6 @@ Bugfixes
* Fixed a bug in Django 5.0 that caused a migration crash when altering a * Fixed a bug in Django 5.0 that caused a migration crash when altering a
``GeneratedField`` referencing a renamed field (:ticket:`35422`). ``GeneratedField`` referencing a renamed field (:ticket:`35422`).
* Fixed a bug in Django 5.0 where the ``querysets`` argument of
``GenericPrefetch`` was not required (:ticket:`35426`).

8
tests/contenttypes_tests/test_models.py
View File

@ -331,6 +331,14 @@ class ContentTypesMultidbTests(TestCase):
class GenericPrefetchTests(TestCase): class GenericPrefetchTests(TestCase):
def test_querysets_required(self):
msg = (
"GenericPrefetch.__init__() missing 1 required "
"positional argument: 'querysets'"
)
with self.assertRaisesMessage(TypeError, msg):
GenericPrefetch("question")
def test_values_queryset(self): def test_values_queryset(self):
msg = "Prefetch querysets cannot use raw(), values(), and values_list()." msg = "Prefetch querysets cannot use raw(), values(), and values_list()."
with self.assertRaisesMessage(ValueError, msg): with self.assertRaisesMessage(ValueError, msg):