Ticket #13240: add_remove_querysets_v2.diff

django/db/models/fields/related.py

@@ -411 +411 @@
 
             def add(self, *objs):
                 for obj in objs:
-                    if not isinstance(obj, self.model):
-                        raise TypeError("'%s' instance expected" % self.model._meta.object_name)
-                    setattr(obj, rel_field.name, instance)
-                    obj.save()
+                    try:
+                        for item in iter(obj):
+                            self.add(item)
+                    except TypeError:
+                        if not isinstance(obj, self.model):
+                            raise TypeError("'%s' instance expected" % self.model._meta.object_name)
+                        setattr(obj, rel_field.name, instance)
+                        obj.save()
             add.alters_data = True
 
             def create(self, **kwargs):
@@ -436 +440 @@
                 def remove(self, *objs):
                     val = getattr(instance, rel_field.rel.get_related_field().attname)
                     for obj in objs:
-                        # Is obj actually part of this descriptor set?
-                        if getattr(obj, rel_field.attname) == val:
-                            setattr(obj, rel_field.name, None)
-                            obj.save()
-                        else:
-                            raise rel_field.rel.to.DoesNotExist("%r is not related to %r." % (obj, instance))
+                        try:
+                            for item in iter(obj):
+                                self.remove(item)
+                        except TypeError:
+                            # Is obj actually part of this descriptor set?
+                            if getattr(obj, rel_field.attname) == val:
+                                setattr(obj, rel_field.name, None)
+                                obj.save()
+                            else:
+                                raise rel_field.rel.to.DoesNotExist("%r is not related to %r." % (obj, instance))
                 remove.alters_data = True
 
                 def clear(self):
@@ -551 +559 @@
                         new_ids.add(obj.pk)
                     elif isinstance(obj, Model):
                         raise TypeError("'%s' instance expected" % self.model._meta.object_name)
+                    elif isinstance(obj, (int, basestring)):
+                        new_ids.add(obj)
+                    elif hasattr(obj, "__iter__"):
+                        self._add_items(source_field_name, target_field_name, *obj)
                     else:
-                        new_ids.add(obj)
+                        raise TypeError("%s cannot be added to %s" % (obj, self.model._meta.object_name))
                 db = router.db_for_write(self.through.__class__, instance=self.instance)
                 vals = self.through._default_manager.using(db).values_list(target_field_name, flat=True)
                 vals = vals.filter(**{
@@ -592 +604 @@
                 for obj in objs:
                     if isinstance(obj, self.model):
                         old_ids.add(obj.pk)
+                    elif isinstance(obj, (int, basestring)):
+                        old_ids.add(obj)
+                    elif hasattr(obj, "__iter__"):
+                        self._remove_items(source_field_name, target_field_name, *obj)
                     else:
-                        old_ids.add(obj)
+                        raise TypeError("%s cannot be added to %s" % (obj, self.model._meta.object_name))
                 # Work out what DB we're operating on
                 db = router.db_for_write(self.through.__class__, instance=self.instance)
                 # Send a signal to the other end if need be.

docs/ref/models/relations.txt

@@ -36 +36 @@
     .. method:: add(obj1, [obj2, ...])
 
         Adds the specified model objects to the related object set.
+        
+        .. versionchanged:: 1.3
+        
+        The ``add()`` method can now accept any iterable, including``QuerySet`` objects.
 
         Example::
 
@@ -88 +92 @@
         ``e`` from ``b.entry_set()`` is equivalent to doing ``e.blog = None``,
         and because the ``blog`` ``ForeignKey`` doesn't have ``null=True``, this
         is invalid.
+        
+        .. versionchanged:: 1.3
+        
+        The ``remove()`` method can now accept any iterable, including``QuerySet`` objects.
 
     .. method:: clear()
 

tests/modeltests/many_to_many/models.py

@@ -61 +61 @@
 # Adding a second time is OK
 >>> a2.publications.add(p3)
 
+# Adding and removing using QuerySets and iterables works too
+>>> p4 = Publication(id=None, title='Science Times')
+>>> p4.save()
+>>> science_pubs = Publication.objects.filter(title__contains="Science")
+>>> a2.publications.add(science_pubs)
+>>> a2.publications.all()
+[<Publication: Science News>, <Publication: Science Times>, <Publication: Science Weekly>, <Publication: The Python Journal>]
+>>> a2.publications.remove(Publication.objects.filter(title__contains="Times"))
+>>> a2.publications.add(list(science_pubs))
+>>> a2.publications.all()
+[<Publication: Science News>, <Publication: Science Times>, <Publication: Science Weekly>, <Publication: The Python Journal>]
+>>> a2.publications.remove(Publication.objects.filter(title__contains="Times"))
+>>> p4.delete()
+
 # Adding an object of the wrong type raises TypeError
 >>> a2.publications.add(a1)
 Traceback (most recent call last):

tests/modeltests/many_to_one/models.py

@@ -79 +79 @@
 ...
 TypeError: 'Article' instance expected
 
+>>> r3 = Reporter(first_name='Eric', last_name='James', email='eric@example.com')
+>>> r3.save()
+>>> a3 = Article.objects.create(headline="Human interest story", reporter=r, pub_date=datetime(2010, 3, 04))
+>>> a4 = Article.objects.create(headline="Eric's story", reporter=r, pub_date=datetime(2010, 3, 14))
+>>> a5 = Article.objects.create(headline="Wild Parties!", reporter=r, pub_date=datetime(2010, 9, 22))
+>>> new_articles = Article.objects.filter(pub_date__year=2010, pub_date__month=3)
+>>> r3.article_set.add(new_articles)
+>>> r3.article_set.all()
+[<Article: Eric's story>, <Article: Human interest story>]
+>>> r3.article_set.add([a5])
+>>> r3.article_set.all()
+[<Article: Eric's story>, <Article: Human interest story>, <Article: Wild Parties!>]
+>>> new_articles.delete()
+>>> a5.delete()
+>>> r3.delete()
+
 >>> r.article_set.all()
 [<Article: John's second story>, <Article: This is a test>]
 >>> r2.article_set.all()