cosmetic edits + remove unused code

Author: timgraham

django_mongodb/compiler.py

@@ -261,9 +261,6 @@ def results_iter(
             rows = map(tuple, rows)
         return rows
 
-    def has_results(self):
-        return bool(self.execute_sql(SINGLE))
-
     def _make_result(self, entity, columns):
         """
         Decode values for the given fields from the database entity.

django_mongodb/features.py

@@ -48,8 +48,6 @@ class DatabaseFeatures(BaseDatabaseFeatures):
         "expressions.tests.NegatedExpressionTests.test_filter",
         "expressions_case.tests.CaseExpressionTests.test_order_by_conditional_implicit",
         # NotSupportedError: order_by() expression not supported.
-        # Lookup in order_by() not supported:
-        # argument of type '<database function>' is not iterable
         "aggregation.tests.AggregateTestCase.test_aggregation_order_by_not_selected_annotation_values",
         "db_functions.comparison.test_coalesce.CoalesceTests.test_ordering",
         "db_functions.tests.FunctionTests.test_nested_function_ordering",
@@ -347,6 +345,7 @@ def django_test_expected_failures(self):
             "aggregation.test_filter_argument.FilteredAggregateTests.test_filtered_aggregate_ref_subquery_annotation",
         },
         "Using a QuerySet in annotate() is not supported on MongoDB.": {
+            "aggregation.test_filter_argument.FilteredAggregateTests.test_filtered_reused_subquery",
             "aggregation.tests.AggregateTestCase.test_filter_in_subquery_or_aggregation",
             "aggregation.tests.AggregateTestCase.test_group_by_subquery_annotation",
             "aggregation.tests.AggregateTestCase.test_group_by_reference_subquery",
@@ -386,7 +385,6 @@ 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",
         },
         "Cannot use QuerySet.delete() when querying across multiple collections on MongoDB.": {
             "delete.tests.FastDeleteTests.test_fast_delete_aggregation",
@@ -418,6 +416,7 @@ def django_test_expected_failures(self):
             "timezones.tests.NewDatabaseTests.test_query_datetimes_in_other_timezone",
         },
         "QuerySet.distinct() is not supported.": {
+            "aggregation.tests.AggregateTestCase.test_sum_distinct_aggregate",
             "lookup.tests.LookupTests.test_lookup_collision_distinct",
             "queries.tests.ExcludeTest17600.test_exclude_plain_distinct",
             "queries.tests.ExcludeTest17600.test_exclude_with_q_is_equal_to_plain_exclude",
@@ -435,7 +434,6 @@ 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",

django_mongodb/functions.py

@@ -39,7 +39,7 @@
 
 from .query_utils import process_lhs
 
-MONGO_AGGREGATION = {
+MONGO_AGGREGATIONS = {
     Avg: "avg",
     Count: "sum",
     Max: "max",
@@ -48,8 +48,6 @@
     Sum: "sum",
     Variance: "stdDevPop",
 }
-
-
 MONGO_OPERATORS = {
     Ceil: "ceil",
     Coalesce: "ifNull",
@@ -85,7 +83,7 @@ def aggregate(self, compiler, connection, **extra_context):  # noqa: ARG001
     else:
         node = self
     lhs_mql = process_lhs(node, compiler, connection)
-    operator = MONGO_AGGREGATION.get(self.__class__)
+    operator = MONGO_AGGREGATIONS.get(self.__class__)
     if self.__class__ in (StdDev, Variance) and "_SAMP" in self.function:
         operator = operator.replace("Pop", "Samp")
     return {f"${operator}": lhs_mql}

django_mongodb/operations.py

@@ -94,7 +94,6 @@ def get_db_converters(self, expression):
             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):
@@ -133,7 +132,6 @@ def convert_floatfield_value(self, value, expression, connection):
             return value
         if isinstance(value, Decimal128):
             return float(value.to_decimal())
-
         return float(value)
 
     def convert_integerfield_value(self, value, expression, connection):

django_mongodb/query.py

@@ -56,15 +56,6 @@ def __init__(self, compiler):
     def __repr__(self):
         return f"<MongoQuery: {self.mongo_query!r} ORDER {self.ordering!r}>"
 
-    @wrap_database_errors
-    def count(self, limit=None, skip=None):
-        """
-        Return the number of objects that would be returned, if this query was
-        executed, up to `limit`, skipping `skip`.
-        """
-        result = list(self.get_cursor(count=True, limit=limit, skip=skip))
-        return result[0]["__count"] if result else 0
-
     def order_by(self, ordering):
         """
         Reorder query results or execution order. Called by compiler during
@@ -90,23 +81,18 @@ def delete(self):
         return self.collection.delete_many(self.mongo_query, **options).deleted_count
 
     @wrap_database_errors
-    def get_cursor(self, count=False, limit=None, skip=None):
+    def get_cursor(self):
         """
         Return a pymongo CommandCursor that can be iterated on to give the
         results of the query.
-
-        If `count` is True, return a single document with the number of
-        documents that match the query.
-
-        Use `limit` or `skip` to override those options of the query.
         """
         if self.query.low_mark == self.query.high_mark:
             return []
 
         pipeline = self.get_pipeline()
         return self.collection.aggregate(pipeline)
 
-    def get_pipeline(self, count=False, limit=None, skip=None):
+    def get_pipeline(self):
         pipeline = [] if self.subquery is None else self.subquery.get_pipeline()
         if self.lookup_pipeline:
             pipeline.extend(self.lookup_pipeline)
@@ -118,17 +104,10 @@ def get_pipeline(self, count=False, limit=None, skip=None):
             pipeline.append({"$project": self.project_fields})
         if self.ordering:
             pipeline.append({"$sort": dict(self.ordering)})
-
-        if skip is not None:
-            pipeline.append({"$skip": skip})
-        elif self.query.low_mark > 0:
+        if self.query.low_mark > 0:
             pipeline.append({"$skip": self.query.low_mark})
-
-        if limit is not None:
-            pipeline.append({"$limit": limit})
-        elif self.query.high_mark is not None:
+        if self.query.high_mark is not None:
             pipeline.append({"$limit": self.query.high_mark - self.query.low_mark})
-
         return pipeline