Merge pull request lionheart#146 from benmehlman/issue_138

dlo · web-flow · commit eedefecd8b91 · 2017-12-22T15:02:35.000-06:00
In _fix_aggregates, use annotation_select (newer) if available else a…
diff --git a/django_pyodbc/compiler.py b/django_pyodbc/compiler.py
@@ -177,24 +177,31 @@ def _fix_aggregates(self):
         match behavior of other django backends, it needs to not drop remainders.
         E.g. AVG([1, 2]) needs to yield 1.5, not 1
         """
-        for alias, aggregate in self.query.aggregate_select.items():
+        try:
+            # for django 1.10 and up (works starting in 1.8 so I am told)
+            select = self.query.annotation_select
+        except AttributeError: 
+            # older
+            select = self.query.aggregate_select
+
+        for alias, aggregate in select.items():
             if not hasattr(aggregate, 'sql_function'):
                 continue
             if aggregate.sql_function == 'AVG':# and self.connection.cast_avg_to_float:
                 # Embed the CAST in the template on this query to
                 # maintain multi-db support.
-                self.query.aggregate_select[alias].sql_template = \
+                select[alias].sql_template = \
                     '%(function)s(CAST(%(field)s AS FLOAT))'
             # translate StdDev function names
             elif aggregate.sql_function == 'STDDEV_SAMP':
-                self.query.aggregate_select[alias].sql_function = 'STDEV'
+                select[alias].sql_function = 'STDEV'
             elif aggregate.sql_function == 'STDDEV_POP':
-                self.query.aggregate_select[alias].sql_function = 'STDEVP'
+                select[alias].sql_function = 'STDEVP'
             # translate Variance function names
             elif aggregate.sql_function == 'VAR_SAMP':
-                self.query.aggregate_select[alias].sql_function = 'VAR'
+                select[alias].sql_function = 'VAR'
             elif aggregate.sql_function == 'VAR_POP':
-                self.query.aggregate_select[alias].sql_function = 'VARP'
+                select[alias].sql_function = 'VARP'
 
     def as_sql(self, with_limits=True, with_col_aliases=False):
         # Django #12192 - Don't execute any DB query when QS slicing results in limit 0
