Ticket #13240: add_remove_querysets.diff

django/db/models/fields/related.py

@@ -411 +411 @@
 
             def add(self, *objs):
                 for obj in objs:
-                    if not isinstance(obj, self.model):
+                    if isinstance(obj, QuerySet) and obj.model == self.model:
+                        for queried_obj in obj.all():
+                            setattr(queried_obj, rel_field.name, instance)
+                            queried_obj.save()
+                    elif not isinstance(obj, self.model):
                         raise TypeError("'%s' instance expected" % self.model._meta.object_name)
-                    setattr(obj, rel_field.name, instance)
-                    obj.save()
+                    else:
+                        setattr(obj, rel_field.name, instance)
+                        obj.save()
             add.alters_data = True
 
             def create(self, **kwargs):
@@ -435 +440 @@
                 def remove(self, *objs):
                     val = getattr(instance, rel_field.rel.get_related_field().attname)
                     for obj in objs:
+                        if isinstance(obj, QuerySet) and obj.model == self.model:
+                            for queried_obj in obj.all():
+                                # We'll pass over non-related objects in the QuerySet silently
+                                if getattr(queried_obj, rel_field.attname) == val:
+                                    setattr(queried_obj, rel_field.name, None)
+                                    queried_obj.save()
                         # Is obj actually part of this descriptor set?
-                        if getattr(obj, rel_field.attname) == val:
+                        elif getattr(obj, rel_field.attname) == val:
                             setattr(obj, rel_field.name, None)
                             obj.save()
                         else:
@@ -548 +559 @@
                            raise ValueError('Cannot add "%r": instance is on database "%s", value is on database "%s"' %
                                                (obj, self.instance._state.db, obj._state.db))
                         new_ids.add(obj.pk)
+                    elif isinstance(obj, QuerySet) and obj.model == self.model:
+                        new_ids.update(set(obj.values_list("id", flat=True)))
                     elif isinstance(obj, Model):
                         raise TypeError("'%s' instance expected" % self.model._meta.object_name)
                     else:
@@ -584 +597 @@
                 for obj in objs:
                     if isinstance(obj, self.model):
                         old_ids.add(obj.pk)
+                    elif isinstance(obj, QuerySet) and obj.model == self.model:
+                        old_ids.update(set(obj.values_list("id", flat=True)))
                     else:
                         old_ids.add(obj)
                 # Remove the specified objects from the join table

docs/ref/models/relations.txt

@@ -33 +33 @@
 .. method:: QuerySet.add(obj1, [obj2, ...])
 
     Adds the specified model objects to the related object set.
+    
+    .. versionchanged:: 1.2
+    
+    The ``add()`` method can now accept ``QuerySet`` objects as well.
 
     Example::
 
@@ -84 +88 @@
     without being added to another. In the above example, removing ``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.2
+    
+    The ``remove()`` method can now accept ``QuerySet`` objects as well.
 
 .. method:: QuerySet.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 works too
+>>> p4 = Publication(id=None, title='Science Times')
+>>> p4.save()
+>>> a2.publications.add(Publication.objects.filter(title__contains="Science"))
+>>> 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))
+>>> 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>]
+>>> new_articles.delete()
+>>> r3.delete()
+
 >>> r.article_set.all()
 [<Article: John's second story>, <Article: This is a test>]
 >>> r2.article_set.all()