Add support join extra conditions

django/contrib/sites/migrations/0001_initial.py

@@ -1,3 +1,5 @@
+from django_mongodb.fields import ObjectIdAutoField
+
 import django.contrib.sites.models
 from django.contrib.sites.models import _simple_domain_name_validator
 from django.db import migrations, models
@@ -12,7 +14,7 @@ class Migration(migrations.Migration):
             fields=[
                 (
                     "id",
-                    models.AutoField(
+                    ObjectIdAutoField(
                         verbose_name="ID",
                         serialize=False,
                         auto_created=True,

tests/aggregation_regress/models.py

@@ -1,3 +1,5 @@
+from django_mongodb.fields import ObjectIdAutoField
+
 from django.contrib.contenttypes.fields import GenericForeignKey, GenericRelation
 from django.contrib.contenttypes.models import ContentType
 from django.db import models
@@ -17,7 +19,7 @@ class Publisher(models.Model):
 class ItemTag(models.Model):
     tag = models.CharField(max_length=100)
     content_type = models.ForeignKey(ContentType, models.CASCADE)
-    object_id = models.PositiveIntegerField()
+    object_id = models.CharField(max_length=24)
     content_object = GenericForeignKey("content_type", "object_id")
 
 
@@ -45,13 +47,13 @@ class Store(models.Model):
 
 
 class Entries(models.Model):
-    EntryID = models.AutoField(primary_key=True, db_column="Entry ID")
+    EntryID = ObjectIdAutoField(primary_key=True, db_column="Entry ID")
     Entry = models.CharField(unique=True, max_length=50)
     Exclude = models.BooleanField(default=False)
 
 
 class Clues(models.Model):
-    ID = models.AutoField(primary_key=True)
+    ID = ObjectIdAutoField(primary_key=True)
     EntryID = models.ForeignKey(
         Entries, models.CASCADE, verbose_name="Entry", db_column="Entry ID"
     )
@@ -63,7 +65,7 @@ class WithManualPK(models.Model):
     # classes with the same PK value, and there are some (external)
     # DB backends that don't work nicely when assigning integer to AutoField
     # column (MSSQL at least).
-    id = models.IntegerField(primary_key=True)
+    id = ObjectIdAutoField(primary_key=True)
 
 
 class HardbackBook(Book):

tests/aggregation_regress/tests.py

@@ -6,7 +6,6 @@
 
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import FieldError
-from django.db import connection
 from django.db.models import (
     Aggregate,
     Avg,
@@ -184,7 +183,7 @@ def test_annotation_with_value(self):
             )
             .annotate(sum_discount=Sum("discount_price"))
         )
-        with self.assertNumQueries(1) as ctx:
+        with self.assertNumQueries(1):
             self.assertSequenceEqual(
                 values,
                 [
@@ -194,8 +193,8 @@ def test_annotation_with_value(self):
                     }
                 ],
             )
-        if connection.features.allows_group_by_select_index:
-            self.assertIn("GROUP BY 1", ctx[0]["sql"])
+        # if connection.features.allows_group_by_select_index:
+        #     self.assertIn("GROUP BY 1", ctx[0]["sql"])
 
     def test_aggregates_in_where_clause(self):
         """
@@ -829,7 +828,7 @@ def test_empty(self):
             ],
         )
 
-    def test_more_more(self):
+    def test_more_more1(self):
         # Regression for #10113 - Fields mentioned in order_by() must be
         # included in the GROUP BY. This only becomes a problem when the
         # order_by introduces a new join.
@@ -849,6 +848,7 @@ def test_more_more(self):
             lambda b: b.name,
         )
 
+    def test_more_more2(self):
         # Regression for #10127 - Empty select_related() works with annotate
         qs = (
             Book.objects.filter(rating__lt=4.5)
@@ -877,6 +877,7 @@ def test_more_more(self):
             lambda b: (b.name, b.authors__age__avg, b.publisher.name, b.contact.name),
         )
 
+    def test_more_more3(self):
         # Regression for #10132 - If the values() clause only mentioned extra
         # (select=) columns, those columns are used for grouping
         qs = (
@@ -911,6 +912,7 @@ def test_more_more(self):
             ],
         )
 
+    def test_more_more4(self):
         # Regression for #10182 - Queries with aggregate calls are correctly
         # realiased when used in a subquery
         ids = (
@@ -927,6 +929,7 @@ def test_more_more(self):
             lambda b: b.name,
         )
 
+    def test_more_more5(self):
         # Regression for #15709 - Ensure each group_by field only exists once
         # per query
         qstr = str(
@@ -1023,7 +1026,7 @@ def test_pickle(self):
             query,
         )
 
-    def test_more_more_more(self):
+    def test_more_more_more1(self):
         # Regression for #10199 - Aggregate calls clone the original query so
         # the original query can still be used
         books = Book.objects.all()
@@ -1042,6 +1045,7 @@ def test_more_more_more(self):
             lambda b: b.name,
         )
 
+    def test_more_more_more2(self):
         # Regression for #10248 - Annotations work with dates()
         qs = (
             Book.objects.annotate(num_authors=Count("authors"))
@@ -1056,6 +1060,7 @@ def test_more_more_more(self):
             ],
         )
 
+    def test_more_more_more3(self):
         # Regression for #10290 - extra selects with parameters can be used for
         # grouping.
         qs = (
@@ -1068,6 +1073,7 @@ def test_more_more_more(self):
             qs, [150, 175, 224, 264, 473, 566], lambda b: int(b["sheets"])
         )
 
+    def test_more_more_more4(self):
         # Regression for 10425 - annotations don't get in the way of a count()
         # clause
         self.assertEqual(
@@ -1077,6 +1083,7 @@ def test_more_more_more(self):
             Book.objects.annotate(Count("publisher")).values("publisher").count(), 6
         )
 
+    def test_more_more_more5(self):
         # Note: intentionally no order_by(), that case needs tests, too.
         publishers = Publisher.objects.filter(id__in=[self.p1.id, self.p2.id])
         self.assertEqual(sorted(p.name for p in publishers), ["Apress", "Sams"])
@@ -1100,6 +1107,7 @@ def test_more_more_more(self):
         )
         self.assertEqual(sorted(p.name for p in publishers), ["Apress", "Sams"])
 
+    def test_more_more_more6(self):
         # Regression for 10666 - inherited fields work with annotations and
         # aggregations
         self.assertEqual(
@@ -1152,6 +1160,7 @@ def test_more_more_more(self):
             ],
         )
 
+    def test_more_more_more7(self):
         # Regression for #10766 - Shouldn't be able to reference an aggregate
         # fields in an aggregate() call.
         msg = "Cannot compute Avg('mean_age'): 'mean_age' is an aggregate"

tests/backends/models.py

@@ -1,3 +1,5 @@
+from django_mongodb.fields import ObjectIdAutoField
+
 from django.contrib.contenttypes.fields import GenericForeignKey, GenericRelation
 from django.contrib.contenttypes.models import ContentType
 from django.db import models
@@ -47,7 +49,7 @@ class Meta:
 
 
 class VeryLongModelNameZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ(models.Model):
-    primary_key_is_quite_long_zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz = models.AutoField(
+    primary_key_is_quite_long_zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz = ObjectIdAutoField(
         primary_key=True
     )
     charfield_is_quite_long_zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz = models.CharField(
@@ -165,7 +167,7 @@ class Book(models.Model):
 
 
 class SQLKeywordsModel(models.Model):
-    id = models.AutoField(primary_key=True, db_column="select")
+    id = ObjectIdAutoField(primary_key=True, db_column="select")
     reporter = models.ForeignKey(Reporter, models.CASCADE, db_column="where")
 
     class Meta:

tests/backends/tests.py

@@ -79,7 +79,7 @@ def test_last_executed_query_without_previous_query(self):
     def test_debug_sql(self):
         list(Reporter.objects.filter(first_name="test"))
         sql = connection.queries[-1]["sql"].lower()
-        self.assertIn("select", sql)
+        self.assertIn("$match", sql)
         self.assertIn(Reporter._meta.db_table, sql)
 
     def test_query_encoding(self):
@@ -225,6 +225,7 @@ def test_sequence_name_length_limits_flush(self):
         connection.ops.execute_sql_flush(sql_list)
 
 
+@skipUnlessDBFeature("supports_sequence_reset")
 class SequenceResetTest(TestCase):
     def test_generic_relation(self):
         "Sequence names are correct when resetting generic relations (Ref #13941)"
@@ -261,14 +262,12 @@ def receiver(sender, connection, **kwargs):
 
         connection_created.connect(receiver)
         connection.close()
-        with connection.cursor():
-            pass
+        connection.connection
         self.assertIs(data["connection"].connection, connection.connection)
 
         connection_created.disconnect(receiver)
         data.clear()
-        with connection.cursor():
-            pass
+        connection.connection
         self.assertEqual(data, {})
 
 

tests/basic/models.py

@@ -51,7 +51,7 @@ class PrimaryKeyWithDefault(models.Model):
 
 
 class PrimaryKeyWithDbDefault(models.Model):
-    uuid = models.IntegerField(primary_key=True, db_default=1)
+    uuid = models.IntegerField(primary_key=True, db_default=models.Value(1))
 
 
 class ChildPrimaryKeyWithDefault(PrimaryKeyWithDefault):

tests/delete/models.py

@@ -219,21 +219,21 @@ class DeleteBottom(models.Model):
 
 class GenericB1(models.Model):
     content_type = models.ForeignKey(ContentType, on_delete=models.CASCADE)
-    object_id = models.PositiveIntegerField()
+    object_id = models.CharField(max_length=24)
     generic_delete_top = GenericForeignKey("content_type", "object_id")
 
 
 class GenericB2(models.Model):
     content_type = models.ForeignKey(ContentType, on_delete=models.CASCADE)
-    object_id = models.PositiveIntegerField()
+    object_id = models.CharField(max_length=24)
     generic_delete_top = GenericForeignKey("content_type", "object_id")
     generic_delete_bottom = GenericRelation("GenericDeleteBottom")
 
 
 class GenericDeleteBottom(models.Model):
     generic_b1 = models.ForeignKey(GenericB1, models.RESTRICT)
     content_type = models.ForeignKey(ContentType, on_delete=models.CASCADE)
-    object_id = models.PositiveIntegerField()
+    object_id = models.CharField(max_length=24)
     generic_b2 = GenericForeignKey()
 
 

tests/delete_regress/models.py

@@ -5,7 +5,7 @@
 
 class Award(models.Model):
     name = models.CharField(max_length=25)
-    object_id = models.PositiveIntegerField()
+    object_id = models.CharField(max_length=24)
     content_type = models.ForeignKey(ContentType, models.CASCADE)
     content_object = GenericForeignKey()
 

tests/generic_relations/models.py

@@ -19,7 +19,7 @@ class TaggedItem(models.Model):
 
     tag = models.SlugField()
     content_type = models.ForeignKey(ContentType, models.CASCADE)
-    object_id = models.PositiveIntegerField()
+    object_id = models.TextField()
 
     content_object = GenericForeignKey()
 
@@ -40,7 +40,7 @@ class AbstractComparison(models.Model):
     content_type1 = models.ForeignKey(
         ContentType, models.CASCADE, related_name="comparative1_set"
     )
-    object_id1 = models.PositiveIntegerField()
+    object_id1 = models.TextField()
 
     first_obj = GenericForeignKey(ct_field="content_type1", fk_field="object_id1")
 
@@ -54,7 +54,7 @@ class Comparison(AbstractComparison):
     content_type2 = models.ForeignKey(
         ContentType, models.CASCADE, related_name="comparative2_set"
     )
-    object_id2 = models.PositiveIntegerField()
+    object_id2 = models.TextField()
 
     other_obj = GenericForeignKey(ct_field="content_type2", fk_field="object_id2")
 
@@ -119,20 +119,20 @@ class ValuableRock(Mineral):
 
 
 class ManualPK(models.Model):
-    id = models.IntegerField(primary_key=True)
+    id = models.TextField(primary_key=True)
     tags = GenericRelation(TaggedItem, related_query_name="manualpk")
 
 
 class ForProxyModelModel(models.Model):
     content_type = models.ForeignKey(ContentType, models.CASCADE)
-    object_id = models.PositiveIntegerField()
+    object_id = models.TextField()
     obj = GenericForeignKey(for_concrete_model=False)
     title = models.CharField(max_length=255, null=True)
 
 
 class ForConcreteModelModel(models.Model):
     content_type = models.ForeignKey(ContentType, models.CASCADE)
-    object_id = models.PositiveIntegerField()
+    object_id = models.TextField()
     obj = GenericForeignKey()
 
 

tests/generic_relations/tests.py

@@ -1,3 +1,5 @@
+from bson import ObjectId
+
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.contenttypes.prefetch import GenericPrefetch
 from django.core.exceptions import FieldError
@@ -44,7 +46,7 @@ def setUpTestData(cls):
 
     def comp_func(self, obj):
         # Original list of tags:
-        return obj.tag, obj.content_type.model_class(), obj.object_id
+        return obj.tag, obj.content_type.model_class(), ObjectId(obj.object_id)
 
     async def test_generic_async_acreate(self):
         await self.bacon.tags.acreate(tag="orange")
@@ -258,10 +260,11 @@ def test_queries_content_type_restriction(self):
             Animal.objects.filter(tags__tag="fatty"),
             [self.platypus],
         )
-        self.assertSequenceEqual(
-            Animal.objects.exclude(tags__tag="fatty"),
-            [self.lion],
-        )
+        # Exists is not supported in MongoDB.
+        # self.assertSequenceEqual(
+        #     Animal.objects.exclude(tags__tag="fatty"),
+        #     [self.lion],
+        # )
 
     def test_object_deletion_with_generic_relation(self):
         """
@@ -639,13 +642,7 @@ def test_unsaved_generic_foreign_key_parent_bulk_create(self):
 
     def test_cache_invalidation_for_content_type_id(self):
         # Create a Vegetable and Mineral with the same id.
-        new_id = (
-            max(
-                Vegetable.objects.order_by("-id")[0].id,
-                Mineral.objects.order_by("-id")[0].id,
-            )
-            + 1
-        )
+        new_id = ObjectId()
         broccoli = Vegetable.objects.create(id=new_id, name="Broccoli")
         diamond = Mineral.objects.create(id=new_id, name="Diamond", hardness=7)
         tag = TaggedItem.objects.create(content_object=broccoli, tag="yummy")