Handle F keystransform.

Author: WaVEV

django_mongodb/features.py

@@ -299,8 +299,8 @@ class DatabaseFeatures(BaseDatabaseFeatures):
             "model_fields.test_jsonfield.JSONFieldTests.test_db_check_constraints",
         },
         "Mongodb's Null behaviour is different from sql's": {
-            "model_fields.test_jsonfield.TestQuerying.test_none_key_exclude",
-            "model_fields.test_jsonfield.TestQuerying.test_isnull_key",
+            "model_fields.test_jsonfield.TestQuerying.test_none_key_and_exact_lookup",
+            # "model_fields.test_jsonfield.TestQuerying.test_isnull_key",
         },
         "Pipeline filtering": {"model_fields.test_jsonfield.TestQuerying.test_icontains"},
     }

django_mongodb/fields.py

@@ -65,14 +65,15 @@ def from_db_value(self, value, expression, connection):
 def json_process_rhs(node, compiler, connection):
     _, value = node.process_rhs(compiler, connection)
 
-    # Django's framework transform the [None] into a [null],
-    # we have to revertit.
-    if value == ["null"]:
-        value = [None]
-
     lookup_name = node.lookup_name
     if lookup_name not in ("in", "range"):
         value = value[0] if len(value) > 0 else []
+    else:
+        result_value = []
+        for ind, elem in enumerate(node.rhs):
+            item = f"${value[ind]}" if isinstance(elem, KeyTransform) else value[ind]
+            result_value.append(item)
+        value = result_value
 
     return value
 
@@ -96,24 +97,31 @@ def contained_by(self, compiler, connection):  # noqa: ARG001
 
 
 def json_exact(self, compiler, connection):
-    rhs_mql = json_process_rhs(self, compiler, connection)
     lhs_mql = process_lhs(self, compiler, connection)
+    rhs_mql = json_process_rhs(self, compiler, connection)
+    if rhs_mql == "null":
+        return {"$or": [{lhs_mql: {"$eq": None}}, {lhs_mql: {"$exists": False}}]}
+        # return {lhs_mql: {"$eq": None, "$exists": True}}
+        # return key_transform_isnull(self, compiler, connection)
     return {lhs_mql: {"$eq": rhs_mql, "$exists": True}}
 
 
 def key_transform_isnull(self, compiler, connection):
     lhs_mql = process_lhs(self, compiler, connection)
     rhs_mql = json_process_rhs(self, compiler, connection)
-    if rhs_mql is False:
-        return {lhs_mql: {"$neq": None}}
-    return {"$or": [{lhs_mql: {"$eq": None}}, {lhs_mql: {"$exists": False}}]}
+    # if rhs_mql is False:
+    #     return {lhs_mql: {"$neq": None}}
+    # return {"$or": [{lhs_mql: {"$eq": None}}, {lhs_mql: {"$exists": False}}]}
+
+    # https://code.djangoproject.com/ticket/32252
+    return {lhs_mql: {"$exists": not rhs_mql}}
 
 
 def key_transform_in(self, compiler, connection):
     lhs_mql = process_lhs(self, compiler, connection)
     value = json_process_rhs(self, compiler, connection)
     rhs_mql = connection.operators[self.lookup_name](value)
-    return {lhs_mql: rhs_mql}
+    return {"$expr": {lhs_mql: rhs_mql}}
 
 
 def has_key_lookup(self, compiler, connection):

django_mongodb/lookups.py

@@ -1,6 +1,12 @@
 from django.db import NotSupportedError
 from django.db.models.fields.related_lookups import In, MultiColSource, RelatedIn
-from django.db.models.lookups import BuiltinLookup, Exact, IsNull, UUIDTextMixin
+from django.db.models.lookups import (
+    BuiltinLookup,
+    Exact,
+    FieldGetDbPrepValueIterableMixin,
+    IsNull,
+    UUIDTextMixin,
+)
 
 from .query_utils import process_lhs, process_rhs
 
@@ -42,10 +48,25 @@ def uuid_text_mixin(self, compiler, connection):  # noqa: ARG001
     raise NotSupportedError("Pattern lookups on UUIDField are not supported.")
 
 
+_resolve_expression_parameter = FieldGetDbPrepValueIterableMixin.resolve_expression_parameter
+
+
+def resolve_expression_parameter(self, compiler, connection, sql, param):
+    if connection.vendor == "mongodb":
+        params = [param]
+        if hasattr(param, "resolve_expression"):
+            param = param.resolve_expression(compiler.query)
+        if hasattr(param, "as_mql"):
+            params = [param.as_mql(compiler, connection)]
+        return "", params
+    return _resolve_expression_parameter(self, compiler, connection, sql, param)
+
+
 def register_lookups():
     BuiltinLookup.as_mql = builtin_lookup
     BuiltinLookup.as_mql_agg = builtin_lookup_agg
     Exact.as_mql = exact
     In.as_mql = RelatedIn.as_mql = in_
     IsNull.as_mql = is_null
     UUIDTextMixin.as_mql = uuid_text_mixin
+    FieldGetDbPrepValueIterableMixin.resolve_expression_parameter = resolve_expression_parameter