Refactor.

Author: WaVEV

django_mongodb_backend/compiler.py

@@ -643,9 +643,7 @@ def get_combinator_queries(self):
             for alias, expr in self.columns:
                 # Unfold foreign fields.
                 if isinstance(expr, Col) and expr.alias != self.collection_name:
-                    ids[expr.alias][expr.target.column] = expr.as_mql(
-                        self, self.connection, as_path=False
-                    )
+                    ids[expr.alias][expr.target.column] = expr.as_mql(self, self.connection)
                 else:
                     ids[alias] = f"${alias}"
             # Convert defaultdict to dict so it doesn't appear as

django_mongodb_backend/lookups.py

@@ -9,7 +9,7 @@
     UUIDTextMixin,
 )
 
-from .query_utils import is_simple_expression, process_lhs, process_rhs
+from .query_utils import is_constant_value, process_lhs, process_rhs
 
 
 def builtin_lookup_path(self, compiler, connection):
@@ -138,6 +138,12 @@ def uuid_text_mixin(self, compiler, connection):  # noqa: ARG001
     raise NotSupportedError("Pattern lookups on UUIDField are not supported.")
 
 
+def is_simple_expression(self):
+    simple_column = getattr(self.lhs, "is_simple_column", False)
+    constant_value = is_constant_value(self.rhs)
+    return simple_column and constant_value
+
+
 def register_lookups():
     Lookup.is_simple_expression = is_simple_expression
     BuiltinLookup.as_mql_path = builtin_lookup_path

django_mongodb_backend/query.py

@@ -88,7 +88,6 @@ def get_pipeline(self):
             pipeline.extend(query.get_pipeline())
         if self.match_mql:
             pipeline.append({"$match": self.match_mql})
-            # pipeline.append({"$match": {"$expr": self.match_mql}})
         if self.aggregation_pipeline:
             pipeline.extend(self.aggregation_pipeline)
         if self.project_fields:
@@ -165,14 +164,13 @@ def _get_reroot_replacements(expression):
         for col, parent_pos in columns:
             target = col.target.clone()
             target.remote_field = col.target.remote_field
+            column_target = Col(compiler.collection_name, target)
             if parent_pos is not None:
-                column_target = Col(None, target)
                 column_target.is_simple_column = False
                 target_col = f"${parent_template}{parent_pos}"
                 column_target.target.db_column = target_col
                 column_target.target.set_attributes_from_name(target_col)
             else:
-                column_target = Col(compiler.collection_name, target)
                 column_target.target = col.target
             replacements[col] = column_target
         return replacements

django_mongodb_backend/query_utils.py

@@ -89,9 +89,3 @@ def is_constant_value(value):
             or value.contains_subquery
         )
     )
-
-
-def is_simple_expression(self):
-    simple_column = getattr(self.lhs, "is_simple_column", False)
-    constant_value = is_constant_value(self.rhs)
-    return simple_column and constant_value