Ticket #8065: in_bulk.diff

django/db/models/query.py

@@ -347 +347 @@
         obj.query.add_ordering('-%s' % latest_by)
         return obj.get()
 
-    def in_bulk(self, id_list):
+    def in_bulk(self, id_list=None):
         """
         Returns a dictionary mapping each of the given IDs to the object with
         that ID.
         """
         assert self.query.can_filter(), \
                 "Cannot use 'limit' or 'offset' with in_bulk"
-        assert isinstance(id_list, (tuple,  list)), \
-                "in_bulk() must be provided with a list of IDs."
-        if not id_list:
-            return {}
-        qs = self._clone()
-        qs.query.add_filter(('pk__in', id_list))
+        if id_list is not None:
+            assert isinstance(id_list, (tuple,  list)), \
+                    "in_bulk() must be provided with a list of IDs."
+            if not id_list:
+                return {}
+            qs = self._clone()
+            qs.query.add_filter(('pk__in', id_list))
+        else:
+            qs = self._clone()
+        
         return dict([(obj._get_pk_val(), obj) for obj in qs.iterator()])
 
     def delete(self):

tests/modeltests/lookup/models.py

@@ -19 +19 @@
 __test__ = {'API_TESTS':r"""
 # Create a couple of Articles.
 >>> from datetime import datetime
+>>> try:
+...     empty_list = sorted([])
+... except NameError:
+...     from django.utils.itercompat import sorted
+
 >>> a1 = Article(headline='Article 1', pub_date=datetime(2005, 7, 26))
 >>> a1.save()
 >>> a2 = Article(headline='Article 2', pub_date=datetime(2005, 7, 27))
@@ -91 +96 @@
 Traceback (most recent call last):
     ...
 AssertionError: in_bulk() must be provided with a list of IDs.
->>> Article.objects.in_bulk()
-Traceback (most recent call last):
-    ...
-TypeError: in_bulk() takes exactly 2 arguments (1 given)
 >>> Article.objects.in_bulk(headline__startswith='Blah')
 Traceback (most recent call last):
     ...
 TypeError: in_bulk() got an unexpected keyword argument 'headline__startswith'
 
+#if in_bulk() is called with no arguments, the entire queryset is evaluated
+>>> sorted(Article.objects.in_bulk().items())
+[(1, <Article: Article 1>), (2, <Article: Article 2>), (3, <Article: Article 3>), (4, <Article: Article 4>), (5, <Article: Article 5>), (6, <Article: Article 6>), (7, <Article: Article 7>)]
+>>> sorted(Article.objects.filter(pub_date=datetime(2005, 7, 27)).in_bulk().items())
+[(2, <Article: Article 2>), (3, <Article: Article 3>), (7, <Article: Article 7>)]
+
+
+
 # values() returns a list of dictionaries instead of object instances -- and
 # you can specify which fields you want to retrieve.
 >>> Article.objects.values('headline')

docs/db-api.txt

@@ -1205 +1205 @@
 is an underlying implementation quirk that shouldn't pose any real-world
 problems.
 
-``in_bulk(id_list)``
+``in_bulk(id_list=None)``
 ~~~~~~~~~~~~~~~~~~~~
 
 Takes a list of primary-key values and returns a dictionary mapping each
@@ -1222 +1222 @@
 
 If you pass ``in_bulk()`` an empty list, you'll get an empty dictionary.
 
+**New in Django development version** If you do not pass ``in_bulk()`` any
+arguments, it will return all of the objects in the queryset.
+
 ``iterator()``
 ~~~~~~~~~~~~~~