mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-01-03 06:55:47 +00:00
Code Issues 30 Releases Wiki Activity

Refs #20577 -- Deferred filtering of prefetched related querysets by reverse m2o relation.

Browse Source
This commit is contained in:
Bob Renwick 2020-10-06 10:04:11 +00:00 committed by Mariusz Felisiak
parent 999cddd58d
commit 036f160733
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
django/db/models/fields/related_descriptors.py
View File

@ -581,6 +581,7 @@ def create_reverse_many_to_one_manager(superclass, rel):
queryset._add_hints(instance=self.instance) queryset._add_hints(instance=self.instance)
if self._db: if self._db:
queryset = queryset.using(self._db) queryset = queryset.using(self._db)
queryset._defer_next_filter = True
queryset = queryset.filter(**self.core_filters) queryset = queryset.filter(**self.core_filters)
for field in self.field.foreign_related_fields: for field in self.field.foreign_related_fields:
val = getattr(self.instance, field.attname) val = getattr(self.instance, field.attname)

21
tests/prefetch_related/tests.py
View File

@ -294,17 +294,20 @@ class PrefetchRelatedTests(TestDataMixin, TestCase):
def test_filter_deferred(self): def test_filter_deferred(self):
""" """
Related filtering of prefetched querysets is deferred until necessary. Related filtering of prefetched querysets is deferred on m2m and
reverse m2o relations until necessary.
""" """
add_q = Query.add_q add_q = Query.add_q
with mock.patch.object( for relation in ['authors', 'first_time_authors']:
Query, with self.subTest(relation=relation):
'add_q', with mock.patch.object(
autospec=True, Query,
side_effect=lambda self, q: add_q(self, q), 'add_q',
) as add_q_mock: autospec=True,
list(Book.objects.prefetch_related('authors')) side_effect=lambda self, q: add_q(self, q),
self.assertEqual(add_q_mock.call_count, 1) ) as add_q_mock:
list(Book.objects.prefetch_related(relation))
self.assertEqual(add_q_mock.call_count, 1)
class RawQuerySetTests(TestDataMixin, TestCase): class RawQuerySetTests(TestDataMixin, TestCase):