Ticket #11890: 11980_defer_plus_annotate_fix.diff

django/db/models/sql/compiler.py

@@ -165 +165 @@
                 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

@@ -228 +228 @@
             fields = self.model._meta.fields
             pk_idx = self.model._meta.pk_index()
 
-        index_start = len(extra_select)
-        aggregate_start = index_start + len(self.model._meta.fields)
-
         load_fields = []
         # If only/defer clauses have been specified,
         # build the list of fields that are to be loaded.
@@ -249 +246 @@
                     # 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)
+        
+        index_start = len(extra_select)
+        # Compute the aggregate value index in result rows
+        if only_load and self.model in only_load:
+            # Only the ones not deferred
+            aggregate_start = index_start + len(only_load[self.model])
+        else:
+            # All fields
+            aggregate_start = index_start + len(self.model._meta.fields)
 
         skip = None
         if load_fields and not fill_cache:
@@ -264 +270 @@
             model_cls = deferred_class_factory(self.model, skip)
 
         compiler = self.query.get_compiler(using=self.db)
+        
         for row in compiler.results_iter():
             if fill_cache:
                 obj, _ = get_cached_row(self.model, row,

tests/regressiontests/defer_regress/models.py

@@ -144 +144 @@
 >>> sorted(get_models(models.get_app('defer_regress'), include_deferred=True), key=lambda obj: obj._meta.object_name)
 [<class 'regressiontests.defer_regress.models.Child'>, <class 'regressiontests.defer_regress.models.Item'>, <class 'regressiontests.defer_regress.models.Item_Deferred_name'>, <class 'regressiontests.defer_regress.models.Item_Deferred_name_other_value_text'>, <class 'regressiontests.defer_regress.models.Item_Deferred_other_value_text_value'>, <class 'regressiontests.defer_regress.models.Item_Deferred_text_value'>, <class 'regressiontests.defer_regress.models.Leaf'>, <class 'regressiontests.defer_regress.models.Leaf_Deferred_name_value'>, <class 'regressiontests.defer_regress.models.Leaf_Deferred_second_child_value'>, <class 'regressiontests.defer_regress.models.Leaf_Deferred_value'>, <class 'regressiontests.defer_regress.models.RelatedItem'>, <class 'regressiontests.defer_regress.models.RelatedItem_Deferred_item_id'>, <class 'regressiontests.defer_regress.models.ResolveThis'>, <class 'regressiontests.defer_regress.models.ResolveThis_Deferred_num'>]
 
+# Regression for #11890
+>>> from django.db.models import Count, Avg
+>>> Item.objects.all().delete()
+>>> RelatedItem.objects.all().delete()
+>>> i = Item.objects.create(name='Bug #11890', value=1)
+>>> RelatedItem.objects.create(item=i)
+<RelatedItem: RelatedItem object>
+>>> RelatedItem.objects.create(item=i)
+<RelatedItem: RelatedItem object>
+>>> counted = Item.objects.only('name').annotate(Count('relateditem'))
+>>> counted.count()
+1
+>>> counted[0].relateditem__count
+2
+
+# Adding up some spice since result row index offset is affected by extra selections
+>>> counted = Item.objects.extra(select={'past': 'now()'}).annotate(rel_count=Count('relateditem'), avg_id=Avg('id')).extra(select={'sometime': 'now()'})
+>>> counted.count()
+1
+>>> counted[0].rel_count
+2
 """
 }