Fix collisions with projected columns and order by columns.

Author: WaVEV

.github/workflows/test-python.yml

@@ -68,6 +68,7 @@ jobs:
         run: >
           python3 django_repo/tests/runtests.py --settings mongodb_settings -v 2
           aggregation
+          aggregation_regress
           annotations
           auth_tests.test_models.UserManagerTestCase
           backends.base.test_base.DatabaseWrapperTests

django_mongodb/compiler.py

@@ -357,9 +357,7 @@ def build_query(self, columns=None):
         if columns is None:
             extra_fields += ordering_fields
         if extra_fields:
-            query.extra_fields = {
-                field_name: expr.as_mql(self, self.connection) for field_name, expr in extra_fields
-            }
+            query.extra_fields = self.get_project_fields(extra_fields, force_expression=True)
         where = self.get_where()
         try:
             expr = where.as_mql(self, self.connection) if where else {}
@@ -429,16 +427,18 @@ def _get_aggregate_expressions(self, expr):
             elif hasattr(expr, "get_source_expressions"):
                 stack.extend(expr.get_source_expressions())
 
-    def get_project_fields(self, columns=None, ordering=None):
+    def get_project_fields(self, columns=None, ordering=None, force_expression=False):
+        if not columns:
+            return {}
         fields = defaultdict(dict)
-        for name, expr in columns or []:
+        for name, expr in columns + (ordering or ()):
             collection = expr.alias if isinstance(expr, Col) else None
             try:
                 fields[collection][name] = (
                     1
                     # For brevity/simplicity, project {"field_name": 1}
                     # instead of {"field_name": "$field_name"}.
-                    if isinstance(expr, Col) and name == expr.target.column
+                    if isinstance(expr, Col) and name == expr.target.column and not force_expression
                     else expr.as_mql(self, self.connection)
                 )
             except EmptyResultSet:
@@ -449,9 +449,6 @@ def get_project_fields(self, columns=None, ordering=None):
         # should appear in the top-level of the fields dict.
         fields.update(fields.pop(None, {}))
         fields.update(fields.pop(self.collection_name, {}))
-        # Add order_by() fields.
-        if fields and ordering:
-            fields.update({alias: expr.as_mql(self, self.connection) for alias, expr in ordering})
         # Convert defaultdict to dict so it doesn't appear as
         # "defaultdict(<CLASS 'dict'>, ..." in query logging.
         return dict(fields)
@@ -471,7 +468,7 @@ def _get_ordering(self):
         for order in self.order_by_objs or []:
             if isinstance(order.expression, Col):
                 field_name = order.expression.as_mql(self, self.connection).removeprefix("$")
-                fields[field_name] = order.expression
+                fields[order.expression.target.column] = order.expression
             elif isinstance(order.expression, Ref):
                 field_name = order.expression.as_mql(self, self.connection).removeprefix("$")
             else:

django_mongodb/features.py

@@ -61,6 +61,8 @@ class DatabaseFeatures(BaseDatabaseFeatures):
         "aggregation.tests.AggregateTestCase.test_aggregation_default_passed_another_aggregate",
         "aggregation.tests.AggregateTestCase.test_annotation_expressions",
         "aggregation.tests.AggregateTestCase.test_reverse_fkey_annotate",
+        "aggregation_regress.tests.AggregationTests.test_annotation_disjunction",
+        "aggregation_regress.tests.AggregationTests.test_decimal_aggregate_annotation_filter",
     }
     # $bitAnd, #bitOr, and $bitXor are new in MongoDB 6.3.
     _django_test_expected_failures_bitwise = {
@@ -198,6 +200,7 @@ def django_test_expected_failures(self):
             "queries.test_bulk_update.BulkUpdateTests.test_database_routing_batch_atomicity",
         },
         "Test assumes integer primary key.": {
+            "aggregation_regress.tests.AggregationTests.test_aggregation_with_generic_reverse_relation",
             "db_functions.comparison.test_cast.CastTests.test_cast_to_integer_foreign_key",
             "model_fields.test_foreignkey.ForeignKeyTests.test_to_python",
         },
@@ -210,6 +213,7 @@ def django_test_expected_failures(self):
             "aggregation.tests.AggregateTestCase.test_exists_extra_where_with_aggregate",
             "annotations.tests.NonAggregateAnnotationTestCase.test_annotation_exists_aggregate_values_chaining",
             "annotations.tests.NonAggregateAnnotationTestCase.test_annotation_exists_none_query",
