wip

Author: WaVEV

django_mongodb_backend/compiler.py

@@ -334,7 +334,7 @@ def pre_sql_setup(self, with_col_aliases=False):
                     pipeline.extend(query.get_pipeline())
                 # Remove the added subqueries.
                 self.subqueries = []
-                pipeline.append({"$match": {"$expr": having}})
+                pipeline.append({"$match": having})
             self.aggregation_pipeline = pipeline
         self.annotations = {
             target: expr.replace_expressions(all_replacements)
@@ -707,7 +707,7 @@ def get_project_fields(self, columns=None, ordering=None, force_expression=False
                     # For brevity/simplicity, project {"field_name": 1}
                     # instead of {"field_name": "$field_name"}.
                     if isinstance(expr, Col) and name == expr.target.column and not force_expression
-                    else expr.as_mql(self, self.connection)
+                    else expr.as_mql(self, self.connection, as_expr=force_expression)
                 )
             except EmptyResultSet:
                 empty_result_set_value = getattr(expr, "empty_result_set_value", NotImplemented)

django_mongodb_backend/expressions/builtins.py

@@ -28,7 +28,8 @@
 from ..query_utils import process_lhs
 
 
-def case(self, compiler, connection):
+# EXTRA IS TOTALLY IGNORED
+def case(self, compiler, connection, **extra):  # noqa: ARG001
     case_parts = []
     for case in self.cases:
         case_mql = {}
@@ -53,7 +54,7 @@ def case(self, compiler, connection):
     }
 
 
-def col(self, compiler, connection, as_path=False):  # noqa: ARG001
+def col(self, compiler, connection, as_path=False, as_expr=None):  # noqa: ARG001
     # If the column is part of a subquery and belongs to one of the parent
     # queries, it will be stored for reference using $let in a $lookup stage.
     # If the query is built with `alias_cols=False`, treat the column as
@@ -71,7 +72,7 @@ def col(self, compiler, connection, as_path=False):  # noqa: ARG001
     # Add the column's collection's alias for columns in joined collections.
     has_alias = self.alias and self.alias != compiler.collection_name
     prefix = f"{self.alias}." if has_alias else ""
-    if not as_path:
+    if not as_path or as_expr:
         prefix = f"${prefix}"
     return f"{prefix}{self.target.column}"
 
@@ -83,16 +84,16 @@ def col_pairs(self, compiler, connection):
     return cols[0].as_mql(compiler, connection)
 
 
-def combined_expression(self, compiler, connection):
+def combined_expression(self, compiler, connection, **extra):
     expressions = [
-        self.lhs.as_mql(compiler, connection),
-        self.rhs.as_mql(compiler, connection),
+        self.lhs.as_mql(compiler, connection, **extra),
+        self.rhs.as_mql(compiler, connection, **extra),
     ]
     return connection.ops.combine_expression(self.connector, expressions)
 
 
-def expression_wrapper(self, compiler, connection):
-    return self.expression.as_mql(compiler, connection)
+def expression_wrapper(self, compiler, connection, **extra):
+    return self.expression.as_mql(compiler, connection, **extra)
 
 
 def negated_expression(self, compiler, connection):
@@ -103,7 +104,7 @@ def order_by(self, compiler, connection):
     return self.expression.as_mql(compiler, connection)
 
 
-def query(self, compiler, connection, get_wrapping_pipeline=None, as_path=False):
+def query(self, compiler, connection, get_wrapping_pipeline=None, as_path=False, as_expr=None):
     subquery_compiler = self.get_compiler(connection=connection)
     subquery_compiler.pre_sql_setup(with_col_aliases=False)
     field_name, expr = subquery_compiler.columns[0]
@@ -145,7 +146,7 @@ def query(self, compiler, connection, get_wrapping_pipeline=None, as_path=False)
         # Erase project_fields since the required value is projected above.
         subquery.project_fields = None
     compiler.subqueries.append(subquery)
-    if as_path:
+    if as_path and not as_expr:
         return f"{table_output}.{field_name}"
     return f"${table_output}.{field_name}"
 
@@ -200,7 +201,7 @@ def when(self, compiler, connection, **extra):
     return self.condition.as_mql(compiler, connection, **extra)
 
 
