Refactor.

Author: WaVEV

django_mongodb_backend/expressions/builtins.py

@@ -33,8 +33,6 @@
 from ..query_utils import is_direct_value, process_lhs
 
 
-# EXTRA IS TOTALLY IGNORED
-# shall check if we could optimize match here
 def case(self, compiler, connection, as_path=False):
     case_parts = []
     for case in self.cases:
@@ -94,21 +92,20 @@ def col_pairs(self, compiler, connection, as_path=False):
     return cols[0].as_mql(compiler, connection, as_path=as_path)
 
 
-def combined_expression(self, compiler, connection, **extra):
+def combined_expression(self, compiler, connection, as_path=False):
     expressions = [
-        self.lhs.as_mql(compiler, connection, **extra),
-        self.rhs.as_mql(compiler, connection, **extra),
+        self.lhs.as_mql(compiler, connection, as_path=as_path),
+        self.rhs.as_mql(compiler, connection, as_path=as_path),
     ]
     return connection.ops.combine_expression(self.connector, expressions)
 
 
-def expression_wrapper(self, compiler, connection, **extra):
-    return self.expression.as_mql(compiler, connection, **extra)
+def expression_wrapper(self, compiler, connection, as_path=False):
+    return self.expression.as_mql(compiler, connection, as_path=as_path)
 
 
-def negated_expression(self, compiler, connection, **extra):
-    # review
-    return {"$not": expression_wrapper(self, compiler, connection, **extra)}
+def negated_expression(self, compiler, connection, as_path=False):
+    return {"$not": expression_wrapper(self, compiler, connection, as_path=as_path)}
 
 
 def order_by(self, compiler, connection):
