Ticket #11082: 11082_patch_r10742.git.diff

django/db/models/query.py

@@ -13 +13 @@
 from django.db.models.query_utils import Q, select_related_descend, CollectedObjects, CyclicDependency, deferred_class_factory
 from django.db.models import signals, sql
 
+from copy import deepcopy
 
 # Used to control how many objects are worked with at once in some cases (e.g.
 # when deleting objects).
@@ -40 +41 @@
     # PYTHON MAGIC METHODS #
     ########################
 
+    def __deepcopy__(self, memo):
+        """
+        Deep copying of a QuerySet without
+        populating the cache
+        """
+        obj_dict = deepcopy(self.__dict__, memo)
+        obj_dict['_iter'] = None
+        
+        obj = self.__class__()
+        obj.__dict__.update(obj_dict)
+        return obj
+        
+        
     def __getstate__(self):
         """
         Allows the QuerySet to be pickled.

django/db/models/sql/query.py

@@ -1619 +1619 @@
                             entry.negate()
                             self.where.add(entry, AND)
                             break
-                elif not (lookup_type == 'in' and not value) and field.null:
+                elif not (lookup_type == 'in' and
+                          (not hasattr(value, 'as_sql') and not hasattr(value, '_as_sql') and
+                          not value)) and field.null:
                     # Leaky abstraction artifact: We have to specifically
                     # exclude the "foo__in=[]" case from this handling, because
                     # it's short-circuited in the Where class.

tests/regressiontests/queries/models.py

@@ -271 +271 @@
     def __unicode__(self):
         return self.name
 
+# Simple model for subqueries tests
+
+class SimpleSubQuery(models.Model):
+    name = models.CharField(max_length=10)
+
+
 
 __test__ = {'API_TESTS':"""
 >>> generic = NamedCategory.objects.create(name="Generic")
@@ -1143 +1149 @@
 >>> r.save()
 >>> Ranking.objects.all()
 [<Ranking: 3: a1>, <Ranking: 2: a2>, <Ranking: 1: a3>]
+
+Bug #11082 -- when using exclude with an "__in" lookup with a subquery,
+that subquery gets executed beforehand
+>>> subq = SimpleSubQuery.objects.all()
+>>> qs = SimpleSubQuery.objects.exclude(pk__in=subq)
+>>> _ = list(qs)
+>>> subq._result_cache is None
+True
+
+Also, that bug appears when a subquery is used in a "__in" lookup, in a Q
+object which is a left hand operand on a & or | expression
+>>> subq = SimpleSubQuery.objects.all()
+>>> q_obj = Q(pk__in=subq) & Q(name='aa')
+>>> subq._result_cache is None
+True
 """}
 
 # In Python 2.3 and the Python 2.6 beta releases, exceptions raised in __len__