use ObjectIdAutoField in test models

timgraham · timgraham · commit 26a57c37d974 · 2025-03-07T19:54:28.000-05:00
diff --git a/django/contrib/sites/migrations/0001_initial.py b/django/contrib/sites/migrations/0001_initial.py
@@ -1,3 +1,5 @@
+from django_mongodb_backend.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,
diff --git a/tests/admin_changelist/models.py b/tests/admin_changelist/models.py
@@ -1,5 +1,7 @@
 import uuid
 
+from django_mongodb_backend.fields import ObjectIdAutoField
+
 from django.contrib.auth.models import User
 from django.db import models
 
@@ -128,7 +130,7 @@ class OrderedObject(models.Model):
 
 
 class CustomIdUser(models.Model):
-    uuid = models.AutoField(primary_key=True)
+    uuid = ObjectIdAutoField(primary_key=True)
 
 
 class CharPK(models.Model):
diff --git a/tests/admin_views/models.py b/tests/admin_views/models.py
@@ -2,6 +2,8 @@
 import tempfile
 import uuid
 
+from django_mongodb_backend.fields import ObjectIdAutoField
+
 from django.contrib import admin
 from django.contrib.auth.models import User
 from django.contrib.contenttypes.fields import GenericForeignKey, GenericRelation
@@ -447,7 +449,7 @@ class DooHickey(models.Model):
 
 
 class Grommet(models.Model):
-    code = models.AutoField(primary_key=True)
+    code = ObjectIdAutoField(primary_key=True)
     owner = models.ForeignKey(Collector, models.CASCADE)
     name = models.CharField(max_length=100)
 
@@ -687,7 +689,7 @@ class Bonus(models.Model):
 
 
 class Question(models.Model):
-    big_id = models.BigAutoField(primary_key=True)
+    big_id = ObjectIdAutoField(primary_key=True)
     question = models.CharField(max_length=20)
     posted = models.DateField(default=datetime.date.today)
     expires = models.DateTimeField(null=True, blank=True)
diff --git a/tests/aggregation_regress/models.py b/tests/aggregation_regress/models.py
@@ -1,3 +1,5 @@
+from django_mongodb_backend.fields import ObjectIdAutoField
+
 from django.contrib.contenttypes.fields import GenericForeignKey, GenericRelation
 from django.contrib.contenttypes.models import ContentType
 from django.db import models
@@ -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):
diff --git a/tests/backends/models.py b/tests/backends/models.py
@@ -1,3 +1,5 @@
+from django_mongodb_backend.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:
diff --git a/tests/bulk_create/models.py b/tests/bulk_create/models.py
@@ -2,6 +2,8 @@
 import uuid
 from decimal import Decimal
 
+from django_mongodb_backend.fields import ObjectIdAutoField
+
 from django.db import models
 from django.utils import timezone
 
@@ -85,11 +87,11 @@ class NoFields(models.Model):
 
 
 class SmallAutoFieldModel(models.Model):
-    id = models.SmallAutoField(primary_key=True)
+    id = ObjectIdAutoField(primary_key=True)
 
 
 class BigAutoFieldModel(models.Model):
-    id = models.BigAutoField(primary_key=True)
+    id = ObjectIdAutoField(primary_key=True)
 
 
 class NullableFields(models.Model):
diff --git a/tests/custom_pk/fields.py b/tests/custom_pk/fields.py
@@ -1,6 +1,8 @@
 import random
 import string
 
+from django_mongodb_backend.fields import ObjectIdAutoField
+
 from django.db import models
 
 
@@ -59,7 +61,7 @@ def get_db_prep_value(self, value, connection, prepared=False):
         return value
 
 
-class MyAutoField(models.BigAutoField):
+class MyAutoField(ObjectIdAutoField):
     def from_db_value(self, value, expression, connection):
         if value is None:
             return None
diff --git a/tests/inspectdb/models.py b/tests/inspectdb/models.py
@@ -1,3 +1,5 @@
+from django_mongodb_backend.fields import ObjectIdAutoField
+
 from django.db import connection, models
 from django.db.models.functions import Lower
 from django.utils.functional import SimpleLazyObject
@@ -58,7 +60,7 @@ class Meta:
 
 
 class ColumnTypes(models.Model):
-    id = models.AutoField(primary_key=True)
+    id = ObjectIdAutoField(primary_key=True)
     big_int_field = models.BigIntegerField()
     bool_field = models.BooleanField(default=False)
     null_bool_field = models.BooleanField(null=True)
diff --git a/tests/introspection/models.py b/tests/introspection/models.py
@@ -2,12 +2,10 @@
 
 
 class City(models.Model):
-    id = models.BigAutoField(primary_key=True)
     name = models.CharField(max_length=50)
 
 
 class Country(models.Model):
-    id = models.SmallAutoField(primary_key=True)
     name = models.CharField(max_length=50)
 
 
