innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixed #32704 -- Fixed list of deferred fields when chaining QuerySet.defer() after only().

This commit is contained in:
David Wobrock 2021-07-19 23:02:52 +02:00 committed by Mariusz Felisiak
parent 96706d76cd
commit fd999318ad
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
django/db/models/sql/query.py
View File

@ -2086,7 +2086,12 @@ class Query(BaseExpression):
self.deferred_loading = existing.union(field_names), True self.deferred_loading = existing.union(field_names), True
else: else:
# Remove names from the set of any existing "immediate load" names. # Remove names from the set of any existing "immediate load" names.
self.deferred_loading = existing.difference(field_names), False if new_existing := existing.difference(field_names):
self.deferred_loading = new_existing, False
else:
self.clear_deferred_loading()
if new_only := set(field_names).difference(existing):
self.deferred_loading = new_only, True
def add_immediate_loading(self, field_names): def add_immediate_loading(self, field_names):
""" """

2
tests/defer/tests.py
View File

@ -52,6 +52,8 @@ class DeferTests(AssertionMixin, TestCase):
self.assert_delayed(qs.defer('name').only('name').only('value')[0], 2) self.assert_delayed(qs.defer('name').only('name').only('value')[0], 2)
self.assert_delayed(qs.defer("name").only("value")[0], 2) self.assert_delayed(qs.defer("name").only("value")[0], 2)
self.assert_delayed(qs.only("name").defer("value")[0], 2) self.assert_delayed(qs.only("name").defer("value")[0], 2)
self.assert_delayed(qs.only('name').defer('name').defer('value')[0], 1)
self.assert_delayed(qs.only('name').defer('name', 'value')[0], 1)
def test_defer_only_clear(self): def test_defer_only_clear(self):
qs = Primary.objects.all() qs = Primary.objects.all()