From 293fd5da5b8c7b79bd34ef793ab45c1bb8ac69ea Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Fri, 30 Jan 2015 11:23:20 -0500 Subject: Reverted "Fixed #6785 -- Made QuerySet.get() fetch a limited number of rows." This reverts commit da79ccca1d34f427952cce4555e598a700adb8de. This optimized the unsuccessful case at the expense of the successful one. --- tests/basic/tests.py | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) (limited to 'tests/basic') diff --git a/tests/basic/tests.py b/tests/basic/tests.py index 3f91835f16..ad21b2b1c1 100644 --- a/tests/basic/tests.py +++ b/tests/basic/tests.py @@ -10,7 +10,7 @@ from django.db import DatabaseError from django.db.models.fields import Field from django.db.models.fields.related import ForeignObjectRel from django.db.models.manager import BaseManager -from django.db.models.query import QuerySet, EmptyQuerySet, MAX_GET_RESULTS +from django.db.models.query import QuerySet, EmptyQuerySet from django.test import TestCase, TransactionTestCase, skipIfDBFeature, skipUnlessDBFeature from django.utils import six from django.utils.translation import ugettext_lazy @@ -178,30 +178,6 @@ class ModelTest(TestCase): self.assertNotEqual(Article.objects.get(id__exact=a1.id), Article.objects.get(id__exact=a2.id)) - def test_multiple_objects_max_num_fetched(self): - """ - #6785 - get() should fetch a limited number of results. - """ - Article.objects.bulk_create( - Article(headline='Area %s' % i, pub_date=datetime(2005, 7, 28)) - for i in range(MAX_GET_RESULTS) - ) - six.assertRaisesRegex( - self, - MultipleObjectsReturned, - "get\(\) returned more than one Article -- it returned %d!" % MAX_GET_RESULTS, - Article.objects.get, - headline__startswith='Area', - ) - Article.objects.create(headline='Area %s' % MAX_GET_RESULTS, pub_date=datetime(2005, 7, 28)) - six.assertRaisesRegex( - self, - MultipleObjectsReturned, - "get\(\) returned more than one Article -- it returned more than %d!" % MAX_GET_RESULTS, - Article.objects.get, - headline__startswith='Area', - ) - @skipUnlessDBFeature('supports_microsecond_precision') def test_microsecond_precision(self): # In PostgreSQL, microsecond-level precision is available. -- cgit v1.3