Add test_values_in_subquery to queries_

Author: WaVEV

django_mongodb/features.py

@@ -77,6 +77,10 @@ class DatabaseFeatures(BaseDatabaseFeatures):
         # Connection creation doesn't follow the usual Django API.
         "backends.tests.ThreadTests.test_pass_connection_between_threads",
         "backends.tests.ThreadTests.test_default_connection_thread_local",
+        # 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.

tests/queries_/models.py

@@ -1,6 +1,6 @@
 from django.db import models
 
-from django_mongodb.fields import ObjectIdField
+from django_mongodb.fields import ObjectIdAutoField, ObjectIdField
 
 
 class Author(models.Model):
@@ -31,3 +31,25 @@ class Tag(models.Model):
 
     def __str__(self):
         return self.name
+
+
+class Order(models.Model):
+    id = ObjectIdAutoField(primary_key=True)
+    name = models.CharField(max_length=12, null=True, default="")
+
+    class Meta:
+        ordering = ("pk",)
+
+    def __str__(self):
+        return str(self.pk)
+
+
+class OrderItem(models.Model):
+    order = models.ForeignKey(Order, models.CASCADE, related_name="items")
+    status = ObjectIdField(null=True)
+
+    class Meta:
+        ordering = ("pk",)
+
+    def __str__(self):
+        return str(self.pk)

tests/queries_/test_objectid.py

@@ -1,7 +1,7 @@
 from bson import ObjectId
 from django.test import TestCase
 
-from .models import Tag
+from .models import Order, OrderItem, Tag
 
 
 class ObjectIdTests(TestCase):
@@ -96,3 +96,20 @@ def test_invalid_object_id(self):
         msg = f"Field 'group_id' expected an ObjectId but got '{value}'."
         with self.assertRaisesMessage(ValueError, msg):
             Tag.objects.filter(group_id=value)
+
+    def test_values_in_subquery(self):
+        # If a values() queryset is used, then the given values
+        # will be used instead of forcing use of the relation's field.
+        o1 = Order.objects.create()
+        o2 = Order.objects.create()
+        oi1 = OrderItem.objects.create(order=o1, status=None)
+        oi1.status = oi1.pk
+        oi1.save()
+        OrderItem.objects.create(order=o2, status=None)
+
+        # The query below should match o1 as it has related order_item
+        # with id == status.
+        self.assertSequenceEqual(
+            Order.objects.filter(items__in=OrderItem.objects.values_list("status")),
+            [o1],
+        )