Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #13227 -- Ensure that the query cache is flushed when a QuerySe…

…t is deepcopied, avoiding problems when an evaluated queryset is used as a subquery. Thanks to claudep for the report.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@12970 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit e93f56b174b6105943b68dfc3d2b81ccdc3c364a 1 parent b3390fe
@freakboy3742 freakboy3742 authored
View
9 django/db/models/query.py
@@ -45,11 +45,12 @@ 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)
+ for k,v in self.__dict__.items():
+ if k in ('_iter','_result_cache'):
+ obj.__dict__[k] = None
+ else:
+ obj.__dict__[k] = deepcopy(v, memo)
return obj
def __getstate__(self):
View
20 tests/regressiontests/queries/tests.py
@@ -4,7 +4,7 @@
from django.db.models import Count
from django.test import TestCase
-from models import Tag, Annotation, DumbCategory
+from models import Tag, Annotation, DumbCategory, Note, ExtraInfo
class QuerysetOrderedTests(unittest.TestCase):
"""
@@ -63,3 +63,21 @@ def test_sliced_delete(self):
# This prevents us from even evaluating this test case at all.
# Refs #10099
self.assertFalse(connections[DEFAULT_DB_ALIAS].features.allow_sliced_subqueries)
+
+class CloneTests(TestCase):
+ def test_evaluated_queryset_as_argument(self):
+ "#13227 -- If a queryset is already evaluated, it can still be used as a query arg"
+ n = Note(note='Test1', misc='misc')
+ n.save()
+ e = ExtraInfo(info='good', note=n)
+ e.save()
+
+ n_list = Note.objects.all()
+ # Evaluate the Note queryset, populating the query cache
+ list(n_list)
+ # Use the note queryset in a query, and evalute
+ # that query in a way that involves cloning.
+ try:
+ self.assertEquals(ExtraInfo.objects.filter(note__in=n_list)[0].info, 'good')
+ except:
+ self.fail('Query should be clonable')
Please sign in to comment.
Something went wrong with that request. Please try again.