Ticket #15117: 15117_get_or_create.patch

tests/modeltests/get_or_create/models.py

@@ -6 +6 @@
 parameters.
 """
 
-from django.db import models, IntegrityError
+from django.db import models
 
 class Person(models.Model):
     first_name = models.CharField(max_length=100)
@@ -19 +19 @@
 class ManualPrimaryKeyTest(models.Model):
     id = models.IntegerField(primary_key=True)
     data = models.CharField(max_length=100)
+
+
+class IntegrityErrorTest(models.Model):
+    country = models.ForeignKey(Person, primary_key=True)
+    info = models.TextField(blank=True, default='')
+

tests/modeltests/get_or_create/tests.py

@@ -3 +3 @@
 from django.db import IntegrityError
 from django.test import TestCase
 
-from models import Person, ManualPrimaryKeyTest
+from models import Person, ManualPrimaryKeyTest, IntegrityErrorTest
 
 
 class GetOrCreateTests(TestCase):
@@ -50 +50 @@
             ManualPrimaryKeyTest.objects.get_or_create, id=1, data="Different"
         )
         self.assertEqual(ManualPrimaryKeyTest.objects.get(id=1).data, "Original")
+
+
+    def test_get_or_create_integrityerror(self):
+
+        self.assertRaises(IntegrityError,
+            IntegrityErrorTest.objects.get_or_create, pk=1)
+
+        p = Person()
+        p.id = 1
+
+        self.assertRaises(IntegrityError,
+            IntegrityErrorTest.objects.get_or_create, p=p)
+