diff --git a/tests/m2m_through_regress/models.py b/tests/m2m_through_regress/models.py
@@ -1,3 +1,5 @@
+from django_mongodb_backend.fields import ObjectIdAutoField
+
 from django.contrib.auth.models import User
 from django.db import models
 
@@ -11,7 +13,7 @@ class Membership(models.Model):
 
 # using custom id column to test ticket #11107
 class UserMembership(models.Model):
-    id = models.AutoField(db_column="usermembership_id", primary_key=True)
+    id = ObjectIdAutoField(db_column="usermembership_id", primary_key=True)
     user = models.ForeignKey(User, models.CASCADE)
     group = models.ForeignKey("Group", models.CASCADE)
     price = models.IntegerField(default=100)
diff --git a/tests/m2m_through_regress/tests.py b/tests/m2m_through_regress/tests.py
@@ -84,11 +84,11 @@ def test_serialization(self):
         )
         self.assertJSONEqual(
             out.getvalue().strip(),
-            '[{"pk": %(m_pk)s, "model": "m2m_through_regress.membership", '
-            '"fields": {"person": %(p_pk)s, "price": 100, "group": %(g_pk)s}}, '
-            '{"pk": %(p_pk)s, "model": "m2m_through_regress.person", '
+            '[{"pk": "%(m_pk)s", "model": "m2m_through_regress.membership", '
+            '"fields": {"person": "%(p_pk)s", "price": 100, "group": "%(g_pk)s"}}, '
+            '{"pk": "%(p_pk)s", "model": "m2m_through_regress.person", '
             '"fields": {"name": "Bob"}}, '
-            '{"pk": %(g_pk)s, "model": "m2m_through_regress.group", '
+            '{"pk": "%(g_pk)s", "model": "m2m_through_regress.group", '
             '"fields": {"name": "Roll"}}]' % pks,
         )
 
diff --git a/tests/many_to_many/models.py b/tests/many_to_many/models.py
@@ -7,6 +7,8 @@
 objects, and a ``Publication`` has multiple ``Article`` objects.
 """
 
+from django_mongodb_backend.fields import ObjectIdAutoField
+
 from django.db import models
 
 
@@ -21,7 +23,7 @@ def __str__(self):
 
 
 class Tag(models.Model):
-    id = models.BigAutoField(primary_key=True)
+    id = ObjectIdAutoField(primary_key=True)
     name = models.CharField(max_length=50)
 
     def __str__(self):
diff --git a/tests/many_to_one/models.py b/tests/many_to_one/models.py
@@ -4,6 +4,8 @@
 To define a many-to-one relationship, use ``ForeignKey()``.
 """
 
+from django_mongodb_backend.fields import ObjectIdAutoField
+
 from django.db import models
 
 
@@ -29,12 +31,12 @@ def __str__(self):
 
 
 class Country(models.Model):
-    id = models.SmallAutoField(primary_key=True)
+    id = ObjectIdAutoField(primary_key=True)
     name = models.CharField(max_length=50)
 
 
 class City(models.Model):
-    id = models.BigAutoField(primary_key=True)
+    id = ObjectIdAutoField(primary_key=True)
     country = models.ForeignKey(
         Country, models.CASCADE, related_name="cities", null=True
     )
diff --git a/tests/many_to_one/tests.py b/tests/many_to_one/tests.py
@@ -879,7 +879,7 @@ def test_reverse_foreign_key_instance_to_field_caching(self):
     def test_add_remove_set_by_pk_raises(self):
         usa = Country.objects.create(name="United States")
         chicago = City.objects.create(name="Chicago")
-        msg = "'City' instance expected, got %s" % chicago.pk
+        msg = "'City' instance expected, got %r" % chicago.pk
         with self.assertRaisesMessage(TypeError, msg):
             usa.cities.add(chicago.pk)
         with self.assertRaisesMessage(TypeError, msg):
diff --git a/tests/model_fields/models.py b/tests/model_fields/models.py
@@ -2,6 +2,8 @@
 import tempfile
 import uuid
 
+from django_mongodb_backend.fields import ObjectIdAutoField
+
 from django.contrib.contenttypes.fields import GenericForeignKey, GenericRelation
 from django.contrib.contenttypes.models import ContentType
 from django.core.files.storage import FileSystemStorage
@@ -113,15 +115,15 @@ class UnicodeSlugField(models.Model):
 
 
 class AutoModel(models.Model):
-    value = models.AutoField(primary_key=True)
+    value = ObjectIdAutoField(primary_key=True)
 
 
 class BigAutoModel(models.Model):
-    value = models.BigAutoField(primary_key=True)
+    value = ObjectIdAutoField(primary_key=True)
 
 
 class SmallAutoModel(models.Model):
-    value = models.SmallAutoField(primary_key=True)
+    value = ObjectIdAutoField(primary_key=True)
 
 
 class SmallIntegerModel(models.Model):
@@ -198,7 +200,7 @@ class RenamedField(models.Model):
 
 
 class VerboseNameField(models.Model):
