use ObjectIdAutoField in test models

Author: timgraham

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
@@ -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/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/many_to_many/models.py

@@ -7,6 +7,8 @@
 objects, and a ``Publication`` has multiple ``Article`` objects.
 """
 
+from django_mongodb.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):

tests/many_to_one/models.py

@@ -4,6 +4,8 @@
 To define a many-to-one relationship, use ``ForeignKey()``.
 """
 
+from django_mongodb.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
     )

tests/many_to_one/tests.py

@@ -871,7 +871,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):

tests/model_forms/test_modelchoicefield.py

@@ -341,11 +341,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>"
             )
@@ -387,14 +387,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),

tests/model_forms/tests.py

@@ -1649,9 +1649,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),
         )

tests/model_formsets/models.py

@@ -1,6 +1,8 @@
 import datetime
 import uuid
 
+from django_mongodb.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)
 

tests/queries/models.py

@@ -4,6 +4,8 @@
 
 import datetime
 
+from django_mongodb.fields import ObjectIdAutoField
+
 from django.db import connection, models
 from django.db.models.functions import Now
 
@@ -436,7 +438,7 @@ class ChildObjectA(ObjectA):
 class ObjectB(models.Model):
     name = models.CharField(max_length=50)
     objecta = models.ForeignKey(ObjectA, models.CASCADE)
-    num = models.PositiveIntegerField()
+    num = models.CharField(max_length=24)
 
     def __str__(self):
         return self.name
@@ -636,7 +638,7 @@ class MyObject(models.Model):
 
 
 class Order(models.Model):
-    id = models.IntegerField(primary_key=True)
+    id = ObjectIdAutoField(primary_key=True)
     name = models.CharField(max_length=12, null=True, default="")
 
     class Meta:
@@ -648,7 +650,7 @@ def __str__(self):
 
 class OrderItem(models.Model):
     order = models.ForeignKey(Order, models.CASCADE, related_name="items")
-    status = models.IntegerField()
+    status = models.CharField(max_length=24)
 
     class Meta:
         ordering = ("pk",)
@@ -686,13 +688,13 @@ def __str__(self):
 
 
 class Ticket21203Parent(models.Model):
-    parentid = models.AutoField(primary_key=True)
+    parentid = ObjectIdAutoField(primary_key=True)
     parent_bool = models.BooleanField(default=True)
     created = models.DateTimeField(auto_now=True)
 
 
 class Ticket21203Child(models.Model):
-    childid = models.AutoField(primary_key=True)
+    childid = ObjectIdAutoField(primary_key=True)
     parent = models.ForeignKey(Ticket21203Parent, models.CASCADE)