Merge pull request #1164 from pyriku/get_or_create_through_m2m

Integrity problems when using get_or_create through M2M

2 files changed, 35 insertions, 1 deletions

diff --git a/tests/get_or_create/models.py b/tests/get_or_create/models.py
index 82905de4f8..2f21344f59 100644
--- a/tests/get_or_create/models.py
+++ b/tests/get_or_create/models.py
@@ -28,3 +28,12 @@ class ManualPrimaryKeyTest(models.Model):
 
 class Profile(models.Model):
     person = models.ForeignKey(Person, primary_key=True)
+
+
+class Tag(models.Model):
+    text = models.CharField(max_length=256, unique=True)
+
+
+class Thing(models.Model):
+    name = models.CharField(max_length=256)
+    tags = models.ManyToManyField(Tag)
diff --git a/tests/get_or_create/tests.py b/tests/get_or_create/tests.py
index e9cce9bbde..5117a2f915 100644
--- a/tests/get_or_create/tests.py
+++ b/tests/get_or_create/tests.py
@@ -6,7 +6,7 @@ import traceback
 from django.db import IntegrityError
 from django.test import TestCase, TransactionTestCase
 
-from .models import Person, ManualPrimaryKeyTest, Profile
+from .models import Person, ManualPrimaryKeyTest, Profile, Tag, Thing
 
 
 class GetOrCreateTests(TestCase):
@@ -77,3 +77,28 @@ class GetOrCreateTransactionTests(TransactionTestCase):
             pass
         else:
             self.skipTest("This backend does not support integrity checks.")
+
+
+class GetOrCreateThroughManyToMany(TestCase):
+
+    def test_get_get_or_create(self):
+        tag = Tag.objects.create(text='foo')
+        a_thing = Thing.objects.create(name='a')
+        a_thing.tags.add(tag)
+        obj, created = a_thing.tags.get_or_create(text='foo')
+
+        self.assertFalse(created)
+        self.assertEqual(obj.pk, tag.pk)
+
+    def test_create_get_or_create(self):
+        a_thing = Thing.objects.create(name='a')
+        obj, created = a_thing.tags.get_or_create(text='foo')
+
+        self.assertTrue(created)
+        self.assertEqual(obj.text, 'foo')
+        self.assertIn(obj, a_thing.tags.all())
+
+    def test_something(self):
+        Tag.objects.create(text='foo')
+        a_thing = Thing.objects.create(name='a')
+        self.assertRaises(IntegrityError, a_thing.tags.get_or_create, text='foo')