From 2cd0edaa477b327024e4007c8eaf46646dcd0f21 Mon Sep 17 00:00:00 2001 From: Grzegorz Nosek Date: Sat, 23 Feb 2013 20:59:09 +0100 Subject: Fixed 19895 -- Made second iteration over invalid queryset raise an exception too When iteration over a queryset raised an exception, the result cache remained initialized with an empty list, so subsequent iterations returned an empty list instead of raising an exception --- tests/modeltests/basic/tests.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'tests/modeltests/basic') 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 -- cgit v1.3