-    id = models.AutoField("verbose pk", primary_key=True)
+    id = ObjectIdAutoField("verbose pk", primary_key=True)
     field1 = models.BigIntegerField("verbose field1")
     field2 = models.BooleanField("verbose field2", default=False)
     field3 = models.CharField("verbose field3", max_length=10)
diff --git a/tests/model_forms/test_modelchoicefield.py b/tests/model_forms/test_modelchoicefield.py
@@ -347,11 +347,11 @@ class CustomModelMultipleChoiceField(forms.ModelMultipleChoiceField):
             field.widget.render("name", []),
             (
                 "<div>"
-                '<div><label><input type="checkbox" name="name" value="%d" '
+                '<div><label><input type="checkbox" name="name" value="%s" '
                 'data-slug="entertainment">Entertainment</label></div>'
-                '<div><label><input type="checkbox" name="name" value="%d" '
+                '<div><label><input type="checkbox" name="name" value="%s" '
                 'data-slug="test">A test</label></div>'
-                '<div><label><input type="checkbox" name="name" value="%d" '
+                '<div><label><input type="checkbox" name="name" value="%s" '
                 'data-slug="third-test">Third</label></div>'
                 "</div>"
             )
@@ -393,14 +393,14 @@ class CustomModelMultipleChoiceField(forms.ModelMultipleChoiceField):
             field.widget.render("name", []),
             """
             <div><div>
-            <label><input type="checkbox" name="name" value="%d"
+            <label><input type="checkbox" name="name" value="%s"
                 data-slug="entertainment">Entertainment
             </label></div>
             <div><label>
-            <input type="checkbox" name="name" value="%d" data-slug="test">A test
+            <input type="checkbox" name="name" value="%s" data-slug="test">A test
             </label></div>
             <div><label>
-            <input type="checkbox" name="name" value="%d" data-slug="third-test">Third
+            <input type="checkbox" name="name" value="%s" data-slug="third-test">Third
             </label></div></div>
             """
             % (self.c1.pk, self.c2.pk, self.c3.pk),
diff --git a/tests/model_forms/tests.py b/tests/model_forms/tests.py
@@ -1650,9 +1650,9 @@ def formfield_for_dbfield(db_field, **kwargs):
 <input id="id_headline" type="text" name="headline" maxlength="50" required></li>
 <li><label for="id_categories">Categories:</label>
 <select multiple name="categories" id="id_categories">
-<option value="%d" selected>Entertainment</option>
-<option value="%d" selected>It&#x27;s a test</option>
-<option value="%d">Third test</option>
+<option value="%s" selected>Entertainment</option>
+<option value="%s" selected>It&#x27;s a test</option>
+<option value="%s">Third test</option>
 </select></li>"""
             % (self.c1.pk, self.c2.pk, self.c3.pk),
         )
diff --git a/tests/model_formsets/models.py b/tests/model_formsets/models.py
@@ -1,6 +1,8 @@
 import datetime
 import uuid
 
+from django_mongodb_backend.fields import ObjectIdAutoField
+
 from django.db import models
 
 
@@ -93,7 +95,7 @@ def __str__(self):
 
 
 class Owner(models.Model):
-    auto_id = models.AutoField(primary_key=True)
+    auto_id = ObjectIdAutoField(primary_key=True)
     name = models.CharField(max_length=100)
     place = models.ForeignKey(Place, models.CASCADE)
 
diff --git a/tests/model_inheritance_regress/models.py b/tests/model_inheritance_regress/models.py
@@ -1,5 +1,7 @@
 import datetime
 
+from django_mongodb_backend.fields import ObjectIdAutoField
+
 from django.db import models
 
 
@@ -30,7 +32,7 @@ class ParkingLot(Place):
 
 class ParkingLot3(Place):
     # The parent_link connector need not be the pk on the model.
-    primary_key = models.AutoField(primary_key=True)
+    primary_key = ObjectIdAutoField(primary_key=True)
     parent = models.OneToOneField(Place, models.CASCADE, parent_link=True)
 
 
@@ -189,13 +191,13 @@ class User(models.Model):
 
 
 class Profile(User):
-    profile_id = models.AutoField(primary_key=True)
+    profile_id = ObjectIdAutoField(primary_key=True)
     extra = models.CharField(max_length=30, blank=True)
 
 
 # Check concrete + concrete -> concrete -> concrete
 class Politician(models.Model):
-    politician_id = models.AutoField(primary_key=True)
+    politician_id = ObjectIdAutoField(primary_key=True)
     title = models.CharField(max_length=50)
 
 
diff --git a/tests/model_regress/models.py b/tests/model_regress/models.py
diff --git a/tests/queries/models.py b/tests/queries/models.py
diff --git a/tests/raw_query/models.py b/tests/raw_query/models.py
diff --git a/tests/select_related_onetoone/models.py b/tests/select_related_onetoone/models.py