+            "aggregation_regress.tests.AggregationTests.test_annotate_and_join",
             "delete_regress.tests.DeleteTests.test_self_reference_with_through_m2m_at_second_level",
             "expressions.tests.BasicExpressionsTests.test_annotation_with_deeply_nested_outerref",
             "expressions.tests.BasicExpressionsTests.test_boolean_expression_combined",
@@ -299,6 +303,11 @@ def django_test_expected_failures(self):
             "annotations.tests.NonAggregateAnnotationTestCase.test_annotation_and_alias_filter_in_subquery",
             "annotations.tests.NonAggregateAnnotationTestCase.test_annotation_and_alias_filter_related_in_subquery",
             "annotations.tests.NonAggregateAnnotationTestCase.test_empty_expression_annotation",
+            "aggregation_regress.tests.AggregationTests.test_aggregates_in_where_clause",
+            "aggregation_regress.tests.AggregationTests.test_aggregates_in_where_clause_pre_eval",
+            "aggregation_regress.tests.AggregationTests.test_f_expression_annotation",
+            "aggregation_regress.tests.AggregationTests.test_having_subquery_select",
+            "aggregation_regress.tests.AggregationTests.test_negated_aggregation",
             "db_functions.comparison.test_coalesce.CoalesceTests.test_empty_queryset",
             "expressions_case.tests.CaseExpressionTests.test_annotate_with_in_clause",
             "expressions.tests.FTimeDeltaTests.test_date_subquery_subtraction",
@@ -353,6 +362,7 @@ def django_test_expected_failures(self):
         "QuerySet.dates() is not supported on MongoDB.": {
             "aggregation.tests.AggregateTestCase.test_dates_with_aggregation",
             "annotations.tests.AliasTests.test_dates_alias",
+            "aggregation_regress.tests.AggregationTests.test_more_more_more",
             "dates.tests.DatesTests.test_dates_trunc_datetime_fields",
             "dates.tests.DatesTests.test_related_model_traverse",
         },
@@ -370,6 +380,9 @@ def django_test_expected_failures(self):
         },
         "QuerySet.distinct() is not supported.": {
             "aggregation.tests.AggregateTestCase.test_sum_distinct_aggregate",
+            "aggregation_regress.tests.AggregationTests.test_annotate_distinct_aggregate",
+            "aggregation_regress.tests.AggregationTests.test_conditional_aggregate_on_complex_condition",
+            "aggregation_regress.tests.AggregationTests.test_distinct_conditional_aggregate",
             "lookup.tests.LookupTests.test_lookup_collision_distinct",
             "ordering.tests.OrderingTests.test_orders_nulls_first_on_filtered_subquery",
             "queries.tests.ExcludeTest17600.test_exclude_plain_distinct",
@@ -424,6 +437,7 @@ def django_test_expected_failures(self):
             "aggregation.tests.AggregateAnnotationPruningTests.test_unused_aliased_aggregate_pruned",
             "aggregation.tests.AggregateAnnotationPruningTests.test_referenced_aggregate_annotation_kept",
             "aggregation.tests.AggregateTestCase.test_count_star",
+            "aggregation_regress.tests.AggregationTests.test_annotation_with_value",
             "delete.tests.DeletionTests.test_only_referenced_fields_selected",
             "lookup.tests.LookupTests.test_in_ignore_none",
             "lookup.tests.LookupTests.test_textfield_exact_null",
@@ -433,6 +447,9 @@ def django_test_expected_failures(self):
         "Test executes raw SQL.": {
             "aggregation.tests.AggregateTestCase.test_coalesced_empty_result_set",
             "annotations.tests.NonAggregateAnnotationTestCase.test_raw_sql_with_inherited_field",
+            "aggregation_regress.tests.AggregationTests.test_annotate_with_extra",
+            "aggregation_regress.tests.AggregationTests.test_annotation",
+            "aggregation_regress.tests.AggregationTests.test_more_more",
             "delete_regress.tests.DeleteLockingTest.test_concurrent_delete",
             "expressions.tests.BasicExpressionsTests.test_annotate_values_filter",
             "expressions.tests.BasicExpressionsTests.test_filtering_on_rawsql_that_is_boolean",