Merge branch 'vdboor-master'

taggit/models.py

@@ -4,6 +4,7 @@ import django
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.contenttypes.generic import GenericForeignKey
 from django.contrib.contenttypes.generic import GenericForeignKey
 from django.db import models, IntegrityError, transaction
 from django.db import models, IntegrityError, transaction
+from django.db.models.query import QuerySet
 from django.template.defaultfilters import slugify as default_slugify
 from django.template.defaultfilters import slugify as default_slugify
 from django.utils.translation import ugettext_lazy as _, ugettext
 from django.utils.translation import ugettext_lazy as _, ugettext
 from django.utils.encoding import python_2_unicode_compatible
 from django.utils.encoding import python_2_unicode_compatible
@@ -138,11 +139,18 @@ class GenericTaggedItemBase(ItemBase):
 
 
     @classmethod
     @classmethod
     def bulk_lookup_kwargs(cls, instances):
     def bulk_lookup_kwargs(cls, instances):
-        # TODO: instances[0], can we assume there are instances.
-        return {
-            "object_id__in": [instance.pk for instance in instances],
-            "content_type": ContentType.objects.get_for_model(instances[0]),
-        }
+        if isinstance(instances, QuerySet):
+            # Can do a real object_id IN (SELECT ..) query.
+            return {
+                "object_id__in": instances,
+                "content_type": ContentType.objects.get_for_model(instances.model),
+            }
+        else:
+            # TODO: instances[0], can we assume there are instances.
+            return {
+                "object_id__in": [instance.pk for instance in instances],
+                "content_type": ContentType.objects.get_for_model(instances[0]),
+            }
 
 
     @classmethod
     @classmethod
     def tags_for(cls, model, instance=None):
     def tags_for(cls, model, instance=None):

tests/tests.py

@@ -210,6 +210,27 @@ class TaggableManagerTestCase(BaseTaggingTestCase):
              '<{0}: cat>'.format(model_name)],
              '<{0}: cat>'.format(model_name)],
             ordered=False)
             ordered=False)
 
 
+    def test_lookup_bulk(self):
+        apple = self.food_model.objects.create(name="apple")
+        pear = self.food_model.objects.create(name="pear")
+        apple.tags.add('fruit', 'green')
+        pear.tags.add('fruit', 'yummie')
+
+        def lookup_qs():
+            # New fix: directly allow WHERE object_id IN (SELECT id FROM ..)
+            objects = self.food_model.objects.all()
+            lookup = self.taggeditem_model.bulk_lookup_kwargs(objects)
+            list(self.taggeditem_model.objects.filter(**lookup))
+
+        def lookup_list():
+            # Simulate old situation: iterate over a list.
+            objects = list(self.food_model.objects.all())
+            lookup = self.taggeditem_model.bulk_lookup_kwargs(objects)
+            list(self.taggeditem_model.objects.filter(**lookup))
+
+        self.assert_num_queries(1, lookup_qs)
+        self.assert_num_queries(2, lookup_list)
+
     def test_exclude(self):
     def test_exclude(self):
         apple = self.food_model.objects.create(name="apple")
         apple = self.food_model.objects.create(name="apple")
         apple.tags.add("red", "green", "delicious")
         apple.tags.add("red", "green", "delicious")