test triage and rhs json handle.

Author: WaVEV

django_mongodb/features.py

@@ -251,6 +251,9 @@ def django_test_expected_failures(self):
             "expressions_case.tests.CaseExpressionTests.test_order_by_conditional_implicit",
             # annotate().filter().count() gives incorrect results.
             "db_functions.datetime.test_extract_trunc.DateFunctionTests.test_extract_year_exact_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",
@@ -345,6 +348,10 @@ def django_test_expected_failures(self):
             "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",
@@ -359,6 +366,9 @@ def django_test_expected_failures(self):
             "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",
         },
         "Bilateral transform not implemented.": {
             "db_functions.tests.FunctionTests.test_func_transform_bilateral",
@@ -416,7 +426,8 @@ def django_test_expected_failures(self):
         },
         "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/auto.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

@@ -24,7 +24,7 @@ def process_lhs(node, compiler, connection):
     return node.lhs.as_mql(compiler, connection)
 
 
-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)
@@ -35,11 +35,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)