rename _group_pipline

Author: timgraham

django_mongodb/compiler.py

@@ -24,7 +24,7 @@ class SQLCompiler(compiler.SQLCompiler):
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        self._group_pipeline = None
+        self.aggregation_pipeline = None
 
     def _get_group_alias_column(self, expr, annotation_group_idx):
         """
@@ -100,7 +100,7 @@ def _prepare_expressions_for_pipeline(self, expression, target, annotation_group
             replacements[sub_expr] = replacing_expr
         return replacements, group
 
-    def _prepare_annotations_for_group_pipeline(self):
+    def _prepare_annotations_for_aggregation_pipeline(self):
         """Prepare annotations for the MongoDB aggregation pipeline."""
         replacements = {}
         group = {}
@@ -157,7 +157,7 @@ def _get_group_id_expressions(self, order_by):
 
         return ids, replacements
 
-    def _build_group_pipeline(self, ids, group):
+    def _build_aggregation_pipeline(self, ids, group):
         """Build the aggregation pipeline for grouping."""
         pipeline = []
         if not ids:
@@ -196,15 +196,15 @@ def _build_group_pipeline(self, ids, group):
 
     def pre_sql_setup(self, with_col_aliases=False):
         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()
+        group, all_replacements = self._prepare_annotations_for_aggregation_pipeline()
         # query.group_by is either:
         # - None: no GROUP BY
         # - True: group by select fields
         # - a list of expressions to group by.
         if group or self.query.group_by:
             ids, replacements = self._get_group_id_expressions(order_by)
             all_replacements.update(replacements)
-            pipeline = self._build_group_pipeline(ids, group)
+            pipeline = self._build_aggregation_pipeline(ids, group)
             if self.having:
                 pipeline.append(
                     {
@@ -215,7 +215,7 @@ def pre_sql_setup(self, with_col_aliases=False):
                         }
                     }
                 )
-            self._group_pipeline = pipeline
+            self.aggregation_pipeline = pipeline
 
         self.annotations = {
             target: expr.replace_expressions(all_replacements)
@@ -342,7 +342,7 @@ def build_query(self, columns=None):
         """Check if the query is supported and prepare a MongoQuery."""
         self.check_query()
         query = self.query_class(self)
-        query.aggregation_pipeline = self.get_aggregation_pipeline()
+        query.aggregation_pipeline = self.aggregation_pipeline
         query.lookup_pipeline = self.get_lookup_pipeline()
         query.order_by(self._get_ordering())
         query.project_fields = self.get_project_fields(columns, ordering=query.ordering)
@@ -461,9 +461,6 @@ def _get_aggregate_expressions(self, expr):
             elif hasattr(expr, "get_source_expressions"):
                 stack.extend(expr.get_source_expressions())
 
-    def get_aggregation_pipeline(self):
-        return self._group_pipeline
-
     def get_project_fields(self, columns=None, ordering=None):
         fields = {}
         for name, expr in columns or []:
@@ -613,22 +610,20 @@ class SQLAggregateCompiler(SQLCompiler):
     def build_query(self, columns=None):
         query = self.query_class(self)
         query.project_fields = self.get_project_fields(tuple(self.annotations.items()))
-        query.aggregation_pipeline = self.get_aggregation_pipeline()
+        query.aggregation_pipeline = self.aggregation_pipeline
 
         compiler = self.query.inner_query.get_compiler(
             self.using,
             elide_empty=self.elide_empty,
         )
         compiler.pre_sql_setup(with_col_aliases=False)
+        # Avoid $project (columns=None) if unneeded.
         columns = (
             compiler.get_columns()
             if compiler.query.annotations or not compiler.query.default_cols
             else None
         )
-        subquery = compiler.build_query(
-            # Avoid $project (columns=None) if unneeded.
-            columns
-        )
+        subquery = compiler.build_query(columns)
         query.subquery = subquery
         return query