-def value(self, compiler, connection):  # noqa: ARG001
+def value(self, compiler, connection, **extra):  # noqa: ARG001
     value = self.value
     if isinstance(value, (list, int)):
         # Wrap lists & numbers in $literal to prevent ambiguity when Value

django_mongodb_backend/functions.py

@@ -65,7 +65,11 @@
 }
 
 
-def cast(self, compiler, connection):
+# 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, **extra):  # noqa: ARG001
     output_type = connection.data_types[self.output_field.get_internal_type()]
     lhs_mql = process_lhs(self, compiler, connection)[0]
     if max_length := self.output_field.max_length:
@@ -95,7 +99,7 @@ def cot(self, compiler, connection):
     return {"$divide": [1, {"$tan": lhs_mql}]}
 
 
-def extract(self, compiler, connection):
+def extract(self, compiler, connection, **extra):  # noqa: ARG001
     lhs_mql = process_lhs(self, compiler, connection)
     operator = EXTRACT_OPERATORS.get(self.lookup_name)
     if operator is None:
@@ -105,7 +109,7 @@ def extract(self, compiler, connection):
     return {f"${operator}": lhs_mql}
 
 
-def func(self, compiler, connection):
+def func(self, compiler, connection, **extra):  # noqa: ARG001
     lhs_mql = process_lhs(self, compiler, connection)
     if self.function is None:
         raise NotSupportedError(f"{self} may need an as_mql() method.")
@@ -117,7 +121,7 @@ def left(self, compiler, connection):
     return self.get_substr().as_mql(compiler, connection)
 
 
-def length(self, compiler, connection):
+def length(self, compiler, connection, as_path=False, as_expr=None):  # noqa: ARG001
     # Check for null first since $strLenCP only accepts strings.
     lhs_mql = process_lhs(self, compiler, connection)
     return {"$cond": {"if": {"$eq": [lhs_mql, None]}, "then": None, "else": {"$strLenCP": lhs_mql}}}
@@ -194,7 +198,7 @@ def wrapped(self, compiler, connection):
     return wrapped
 
 
-def trunc(self, compiler, connection):
+def trunc(self, compiler, connection, **extra):  # noqa: ARG001
     lhs_mql = process_lhs(self, compiler, connection)
     lhs_mql = {"date": lhs_mql, "unit": self.kind, "startOfWeek": "mon"}
     if timezone := self.get_tzname():

django_mongodb_backend/lookups.py

@@ -46,14 +46,14 @@ def field_resolve_expression_parameter(self, compiler, connection, sql, param):
     return sql, sql_params
 
 
-def in_(self, compiler, connection):
+def in_(self, compiler, connection, **extra):
     db_rhs = getattr(self.rhs, "_db", None)
     if db_rhs is not None and db_rhs != connection.alias:
         raise ValueError(
             "Subqueries aren't allowed across different databases. Force "
             "the inner query to be evaluated using `list(inner_query)`."
         )
-    return builtin_lookup(self, compiler, connection)
+    return builtin_lookup(self, compiler, connection, **extra)
 
 
 def get_subquery_wrapping_pipeline(self, compiler, connection, field_name, expr):  # noqa: ARG001
@@ -91,7 +91,7 @@ def get_subquery_wrapping_pipeline(self, compiler, connection, field_name, expr)
 def is_null(self, compiler, connection, as_expr=False):
     if not isinstance(self.rhs, bool):
         raise ValueError("The QuerySet value for an isnull lookup must be True or False.")
-    if is_constant_value(self.rhs) and not as_expr:
+    if is_constant_value(self.rhs) and not as_expr and is_simple_column(self.lhs):
         lhs_mql = process_lhs(self, compiler, connection, as_path=True)
         return connection.mongo_operators_match["isnull"](lhs_mql, self.rhs)
     lhs_mql = process_lhs(self, compiler, connection)

django_mongodb_backend/query.py

@@ -329,8 +329,9 @@ def where_node(self, compiler, connection, **extra):
     if not mql:
         raise FullResultSet
 
+    as_expr = extra.get("as_expr")
     if self.negated and mql:
-        mql = {"$nor": [mql]}
+        mql = {"$nor": [mql]} if not as_expr else {"$not": [mql]}
 
     return mql