Fix fieldname collision in foreign fields.

Author: WaVEV

django_mongodb/compiler.py

@@ -463,28 +463,29 @@ def _get_ordering(self):
         - A tuple of ('field_name': Expression, ...) for expressions that need
           to be added to extra_fields.
         """
-        fields = {}
+        fields = []
         sort_ordering = SON()
-        extra_fields = {}
+        extra_fields = []
         idx = itertools.count(start=1)
         for order in self.order_by_objs or []:
             if isinstance(order.expression, Col):
                 field_name = order.expression.as_mql(self, self.connection).removeprefix("$")
-                fields[order.expression.target.column] = order.expression
+                # fields[order.expression.target.column] = order.expression
+                fields.append((order.expression.target.column, order.expression))
             elif isinstance(order.expression, Ref):
                 field_name = order.expression.as_mql(self, self.connection).removeprefix("$")
             else:
                 field_name = f"__order{next(idx)}"
-                fields[field_name] = order.expression
+                fields.append((field_name, order.expression))
             # If the expression is ordered by NULLS FIRST or NULLS LAST,
             # add a field for sorting that's 1 if null or 0 if not.
             if order.nulls_first or order.nulls_last:
                 null_fieldname = f"__order{next(idx)}"
                 condition = When(IsNull(order.expression, True), then=Value(1))
-                extra_fields[null_fieldname] = Case(condition, default=Value(0))
+                extra_fields.append((null_fieldname, Case(condition, default=Value(0))))
                 sort_ordering[null_fieldname] = DESCENDING if order.nulls_first else ASCENDING
             sort_ordering[field_name] = DESCENDING if order.descending else ASCENDING
-        return tuple(fields.items()), sort_ordering, tuple(extra_fields.items())
+        return tuple(fields), sort_ordering, tuple(extra_fields)
 
     def get_where(self):
         return self.where

django_mongodb/features.py

@@ -69,7 +69,6 @@ class DatabaseFeatures(BaseDatabaseFeatures):
         "aggregation_regress.tests.AggregationTests.test_more_more_more3",
         # To triage:
         "aggregation_regress.tests.AggregationTests.test_aggregation_with_generic_reverse_relation",
-        "aggregation_regress.tests.AggregationTests.test_more_more1",
     }
     # $bitAnd, #bitOr, and $bitXor are new in MongoDB 6.3.
     _django_test_expected_failures_bitwise = {