Ticket #15305: geoq_agg.patch

django/contrib/gis/db/models/sql/compiler.py

@@ -171 +171 @@
         """
         values = []
         aliases = self.query.extra_select.keys()
-        if self.query.aggregates:
-            # If we have an aggregate annotation, must extend the aliases
-            # so their corresponding row values are included.
-            aliases.extend([None for i in xrange(len(self.query.aggregates))])
 
         # Have to set a starting row number offset that is used for
         # determining the correct starting row index -- needed for
@@ -191 +187 @@
                                self.connection)
                   for v, a in izip(row[rn_offset:index_start], aliases)]
         if self.connection.ops.oracle or getattr(self.query, 'geo_values', False):
+            aggregates_start = index_start + len(fields)
             # We resolve the rest of the columns if we're on Oracle or if
             # the `geo_values` attribute is defined.
-            for value, field in map(None, row[index_start:], fields):
+            for value, field in map(None, row[index_start:aggregates_start], fields):
                 values.append(self.query.convert_values(value, field, connection=self.connection))
+            # Aggregates will be resolved by the caller via resolve_aggregate
+            values.extend(row[aggregates_start:])
         else:
             values.extend(row[index_start:])
         return tuple(values)

django/contrib/gis/tests/relatedapp/tests.py

@@ -240 +240 @@
         # Count annotation should be 2 for the Dallas location now.
         loc = Location.objects.annotate(num_cities=Count('city')).get(id=dallas.location.id)
         self.assertEqual(2, loc.num_cities)
+        loc_q = Location.objects.annotate(num_cities=Count('city'))
+        self.assertEqual(5, len(loc_q))
+        self.assertTrue(loc_q[0].num_cities > 0)
+        loc_qv = Location.objects.all().values('id').annotate(num_cities=Count('city'))
+        self.assertEqual(5, len(loc_qv))
+        self.assertTrue(loc_qv[0]['num_cities'] > 0)
 
     def test12b_count(self):
         "Testing `Count` aggregate use with the `GeoManager` on non geo-fields. See #11087."