Implementation of KeyTransformIsNull, KeyTransformIn.

Author: WaVEV

django_mongodb/features.py

@@ -7,6 +7,7 @@ class DatabaseFeatures(BaseDatabaseFeatures):
     supports_ignore_conflicts = False
     # Not implemented: https://github.com/mongodb-labs/django-mongodb/issues/8
     supports_json_field = True
+    supports_json_field_contains = False
     has_native_json_field = True
     # Not implemented: https://github.com/mongodb-labs/django-mongodb/issues/7
     supports_transactions = False
@@ -297,4 +298,9 @@ class DatabaseFeatures(BaseDatabaseFeatures):
             "model_fields.test_jsonfield.JSONFieldTests.test_invalid_value",
             "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",
+        },
+        "Pipeline filtering": {"model_fields.test_jsonfield.TestQuerying.test_icontains"},
     }

django_mongodb/fields.py

@@ -1,5 +1,6 @@
 from bson import ObjectId, errors
 from django.core import exceptions
+from django.db import NotSupportedError
 from django.db.models import JSONField
 from django.db.models.fields import AutoField, Field
 from django.db.models.fields.json import (
@@ -11,6 +12,8 @@
     HasKeys,
     JSONExact,
     KeyTransform,
+    KeyTransformIn,
+    KeyTransformIsNull,
 )
 from django.utils.translation import gettext_lazy as _
 
@@ -59,8 +62,14 @@ def from_db_value(self, value, expression, connection):
     )
 
 
-def process_rhs(node, compiler, 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 []
@@ -78,41 +87,33 @@ def key_transform(self, compiler, connection):
     return ".".join([lhs_mql, *key_transforms])
 
 
-def data_contains(self, compiler, connection):
-    lhs_mql = process_lhs(self, compiler, connection)
-    value = process_rhs(self, compiler, connection)
-    if not value:
-        return {lhs_mql: {"$type": "array"}}
-    if isinstance(value, list):
-        return {"$and": [{lhs_mql: v} for v in value]}
-    if isinstance(value, dict):
-        return {"$and": [{f"{lhs_mql}.{k}": v} for k, v in value.items()]}
-    return {lhs_mql: value}
+def data_contains(self, compiler, connection):  # noqa: ARG001
+    raise NotSupportedError("contains lookup is not supported on this database backend.")
+
+
+def contained_by(self, compiler, connection):  # noqa: ARG001
+    raise NotSupportedError("contained_by lookup is not supported on this database backend.")
 
 
 def json_exact(self, compiler, connection):
+    rhs_mql = json_process_rhs(self, compiler, connection)
+    lhs_mql = process_lhs(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 = process_rhs(self, compiler, connection)
-    return {lhs_mql: {"$eq": rhs_mql}}
+    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}}]}
 
 
-def contained_by(self, compiler, connection):
+def key_transform_in(self, compiler, connection):
     lhs_mql = process_lhs(self, compiler, connection)
-    value = process_rhs(self, compiler, connection)
-    if isinstance(value, list):
-        if not value:
-            return {lhs_mql: []}
-        return {"$and": [{"$or": [{lhs_mql: v}, {lhs_mql: {"$exists": False}}]} for v in value]}
-    if isinstance(value, dict):
-        if not value:
-            return {lhs_mql: {}}
-        return {
-            "$and": [
-                {"$or": [{f"{lhs_mql}.{k}": v}, {f"{lhs_mql}.{k}": {"$exists": False}}]}
-                for k, v in value.items()
-            ]
-        }
-    return {lhs_mql: value}
+    value = json_process_rhs(self, compiler, connection)
+    rhs_mql = connection.operators[self.lookup_name](value)
+    return {lhs_mql: rhs_mql}
 
 
 def has_key_lookup(self, compiler, connection):
@@ -124,9 +125,7 @@ def has_key_lookup(self, compiler, connection):
     for key in rhs:
         if isinstance(key, KeyTransform):
             *_, rhs_key_transforms = key.preprocess_lhs(compiler, connection)
-            rhs_key_transforms = ".".join(
-                rhs_key_transforms
-            )  # process_lhs(key, compiler, connection)
+            rhs_key_transforms = ".".join(rhs_key_transforms)
         else:
             rhs_key_transforms = str(key)
         rhs_json_path = f"{lhs}.{rhs_key_transforms}"
@@ -151,3 +150,5 @@ def load_fields():
     HasAnyKeys.mongo_operator = "$or"
     HasKey.mongo_operator = None
     HasKeys.mongo_operator = "$and"
+    KeyTransformIsNull.as_mql = key_transform_isnull
+    KeyTransformIn.as_mql = key_transform_in

django_mongodb/query.py

@@ -155,7 +155,7 @@ def where_node(self, compiler, connection):
 
     if self.negated and mql:
         lhs, rhs = next(iter(mql.items()))
-        mql = {lhs: {"$not": rhs}}
+        mql = {"$nor": rhs} if lhs == "$or" else {lhs: {"$not": rhs}}
 
     return mql