test triage and rhs json handle.

Author: WaVEV

django_mongodb/base.py

@@ -80,7 +80,7 @@ class DatabaseWrapper(BaseDatabaseWrapper):
         "lte": lambda val: {"$lte": val},
         "in": lambda val: {"$in": val},
         "range": lambda val: {"$gte": val[0], "$lte": val[1]},
-        "isnull": lambda val: None if val else {"$ne": None},
+        "isnull": lambda val: None if val else {"$ne": None, "$exists": True},
         "iexact": safe_regex("^%s$", re.IGNORECASE),
         "startswith": safe_regex("^%s"),
         "istartswith": safe_regex("^%s", re.IGNORECASE),

django_mongodb/expressions.py

@@ -1,4 +1,6 @@
-from django.db.models.expressions import Col, Value
+from django.db import NotSupportedError
+from django.db.models.expressions import Col, ExpressionWrapper, Value
+from django.db.models.functions.comparison import Cast
 
 
 def col(self, compiler, connection):  # noqa: ARG001
@@ -13,7 +15,22 @@ def value_agg(self, compiler, connection):  # noqa: ARG001
     return {"$literal": self.value}
 
 
+def expression(self, compiler, connection):
+    return self.expression.as_mql(compiler, connection)
+
+
+def expression_agg(self, compiler, connection):
+    return self.expression.as_mql_agg(compiler, connection)
+
+
+def cast(self, compiler, connection):  # noqa: ARG001
+    raise NotSupportedError("Cast is not supported on this database backend")
+
+
 def register_expressions():
     Col.as_mql = col
     Value.as_mql = value
     Value.as_mql_agg = value_agg
+    ExpressionWrapper.as_mql = expression
+    ExpressionWrapper.as_mql_agg = expression_agg
+    Cast.as_mql = cast

django_mongodb/features.py

@@ -165,6 +165,7 @@ class DatabaseFeatures(BaseDatabaseFeatures):
             "db_functions.datetime.test_extract_trunc.DateFunctionTests.test_extract_outerref",
             "db_functions.datetime.test_extract_trunc.DateFunctionTests.test_trunc_subquery_with_parameters",
             "lookup.tests.LookupQueryingTests.test_filter_subquery_lhs",
+            "model_fields.test_jsonfield.TestQuerying.test_usage_in_subquery",
             # ExpressionWrapper not supported.
             "annotations.tests.NonAggregateAnnotationTestCase.test_combined_expression_annotation_with_aggregation",
             "annotations.tests.NonAggregateAnnotationTestCase.test_combined_f_expression_annotation_with_aggregation",
@@ -202,6 +203,9 @@ class DatabaseFeatures(BaseDatabaseFeatures):
             # Year lookup + lt/gt crashes: 'dict' object has no attribute 'startswith'
             "db_functions.datetime.test_extract_trunc.DateFunctionTests.test_extract_year_greaterthan_lookup",
             "db_functions.datetime.test_extract_trunc.DateFunctionTests.test_extract_year_lessthan_lookup",
+            "model_fields.test_jsonfield.TestQuerying.test_nested_key_transform_on_subquery",
+            "model_fields.test_jsonfield.TestQuerying.test_ordering_grouping_by_count",
+            "model_fields.test_jsonfield.TestQuerying.test_obj_subquery_lookup",
         },
         "Count doesn't work in QuerySet.annotate()": {
             "annotations.tests.AliasTests.test_alias_annotate_with_aggregation",
@@ -276,6 +280,10 @@ class DatabaseFeatures(BaseDatabaseFeatures):
             "update.tests.SimpleTest.test_empty_update_with_inheritance",
             "update.tests.SimpleTest.test_foreign_key_update_with_id",
             "update.tests.SimpleTest.test_nonempty_update_with_inheritance",
+            "model_fields.test_jsonfield.TestQuerying.test_ordering_grouping_by_key_transform",
+            "model_fields.test_jsonfield.TestQuerying.test_ordering_by_transform",
+            "model_fields.test_jsonfield.TestQuerying.test_order_grouping_custom_decoder",
+            "model_fields.test_jsonfield.TestQuerying.test_join_key_transform_annotation_expression",
         },
         "Test inspects query for SQL": {
             "lookup.tests.LookupTests.test_in_ignore_none",
@@ -290,6 +298,9 @@ class DatabaseFeatures(BaseDatabaseFeatures):
             "timezones.tests.NewDatabaseTests.test_cursor_execute_returns_naive_datetime",
             "timezones.tests.NewDatabaseTests.test_cursor_explicit_time_zone",
             "timezones.tests.NewDatabaseTests.test_raw_sql",
+            "model_fields.test_jsonfield.TestQuerying.test_key_transform_raw_expression",
+            "model_fields.test_jsonfield.TestQuerying.test_key_sql_injection_escape",
+            "model_fields.test_jsonfield.TestQuerying.test_nested_key_transform_raw_expression",
         },
         "Transform not supported.": {
             "db_functions.math.test_abs.AbsTests.test_transform",
@@ -340,6 +351,8 @@ class DatabaseFeatures(BaseDatabaseFeatures):
         "Mongodb's Null behaviour is different from sql's": {
             "model_fields.test_jsonfield.TestQuerying.test_none_key_and_exact_lookup",
             # "model_fields.test_jsonfield.TestQuerying.test_isnull_key",
+            "model_fields.test_jsonfield.TestSaveLoad.test_json_null_different_from_sql_null",
+            "model_fields.test_jsonfield.TestQuerying.test_none_key",
         },
         "Pipeline filtering": {"model_fields.test_jsonfield.TestQuerying.test_icontains"},
     }

django_mongodb/fields.py

@@ -63,6 +63,9 @@ def from_db_value(self, value, expression, connection):
 
 
 def json_process_rhs(node, compiler, connection):
+    rhs = node.rhs
+    if hasattr(rhs, "as_mql"):
+        return rhs.as_mql(compiler, connection)
     _, value = node.process_rhs(compiler, connection)
     lookup_name = node.lookup_name
     if lookup_name not in ("in", "range"):

django_mongodb/query_utils.py

@@ -19,7 +19,7 @@ def process_lhs(node, compiler, connection, bare_column_ref=False):
     return mql
 
 
-def process_rhs(node, compiler, connection):
+def process_rhs(node, compiler, connection, json_column_ref=False):
     rhs = node.rhs
     if hasattr(rhs, "as_mql"):
         return rhs.as_mql(compiler, connection)
@@ -30,11 +30,11 @@ def process_rhs(node, compiler, connection):
         value = value[0]
     # Remove percent signs added by PatternLookup.process_rhs() for LIKE
     # queries.
-    if lookup_name in ("startswith", "istartswith"):
+    if lookup_name in ("startswith", "istartswith") and json_column_ref is False:
         value = value[:-1]
-    elif lookup_name in ("endswith", "iendswith"):
+    elif lookup_name in ("endswith", "iendswith") and json_column_ref is False:
         value = value[1:]
-    elif lookup_name in ("contains", "icontains"):
+    elif lookup_name in ("contains", "icontains") and json_column_ref is False:
         value = value[1:-1]
 
     return connection.ops.prep_lookup_value(value, node.lhs.output_field, node.lookup_name)