Ticket #15304: 15304-pk-type-r15539.diff

docs/intro/tutorial01.txt

@@ -534 +534 @@
     # Save the object into the database. You have to call save() explicitly.
     >>> p.save()
 
-    # Now it has an ID. Note that this might say "1L" instead of "1", depending
-    # on which database you're using. That's no biggie; it just means your
-    # database backend prefers to return integers as Python long integer
-    # objects.
+    # Now it has an ID.
     >>> p.id
     1
 

tests/regressiontests/model_regress/tests.py

@@ -163 +163 @@
             1
         )
 
+    def test_pk_type(self):
+        # Make sure that the primary key value of newly created objects is the
+        # same type as existing objects.
+        p = Party.objects.create()
+        p2 = Party.objects.get(pk=p.pk)
+        self.assertEqual(type(p.pk), type(p2.pk))
+
 class ModelValidationTest(TestCase):
     def test_pk_validation(self):
         one = NonAutoPK.objects.create(name="one")

django/db/models/base.py

@@ -556 +556 @@
                     result = manager._insert([(meta.pk, connection.ops.pk_default_value())], return_id=update_pk, raw_values=True, using=using)
 
                 if update_pk:
-                    setattr(self, meta.pk.attname, result)
+                    setattr(self, meta.pk.attname, meta.auto_field.to_python(result))
             transaction.commit_unless_managed(using=using)
 
         # Store the database on which the object was saved