Author: ccahoon
Date: 2009-06-12 22:29:32 -0500 (Fri, 12 Jun 2009)
New Revision: 10997
Modified:
django/branches/soc2009/http-wsgi-improvements/django/db/models/query.py
django/branches/soc2009/http-wsgi-improvements/django/db/models/sql/query.py
django/branches/soc2009/http-wsgi-improvements/tests/regressiontests/queries/models.py
Log:
Fixed #11082 -- Ensured that subqueries used in an exclude(X__in=) clause
aren't pre-evaluated. Thanks to Henry Andrews for the report, and clement for
the fix.
Modified:
django/branches/soc2009/http-wsgi-improvements/django/db/models/query.py
===================================================================
--- django/branches/soc2009/http-wsgi-improvements/django/db/models/query.py
2009-06-13 03:29:17 UTC (rev 10996)
+++ django/branches/soc2009/http-wsgi-improvements/django/db/models/query.py
2009-06-13 03:29:32 UTC (rev 10997)
@@ -7,6 +7,8 @@
except NameError:
from sets import Set as set # Python 2.3 fallback
+from copy import deepcopy
+
from django.db import connection, transaction, IntegrityError
from django.db.models.aggregates import Aggregate
from django.db.models.fields import DateField
@@ -40,6 +42,17 @@
# PYTHON MAGIC METHODS #
########################
+ def __deepcopy__(self, memo):
+ """
+ Deep copy of a QuerySet doesn't populate 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.
Modified:
django/branches/soc2009/http-wsgi-improvements/django/db/models/sql/query.py
===================================================================
---
django/branches/soc2009/http-wsgi-improvements/django/db/models/sql/query.py
2009-06-13 03:29:17 UTC (rev 10996)
+++
django/branches/soc2009/http-wsgi-improvements/django/db/models/sql/query.py
2009-06-13 03:29:32 UTC (rev 10997)
@@ -1625,10 +1625,14 @@
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.
+ # We also need to handle the case where a subquery is
provided
entry = self.where_class()
entry.add((Constraint(alias, col, None), 'isnull', True),
AND)
entry.negate()
Modified:
django/branches/soc2009/http-wsgi-improvements/tests/regressiontests/queries/models.py
===================================================================
---
django/branches/soc2009/http-wsgi-improvements/tests/regressiontests/queries/models.py
2009-06-13 03:29:17 UTC (rev 10996)
+++
django/branches/soc2009/http-wsgi-improvements/tests/regressiontests/queries/models.py
2009-06-13 03:29:32 UTC (rev 10997)
@@ -1143,6 +1143,33 @@
>>> r.save()
>>> Ranking.objects.all()
[<Ranking: 3: a1>, <Ranking: 2: a2>, <Ranking: 1: a3>]
+
+# Regression test for #10742:
+# Queries used in an __in clause don't execute subqueries
+
+>>> subq = Author.objects.filter(num__lt=3000)
+>>> qs = Author.objects.filter(pk__in=subq)
+>>> list(qs)
+[<Author: a1>, <Author: a2>]
+# The subquery result cache should not be populated
+>>> subq._result_cache is None
+True
+
+>>> subq = Author.objects.filter(num__lt=3000)
+>>> qs = Author.objects.exclude(pk__in=subq)
+>>> list(qs)
+[<Author: a3>, <Author: a4>]
+# The subquery result cache should not be populated
+>>> subq._result_cache is None
+True
+
+>>> subq = Author.objects.filter(num__lt=3000)
+>>> list(Author.objects.filter(Q(pk__in=subq) & Q(name='a1')))
+[<Author: a1>]
+# The subquery result cache should not be populated
+>>> subq._result_cache is None
+True
+
"""}
# In Python 2.3 and the Python 2.6 beta releases, exceptions raised in __len__
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com
To unsubscribe from this group, send email to
django-updates+unsubscr...@googlegroups.com
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
