diff options
| -rw-r--r-- | django/db/models/query.py | 14 | ||||
| -rw-r--r-- | tests/modeltests/basic/tests.py | 7 |
2 files changed, 19 insertions, 2 deletions
diff --git a/django/db/models/query.py b/django/db/models/query.py index 0f3a79a25d..ec35f8aba3 100644 --- a/django/db/models/query.py +++ b/django/db/models/query.py @@ -104,7 +104,7 @@ class QuerySet(object): len(self) if self._result_cache is None: - self._iter = self.iterator() + self._iter = self._safe_iterator(self.iterator()) self._result_cache = [] if self._iter: return self._result_iter() @@ -341,6 +341,18 @@ class QuerySet(object): yield obj + def _safe_iterator(self, iterator): + # ensure result cache is cleared when iterating over a queryset + # raises an exception + try: + for item in iterator: + yield item + except StopIteration: + raise + except Exception: + self._result_cache = None + raise + def aggregate(self, *args, **kwargs): """ Returns a dictionary containing the calculations (aggregation) diff --git a/tests/modeltests/basic/tests.py b/tests/modeltests/basic/tests.py index e408df8d46..2de87a225f 100644 --- a/tests/modeltests/basic/tests.py +++ b/tests/modeltests/basic/tests.py @@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals from datetime import datetime -from django.core.exceptions import ObjectDoesNotExist, MultipleObjectsReturned +from django.core.exceptions import ObjectDoesNotExist, MultipleObjectsReturned, FieldError from django.db.models.fields import Field, FieldDoesNotExist from django.db.models.query import QuerySet, EmptyQuerySet, ValuesListQuerySet from django.test import TestCase, skipIfDBFeature, skipUnlessDBFeature @@ -686,3 +686,8 @@ class ModelTest(TestCase): Article.objects.create(headline='foo', pub_date=datetime.now()) with self.assertNumQueries(0): self.assertEqual(len(Article.objects.none().distinct('headline', 'pub_date')), 0) + + def test_invalid_qs_list(self): + qs = Article.objects.order_by('invalid_column') + self.assertRaises(FieldError, list, qs) + self.assertRaises(FieldError, list, qs)
\ No newline at end of file |