mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-23 01:25:58 +00:00
Code Issues 25 Releases Wiki Activity

Fixed #23001 -- Fixed mixing defer and annotations

Browse Source
This commit is contained in:
Josh Smeaton 2014-07-11 16:55:49 +10:00 committed by Anssi Kääriäinen
parent 954e7b8aad
commit 5b0375ec3e
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/db/models/query.py
View File

@ -260,7 +260,7 @@ class QuerySet(object):
load_fields.append(field.name)
skip = None
if load_fields and not fill_cache:
if load_fields:
# Some fields have been deferred, so we have to initialize
# via keyword arguments.
skip = set()

25
tests/aggregation/tests.py
View File

@ -88,6 +88,31 @@ class BaseAggregateTestCase(TestCase):
)
self.assertEqual(b.mean_age, 34.5)
def test_annotate_defer(self):
qs = Book.objects.annotate(
page_sum=Sum("pages")).defer('name').filter(pk=1)
rows = [
(1, "159059725", 447, "The Definitive Guide to Django: Web Development Done Right")
]
self.assertQuerysetEqual(
qs.order_by('pk'), rows,
lambda r: (r.id, r.isbn, r.page_sum, r.name)
)
def test_annotate_defer_select_related(self):
qs = Book.objects.select_related('contact').annotate(
page_sum=Sum("pages")).defer('name').filter(pk=1)
rows = [
(1, "159059725", 447, "Adrian Holovaty",
"The Definitive Guide to Django: Web Development Done Right")
]
self.assertQuerysetEqual(
qs.order_by('pk'), rows,
lambda r: (r.id, r.isbn, r.page_sum, r.contact.name, r.name)
)
def test_annotate_m2m(self):
books = Book.objects.filter(rating__lt=4.5).annotate(Avg("authors__age")).order_by("name")
self.assertQuerysetEqual(