Edits.

Author: WaVEV

django_mongodb/compiler.py

@@ -319,7 +319,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_stage = self.get_aggregation_pipeline()
+        query.aggregation_pipeline = self.get_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)
@@ -583,7 +583,7 @@ 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_stage = self.get_aggregation_pipeline()
+        query.aggregation_pipeline = self.get_aggregation_pipeline()
 
         compiler = self.query.inner_query.get_compiler(
             self.using,

django_mongodb/features.py

@@ -39,8 +39,6 @@ class DatabaseFeatures(BaseDatabaseFeatures):
         "aggregation.tests.AggregateTestCase.test_grouped_annotation_in_group_by",
         "aggregation.tests.AggregateTestCase.test_non_grouped_annotation_not_in_group_by",
         "aggregation.tests.AggregateTestCase.test_values_annotation_with_expression",
-        "aggregation.tests.AggregateTestCase.test_annotate_ordering",
-        "aggregation.tests.AggregateTestCase.test_even_more_aggregate",
         "annotations.tests.NonAggregateAnnotationTestCase.test_order_by_aggregate",
         "model_fields.test_jsonfield.TestQuerying.test_ordering_grouping_by_count",
         "ordering.tests.OrderingTests.test_default_ordering_does_not_affect_group_by",
@@ -72,6 +70,7 @@ class DatabaseFeatures(BaseDatabaseFeatures):
         "db_functions.math.test_round.RoundTests.test_integer_with_negative_precision",
         # Truncating in another timezone doesn't work becauase MongoDB converts
         # the result back to UTC.
+        "aggregation.tests.AggregateTestCase.test_aggregation_default_using_date_from_database",
         "db_functions.datetime.test_extract_trunc.DateFunctionWithTimeZoneTests.test_trunc_func_with_timezone",
         "db_functions.datetime.test_extract_trunc.DateFunctionWithTimeZoneTests.test_trunc_timezone_applied_before_truncation",
         # Length of null considered zero rather than null.
@@ -110,6 +109,9 @@ class DatabaseFeatures(BaseDatabaseFeatures):
         "aggregation.tests.AggregateTestCase.test_reverse_fkey_annotate",
         # Manage empty result when the flag elide_empty is False
         "aggregation.tests.AggregateTestCase.test_empty_result_optimization",
+        # Incorrect order: pipeline does not order by the right fields.
+        "aggregation.tests.AggregateTestCase.test_annotate_ordering",
+        "aggregation.tests.AggregateTestCase.test_even_more_aggregate",
     }
     # $bitAnd, #bitOr, and $bitXor are new in MongoDB 6.3.
     _django_test_expected_failures_bitwise = {
@@ -138,7 +140,6 @@ def django_test_expected_failures(self):
             "expressions.tests.BasicExpressionsTests.test_object_create_with_aggregate",
             "expressions.tests.BasicExpressionsTests.test_object_create_with_f_expression_in_subquery",
             # PI()
-            "aggregation.tests.AggregateTestCase.test_aggregation_default_using_decimal_from_database",
             "db_functions.math.test_round.RoundTests.test_decimal_with_precision",
             "db_functions.math.test_round.RoundTests.test_float_with_precision",
         },
@@ -471,6 +472,7 @@ def django_test_expected_failures(self):
             "update.tests.AdvancedTests.test_update_annotated_multi_table_queryset",
         },
         "Test inspects query for SQL": {
+            "aggregation.tests.AggregateAnnotationPruningTests.test_non_aggregate_annotation_pruned",
             "aggregation.tests.AggregateAnnotationPruningTests.test_unreferenced_aggregate_annotation_pruned",
             "aggregation.tests.AggregateAnnotationPruningTests.test_unused_aliased_aggregate_pruned",
             "aggregation.tests.AggregateAnnotationPruningTests.test_referenced_aggregate_annotation_kept",
@@ -543,6 +545,7 @@ def django_test_expected_failures(self):
             "db_functions.datetime.test_extract_trunc.DateFunctionTests.test_trunc_time_none",
         },
         "MongoDB can't annotate ($project) a function like PI().": {
+            "aggregation.tests.AggregateTestCase.test_aggregation_default_using_decimal_from_database",
             "db_functions.math.test_pi.PiTests.test",
         },
         "Can't cast from date to datetime without MongoDB interpreting the new value in UTC.": {
@@ -584,11 +587,8 @@ def django_test_expected_failures(self):
         "Test not applicable for MongoDB's SQLCompiler.": {
             "queries.test_iterator.QuerySetIteratorTests",
             # Custom aggregations:
-            "aggregation.tests.AggregateAnnotationPruningTests.test_non_aggregate_annotation_pruned",
             "aggregation.tests.AggregateTestCase.test_add_implementation",
-            "aggregation.tests.AggregateTestCase.test_aggregation_default_using_datetime_from_database",
             "aggregation.tests.AggregateTestCase.test_multi_arg_aggregate",
-            "aggregation.tests.AggregateTestCase.test_aggregation_default_using_date_from_database",
         },
     }
 