@@ -194,15 +191,14 @@ def subquery(self, compiler, connection, get_wrapping_pipeline=None, as_path=Fal
     return expr
 
 
-def exists(self, compiler, connection, get_wrapping_pipeline=None, as_path=False, **extra):
+def exists(self, compiler, connection, get_wrapping_pipeline=None, as_path=False):
     try:
         lhs_mql = subquery(
             self,
             compiler,
             connection,
             get_wrapping_pipeline=get_wrapping_pipeline,
             as_path=as_path,
-            **extra,
         )
     except EmptyResultSet:
         return Value(False).as_mql(compiler, connection)
@@ -211,8 +207,8 @@ def exists(self, compiler, connection, get_wrapping_pipeline=None, as_path=False
     return connection.mongo_operators_expr["isnull"](lhs_mql, False)
 
 
-def when(self, compiler, connection, **extra):
-    return self.condition.as_mql(compiler, connection, **extra)
+def when(self, compiler, connection, as_path=False):
+    return self.condition.as_mql(compiler, connection, as_path=as_path)
 
 
 def value(self, compiler, connection, as_path=False):  # noqa: ARG001
@@ -244,9 +240,8 @@ def _is_constant_value(value):
     if isinstance(value, list | Array):
         iterable = value.get_source_expressions() if isinstance(value, Array) else value
         return all(_is_constant_value(e) for e in iterable)
-    if isinstance(value, Value) or is_direct_value(value):
-        v = value.value if isinstance(value, Value) else value
-        return not isinstance(v, str) or "." not in v
+    if is_direct_value(value):
+        return True
     return isinstance(value, Func | Value) and not (
         value.contains_aggregate
         or value.contains_over_clause
@@ -266,7 +261,7 @@ def _is_simple_column(lhs):
     return isinstance(col, Col) and col.alias is not None
 
 
-def is_simple_expression(self):
+def _is_simple_expression(self):
     return self.is_simple_column(self.lhs) and self.is_constant_value(self.rhs)
 
 
@@ -288,6 +283,6 @@ def register_expressions():
     Subquery.as_mql = subquery
     When.as_mql = when
     Value.as_mql = value
-    BaseExpression.is_simple_expression = is_simple_expression
+    BaseExpression.is_simple_expression = _is_simple_expression
     BaseExpression.is_simple_column = _is_simple_column
     BaseExpression.is_constant_value = _is_constant_value

django_mongodb_backend/fields/array.py

@@ -399,10 +399,14 @@ def __init__(self, index, base_field, *args, **kwargs):
         self.base_field = base_field
 
     def as_mql(self, compiler, connection, as_path=False):
-        lhs_mql = process_lhs(self, compiler, connection, as_path=as_path)
-        if as_path:
+        if as_path and self.is_simple_column(self.lhs):
+            lhs_mql = process_lhs(self, compiler, connection, as_path=as_path)
             return f"{lhs_mql}.{self.index}"
-        return {"$arrayElemAt": [lhs_mql, self.index]}
+        lhs_mql = process_lhs(self, compiler, connection, as_path=False)
+        expr = {"$arrayElemAt": [lhs_mql, self.index]}
+        if as_path:
+            return {"$expr": expr}
+        return expr
 
     @property
     def output_field(self):

django_mongodb_backend/fields/json.py

@@ -73,11 +73,11 @@ def _has_key_predicate(path, root_column=None, negated=False, as_path=False):
 
 def has_key_lookup(self, compiler, connection, as_path=False):
     """Return MQL to check for the existence of a key."""
-    as_path = as_path and self.is_simple_expression()
-    lhs = process_lhs(self, compiler, connection, as_path=as_path)
     rhs = self.rhs
     if not isinstance(rhs, (list, tuple)):
         rhs = [rhs]
+    as_path = as_path and self.is_simple_expression() and all("." not in v for v in rhs)
+    lhs = process_lhs(self, compiler, connection, as_path=as_path)
     paths = []
     # Transform any "raw" keys into KeyTransforms to allow consistent handling
     # in the code that follows.

django_mongodb_backend/functions.py

@@ -65,11 +65,7 @@
 }
 
 
-# TODO: ALL THOSE FUNCTION MAY CHECK AS_EXPR OR AS_PATH=FALSE. JUST NEED TO REVIEW ALL THE
-# TEST THAT HAVE THOSE OPERATOR.
-
-
-def cast(self, compiler, connection, as_path=False):  # noqa: ARG001
+def cast(self, compiler, connection, as_path=False):
     output_type = connection.data_types[self.output_field.get_internal_type()]
     lhs_mql = process_lhs(self, compiler, connection, as_path=False)[0]
     if max_length := self.output_field.max_length:
@@ -82,6 +78,8 @@ def cast(self, compiler, connection, as_path=False):  # noqa: ARG001
     if decimal_places := getattr(self.output_field, "decimal_places", None):
         lhs_mql = {"$trunc": [lhs_mql, decimal_places]}
 
+    if as_path:
+        return {"$expr": lhs_mql}
     return lhs_mql
 
 
@@ -98,7 +96,7 @@ def concat_pair(self, compiler, connection, as_path=False):
 
 
 def cot(self, compiler, connection, as_path=False):
-    lhs_mql = process_lhs(self, compiler, connection, as_path=as_path)
+    lhs_mql = process_lhs(self, compiler, connection, as_path=False)
     if as_path:
         return {"$expr": {"$divide": [1, {"$tan": lhs_mql}]}}
     return {"$divide": [1, {"$tan": lhs_mql}]}
@@ -118,7 +116,7 @@ def extract(self, compiler, connection, as_path=False):
 
 
 def func(self, compiler, connection, as_path=False):
-    lhs_mql = process_lhs(self, compiler, connection, as_path=as_path)
+    lhs_mql = process_lhs(self, compiler, connection, as_path=False)
     if self.function is None:
         raise NotSupportedError(f"{self} may need an as_mql() method.")
     operator = MONGO_OPERATORS.get(self.__class__, self.function.lower())
@@ -127,8 +125,8 @@ def func(self, compiler, connection, as_path=False):
     return {f"${operator}": lhs_mql}
 
 
-def left(self, compiler, connection, as_path=False):  # noqa: ARG001
-    return self.get_substr().as_mql(compiler, connection, as_path=False)
+def left(self, compiler, connection, as_path=False):
+    return self.get_substr().as_mql(compiler, connection, as_path=as_path)
 
 
 def length(self, compiler, connection, as_path=False):
@@ -140,11 +138,11 @@ def length(self, compiler, connection, as_path=False):
     return expr
 
 
-def log(self, compiler, connection, as_path=False):  # noqa: ARG001
+def log(self, compiler, connection, as_path=False):
     # This function is usually log(base, num) but on MongoDB it's log(num, base).
     clone = self.copy()
     clone.set_source_expressions(self.get_source_expressions()[::-1])
-    return func(clone, compiler, connection)
+    return func(clone, compiler, connection, as_path=as_path)
 
 
 def now(self, compiler, connection, as_path=False):  # noqa: ARG001