Add ObjectIdField.

Author: WaVEV

django_mongodb/features.py

@@ -78,10 +78,6 @@ class DatabaseFeatures(BaseDatabaseFeatures):
         "queries.test_qs_combinators.QuerySetSetOperationTests.test_union_in_subquery_related_outerref",
         "queries.test_qs_combinators.QuerySetSetOperationTests.test_union_in_subquery",
         "queries.test_qs_combinators.QuerySetSetOperationTests.test_union_in_with_ordering",
-        # ObjectId type mismatch in a subquery:
-        # https://github.com/mongodb-labs/django-mongodb/issues/161
-        "queries.tests.RelatedLookupTypeTests.test_values_queryset_lookup",
-        "queries.tests.ValuesSubqueryTests.test_values_in_subquery",
         # Object of type ObjectId is not JSON serializable.
         "auth_tests.test_views.LoginTest.test_login_session_without_hash_session_key",
         # GenericRelation.value_to_string() assumes integer pk.

django_mongodb/fields/__init__.py

@@ -1,8 +1,9 @@
 from .auto import ObjectIdAutoField
 from .duration import register_duration_field
 from .json import register_json_field
+from .object_id import ObjectIdField
 
-__all__ = ["register_fields", "ObjectIdAutoField"]
+__all__ = ["register_fields", "ObjectIdAutoField", "ObjectIdField"]
 
 
 def register_fields():

django_mongodb/fields/object_id.py

@@ -0,0 +1,37 @@
+from bson import ObjectId
+from bson.errors import InvalidId
+from django.core import exceptions
+from django.db.models.fields import Field
+from django.utils.translation import gettext_lazy as _
+
+
+class ObjectIdField(Field):
+    default_error_messages = {
+        "invalid": _("“%(value)s” value must be an Object Id."),
+    }
+    description = _("ObjectId")
+
+    def get_internal_type(self):
+        return "ObjectIdField"
+
+    def db_type(self, connection):
+        return "objectId"
+
+    def rel_db_type(self, connection):
+        return "objectId"
+
+    def to_python(self, value):
+        try:
+            return ObjectId(value)
+        except (TypeError, InvalidId):
+            raise exceptions.ValidationError(
+                self.error_messages["invalid"],
+                code="invalid",
+                params={"value": value},
+            ) from None
+
+    def deconstruct(self):
+        name, path, args, kwargs = super().deconstruct()
+        if path.startswith("django_mongodb.fields.auto"):
+            path = path.replace("django_mongodb.fields.auto", "django_mongodb.fields")
+        return name, path, args, kwargs