django_mongodb/functions.py

@@ -1,7 +1,7 @@
 from copy import deepcopy
 
 from django.db import NotSupportedError
-from django.db.models.aggregates import Aggregate, Avg, Count, Max, Min, StdDev, Sum, Variance
+from django.db.models.aggregates import Aggregate, Count, StdDev, Variance
 from django.db.models.expressions import Case, Func, Star, Value, When
 from django.db.models.functions import Now
 from django.db.models.functions.comparison import Cast, Coalesce, Greatest, Least, NullIf
@@ -40,13 +40,9 @@
 from .query_utils import process_lhs
 
 MONGO_AGGREGATIONS = {
-    Avg: "avg",
     Count: "sum",
-    Max: "max",
-    Min: "min",
-    StdDev: "stdDevPop",
-    Sum: "sum",
-    Variance: "stdDevPop",
+    StdDev: "stdDev",
+    Variance: "stdDev",
 }
 MONGO_OPERATORS = {
     Ceil: "ceil",
@@ -74,18 +70,20 @@
 
 def aggregate(self, compiler, connection, **extra_context):  # noqa: ARG001
     if self.filter:
-        copy = self.copy()
-        copy.filter = None
-        source_expressions = copy.get_source_expressions()
+        node = self.copy()
+        node.filter = None
+        source_expressions = node.get_source_expressions()
         condition = When(self.filter, then=source_expressions[0])
-        copy.set_source_expressions([Case(condition)] + source_expressions[1:])
-        node = copy
+        node.set_source_expressions([Case(condition)] + source_expressions[1:])
     else:
         node = self
     lhs_mql = process_lhs(node, compiler, connection)
-    operator = MONGO_AGGREGATIONS.get(self.__class__)
-    if self.__class__ in (StdDev, Variance) and "_SAMP" in self.function:
-        operator = operator.replace("Pop", "Samp")
+    operator = MONGO_AGGREGATIONS.get(self.__class__, self.function.lower())
+    if "_SAMP" in self.function:
+        operator += "Samp"
+    elif "_POP" in self.function:
+        operator += "Pop"
+
     return {f"${operator}": lhs_mql}
 
 
@@ -119,8 +117,8 @@ def cot(self, compiler, connection):
     return {"$divide": [1, {"$tan": lhs_mql}]}
 
 
-def count(self, compiler, connection, **extra_context):
-    if not self.distinct or extra_context.get("force_filters"):
+def count(self, compiler, connection, force_filters=False, **extra_context):  # noqa: ARG001
+    if not self.distinct or force_filters:
         if self.filter:
             copy = self.copy()
             copy.filter = None
@@ -160,9 +158,7 @@ def extract(self, compiler, connection):
 
 def func(self, compiler, connection):
     lhs_mql = process_lhs(self, compiler, connection)
-    operator = MONGO_OPERATORS.get(
-        self.__class__, (self.extra["function"] if self.function is None else self.function).lower()
-    )
+    operator = MONGO_OPERATORS.get(self.__class__, self.function.lower())
     return {f"${operator}": lhs_mql}
 
 

django_mongodb/query.py

@@ -49,9 +49,8 @@ def __init__(self, compiler):
         self.mongo_query = getattr(compiler.query, "raw_query", {})
         self.subquery = None
         self.lookup_pipeline = None
-        self.annotation_stage = None
         self.project_fields = None
-        self.aggregation_stage = None
+        self.aggregation_pipeline = None
 
     def __repr__(self):
         return f"<MongoQuery: {self.mongo_query!r} ORDER {self.ordering!r}>"
@@ -98,8 +97,8 @@ def get_pipeline(self):
             pipeline.extend(self.lookup_pipeline)
         if self.mongo_query:
             pipeline.append({"$match": self.mongo_query})
-        if self.aggregation_stage:
-            pipeline.extend(self.aggregation_stage)
+        if self.aggregation_pipeline:
+            pipeline.extend(self.aggregation_pipeline)
         if self.project_fields:
             pipeline.append({"$project": self.project_fields})
         if self.ordering: