Ticket #15523: deffer_bug.diff

django/db/models/sql/compiler.py

@@ -156 +156 @@
                 if isinstance(col, (list, tuple)):
                     alias, column = col
                     table = self.query.alias_map[alias][TABLE_NAME]
-                    if table in only_load and col not in only_load[table]:
+                    if table in only_load and column not in only_load[table]:
                         continue
                     r = '%s.%s' % (qn(alias), qn(column))
                     if with_aliases:

django/db/models/query.py

@@ -264 +264 @@
                     # Model wasn't explicitly listed in the only_load table
                     # Therefore, we need to load all fields from this model
                     load_fields.append(field.name)
+            # fix aggregate start based on the new number of fields
+            aggregate_start = index_start + len(load_fields)
 
         skip = None
         if load_fields and not fill_cache:

tests/regressiontests/defer_regress/tests.py

@@ -1 +1 @@
 from django.test import TestCase
-from models import ResolveThis
+from django.db.models import Count
+from models import ResolveThis, Child, Leaf
 
 class DeferRegressionTest(TestCase):
     def test_resolve_columns(self):
@@ -7 +8 @@
         qs = ResolveThis.objects.defer('num')
         self.assertEqual(1, qs.count())
         self.assertEqual('Foobar', qs[0].name)
+    def test_annotations(self):
+        ch = Child.objects.create(name='first', value=10)
+        l = Leaf.objects.create(name='leaf', child = ch)
+        qset = Leaf.objects.all().annotate(max_cnt = Count('child')).only('id', 'name')
+        self.assertTrue(len(qset) == 1)
+        self.assertTrue(qset[0].name == u'leaf')
+        self.assertTrue(qset[0].id == 1)
+        self.assertTrue(qset[0].max_cnt == 1)