diff --git a/django/db/models/fields/related_descriptors.py b/django/db/models/fields/related_descriptors.py index 77ebe798b4..274b8257a3 100644 --- a/django/db/models/fields/related_descriptors.py +++ b/django/db/models/fields/related_descriptors.py @@ -169,8 +169,11 @@ class ForwardManyToOneDescriptor: rel_obj_attr = self.field.get_foreign_related_value instance_attr = self.field.get_local_related_value instances_dict = {instance_attr(inst): inst for inst in instances} - related_fields = self.field.foreign_related_fields remote_field = self.field.remote_field + related_fields = [ + queryset.query.resolve_ref(field.name).target + for field in self.field.foreign_related_fields + ] queryset = queryset.filter( TupleIn( ColPairs( diff --git a/docs/releases/5.2.2.txt b/docs/releases/5.2.2.txt index 1a363ad55d..56efb69bfb 100644 --- a/docs/releases/5.2.2.txt +++ b/docs/releases/5.2.2.txt @@ -43,3 +43,7 @@ Bugfixes ` did not account for media type parameters in ``Accept`` headers, reducing specificity in content negotiation (:ticket:`36411`). + +* Fixed a regression in Django 5.2 that caused a crash when using + ``QuerySet.prefetch_related()`` to prefetch a foreign key with a ``Prefetch`` + queryset for a subclass of the foreign target (:ticket:`36432`). diff --git a/tests/prefetch_related/models.py b/tests/prefetch_related/models.py index e12eabdfb2..405e9bba00 100644 --- a/tests/prefetch_related/models.py +++ b/tests/prefetch_related/models.py @@ -280,6 +280,10 @@ class Employee(models.Model): ordering = ["id"] +class SelfDirectedEmployee(Employee): + pass + + # Ticket #19607 diff --git a/tests/prefetch_related/tests.py b/tests/prefetch_related/tests.py index 49acfdd7c8..bd37ca0ec3 100644 --- a/tests/prefetch_related/tests.py +++ b/tests/prefetch_related/tests.py @@ -37,6 +37,7 @@ from .models import ( Qualification, Reader, Room, + SelfDirectedEmployee, TaggedItem, Teacher, WordEntry, @@ -433,6 +434,18 @@ class PrefetchRelatedTests(TestDataMixin, TestCase): authors[1].active_favorite_authors, [self.author3, self.author4] ) + def test_prefetch_queryset_child_class(self): + employee = SelfDirectedEmployee.objects.create(name="Foo") + employee.boss = employee + employee.save() + with self.assertNumQueries(2): + retrieved_employee = SelfDirectedEmployee.objects.prefetch_related( + Prefetch("boss", SelfDirectedEmployee.objects.all()) + ).get() + with self.assertNumQueries(0): + self.assertEqual(retrieved_employee, employee) + self.assertEqual(retrieved_employee.boss, retrieved_employee) + class RawQuerySetTests(TestDataMixin, TestCase): def test_basic(self):