Reorder skiped test and remove toString in regex.

Author: WaVEV

django_mongodb/features.py

@@ -8,7 +8,6 @@ class DatabaseFeatures(BaseDatabaseFeatures):
     supports_date_lookup_using_string = False
     supports_foreign_keys = False
     supports_ignore_conflicts = False
-    supports_json_field = True
     supports_json_field_contains = False
     has_native_json_field = True
     # BSON Date type doesn't support microsecond precision.
@@ -42,8 +41,12 @@ class DatabaseFeatures(BaseDatabaseFeatures):
         # tuple index out of range in process_rhs()
         "lookup.tests.LookupTests.test_exact_sliced_queryset_limit_one",
         "lookup.tests.LookupTests.test_exact_sliced_queryset_limit_one_offset",
+        # Regex lookup doesn't work on non-string fields.
+        "lookup.tests.LookupTests.test_regex_non_string",
         # Substr not implemented.
-        "lookup.tests.LookupTests.test_pattern_lookups_with_substr",
+        "lookup.tests.LookupTests.test_pattern_lookups_with_substr"
+        # Querying ObjectID with string doesn't work.
+        "lookup.tests.LookupTests.test_lookup_int_as_str",
         # Regex lookup doesn't work on json fields.
         "model_fields.test_jsonfield.TestQuerying.test_icontains",
         # MongoDB gives the wrong result of log(number, base) when base is a
@@ -252,10 +255,9 @@ def django_test_expected_failures(self):
             "expressions.tests.NegatedExpressionTests.test_filter",
             "expressions_case.tests.CaseExpressionTests.test_annotate_values_not_in_order_by",
             "expressions_case.tests.CaseExpressionTests.test_order_by_conditional_implicit",
+            "model_fields.test_jsonfield.TestQuerying.test_ordering_grouping_by_count",
             # annotate().filter().count() gives incorrect results.
             "db_functions.datetime.test_extract_trunc.DateFunctionTests.test_extract_year_exact_lookup",
-            # FieldDoesNotExist with ordering.
-            "model_fields.test_jsonfield.TestQuerying.test_ordering_grouping_by_count",
         },
         "Count doesn't work in QuerySet.annotate()": {
             "annotations.tests.AliasTests.test_alias_annotate_with_aggregation",

django_mongodb/query_utils.py

@@ -48,6 +48,4 @@ def process_rhs(node, compiler, connection):
 def regex_match(field, value, regex, *re_args, **re_kwargs):
     regex = re.compile(regex % re.escape(value), *re_args, **re_kwargs)
     options = "i" if regex.flags & re.I else ""
-    return {
-        "$regexMatch": {"input": {"$toString": field}, "regex": regex.pattern, "options": options}
-    }
+    return {"$regexMatch": {"input": field, "regex": regex.pattern, "options": options}}