fix errors in tests.

Author: WaVEV

django_mongodb/compiler.py

@@ -66,7 +66,7 @@ def pre_sql_setup(self, with_col_aliases=False):
                 all_replacements.update(replacements)
             group_expressions |= set(expr.get_group_by_cols())
             self.annotations[target] = result_expr
-        if group:
+        if group or self.query.group_by:
             order_by = self.get_order_by()
             for expr, (_, _, is_ref) in order_by:
                 # Skip references to the SELECT clause, as all expressions in
@@ -82,8 +82,7 @@ def pre_sql_setup(self, with_col_aliases=False):
                 group_expressions.add(expr)
             if isinstance(self.query.group_by, tuple | list):
                 group_expressions |= set(self.query.group_by)
-
-            if self.query.group_by is None:
+            elif self.query.group_by is None:
                 group_expressions = set()
 
             all_strings = "".join(
@@ -171,9 +170,6 @@ def execute_sql(
     ):
         # QuerySet.count()
         self.pre_sql_setup()
-        if self.query.annotations == {"__count": Count("*")}:
-            return [self.get_count()]
-
         columns = self.get_columns()
         try:
             query = self.build_query(

django_mongodb/features.py

@@ -355,6 +355,7 @@ def django_test_expected_failures(self):
             "lookup.tests.LookupQueryingTests.test_filter_subquery_lhs",
             "model_fields.test_jsonfield.TestQuerying.test_nested_key_transform_on_subquery",
             "model_fields.test_jsonfield.TestQuerying.test_obj_subquery_lookup",
+            "aggregation.test_filter_argument.FilteredAggregateTests.test_filtered_aggregate_ref_subquery_annotation",
         },
         "Using a QuerySet in annotate() is not supported on MongoDB.": {
             "annotations.tests.NonAggregateAnnotationTestCase.test_annotation_and_alias_filter_in_subquery",
@@ -392,6 +393,7 @@ def django_test_expected_failures(self):
             "queries.tests.ValuesSubqueryTests.test_values_in_subquery",
             "queries.tests.WeirdQuerysetSlicingTests.test_empty_sliced_subquery",
             "queries.tests.WeirdQuerysetSlicingTests.test_empty_sliced_subquery_exclude",
+            "aggregation.test_filter_argument.FilteredAggregateTests.test_filtered_reused_subquery",
         },
         # Invalid $project :: caused by :: Unknown expression $count
         # https://github.com/mongodb-labs/django-mongodb/issues/79
@@ -467,6 +469,7 @@ def django_test_expected_failures(self):
             "queries.tests.Queries1Tests.test_tickets_6180_6203",
             "queries.tests.Queries6Tests.test_distinct_ordered_sliced_subquery_aggregation",
             "update.tests.AdvancedTests.test_update_all",
+            "aggregation.tests.AggregateTestCase.test_sum_distinct_aggregate",
         },
         "QuerySet.extra() is not supported.": {
             "annotations.tests.NonAggregateAnnotationTestCase.test_column_field_ordering",
@@ -503,6 +506,7 @@ def django_test_expected_failures(self):
             "update.tests.AdvancedTests.test_update_annotated_multi_table_queryset",
         },
         "Test inspects query for SQL": {
+            "aggregation.tests.AggregateTestCase.test_count_star",
             "delete.tests.DeletionTests.test_only_referenced_fields_selected",
             "lookup.tests.LookupTests.test_in_ignore_none",
             "lookup.tests.LookupTests.test_textfield_exact_null",

django_mongodb/functions.py

@@ -35,7 +35,7 @@
     Upper,
 )
 from django.db.models.lookups import Exact
-from django.db.models.query_utils import Q
+from django.db.models.sql.where import WhereNode
 
 from .query_utils import process_lhs
 
@@ -86,7 +86,7 @@ def aggregate(self, compiler, connection, **extra_context):  # noqa: ARG001
         node = self
     lhs_mql = process_lhs(node, compiler, connection)
     operator = MONGO_AGGREGATION.get(self.__class__)
-    if self.__class__ in (StdDev, Variance) and "_SAMP" in self.functions:
+    if self.__class__ in (StdDev, Variance) and "_SAMP" in self.function:
         operator = operator.replace("Pop", "Samp")
     return {f"${operator}": lhs_mql}
 
@@ -128,7 +128,10 @@ def count(self, compiler, connection, **extra_context):
             copy.filter = None
             source_expressions = copy.get_source_expressions()
             filter_ = deepcopy(self.filter)
-            filter_.add(~Q(Exact(source_expressions[0], Value(None))), filter_.default)
+            filter_.add(
+                WhereNode([Exact(source_expressions[0], Value(None))], negated=True),
+                filter_.default,
+            )
             condition = When(filter_, then=Value(1))
             copy.set_source_expressions([Case(condition)] + source_expressions[1:])
             node = copy

django_mongodb/operations.py

@@ -82,14 +82,17 @@ def get_db_converters(self, expression):
         elif internal_type == "DateTimeField":
             if settings.USE_TZ:
                 converters.append(self.convert_datetimefield_value)
-        elif internal_type == "DecimalField":
+        elif internal_type in ("DecimalField", "FloatField") or internal_type.endswith(
+            "IntegerField"
+        ):
             converters.append(self.convert_decimalfield_value)
         elif internal_type == "JSONField":
             converters.append(self.convert_jsonfield_value)
         elif internal_type == "TimeField":
             converters.append(self.convert_timefield_value)
         elif internal_type == "UUIDField":
             converters.append(self.convert_uuidfield_value)
+
         return converters
 
     def convert_datefield_value(self, value, expression, connection):