Reuse order by from pre_sql_setup.

Author: WaVEV

django_mongodb/compiler.py

@@ -92,11 +92,10 @@ def _prepare_annotations_for_group_pipeline(self):
         group.update(having_group)
         return group, replacements
 
-    def _get_group_id_expressions(self):
+    def _get_group_id_expressions(self, order_by):
         """Generate group ID expressions for the aggregation pipeline."""
         group_expressions = set()
         replacements = {}
-        order_by = self.get_order_by()
         for expr, (_, _, is_ref) in order_by:
             if not is_ref:
                 group_expressions |= set(expr.get_group_by_cols())
@@ -170,14 +169,14 @@ def _build_group_pipeline(self, ids, group):
         return pipeline
 
     def pre_sql_setup(self, with_col_aliases=False):
-        pre_setup = super().pre_sql_setup(with_col_aliases=with_col_aliases)
+        extra_select, order_by, group_by = super().pre_sql_setup(with_col_aliases=with_col_aliases)
         group, all_replacements = self._prepare_annotations_for_group_pipeline()
 
         # The query.group_by is either None (no GROUP BY at all), True
         # (group by select fields), or a list of expressions to be added
         # to the group by.
         if group or self.query.group_by:
-            ids, replacements = self._get_group_id_expressions()
+            ids, replacements = self._get_group_id_expressions(order_by)
             all_replacements.update(replacements)
             pipeline = self._build_group_pipeline(ids, group)
             if self.having:
@@ -197,7 +196,7 @@ def pre_sql_setup(self, with_col_aliases=False):
             for target, expr in self.query.annotation_select.items()
         }
 
-        return pre_setup
+        return extra_select, order_by, group_by
 
     def execute_sql(
         self, result_type=MULTI, chunked_fetch=False, chunk_size=GET_ITERATOR_CHUNK_SIZE