Ticket #2316: 0001-Fixed-2316-Added-get_or_create-to-GenericRelatedObje.diff

django/contrib/contenttypes/generic.py

@@ -295 +295 @@
             return super(GenericRelatedObjectManager, self).using(db).create(**kwargs)
         create.alters_data = True
 
+        def get_or_create(self, **kwargs):
+            kwargs[self.content_type_field_name] = self.content_type
+            kwargs[self.object_id_field_name] = self.pk_val
+            db = router.db_for_write(self.model, instance=self.instance)
+            return super(GenericRelatedObjectManager, self).using(db).get_or_create(**kwargs)
+        get_or_create.alters_data = True
+
     return GenericRelatedObjectManager
 
 class GenericRel(ManyToManyRel):

tests/modeltests/generic_relations/tests.py

@@ -221 +221 @@
         formset = GenericFormSet(instance=lion, prefix='x')
         self.assertEqual(u''.join(form.as_p() for form in formset.forms), u"""<p><label for="id_x-0-tag">Tag:</label> <input id="id_x-0-tag" type="text" name="x-0-tag" maxlength="50" /></p>
 <p><label for="id_x-0-DELETE">Delete:</label> <input type="checkbox" name="x-0-DELETE" id="id_x-0-DELETE" /><input type="hidden" name="x-0-id" id="id_x-0-id" /></p>""")
+
+    def test_generic_relations_get_or_create(self):
+        # Setup our initial data
+        bacon = Vegetable.objects.create(name="Bacon", is_yucky=False)
+        fatty = TaggedItem.objects.create(content_object=bacon, tag="fatty")
+
+        # tag1 must be retrieved from the database
+        tag1, created = bacon.tags.get_or_create(tag='fatty')
+        self.assertFalse(created)
+        self.assertEquals(tag1, fatty)
+        self.assertEquals(tag1.content_object, bacon)
+
+        # tag2 should not exist and must be created
+        tag2, created = bacon.tags.get_or_create(tag='salty')
+        self.assertTrue(created)
+        self.assertEquals(tag2.content_object, bacon)