mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-09-24 19:23:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Reverted "Fixed #6785 -- Made QuerySet.get() fetch a limited number of rows."

Browse source 
This reverts commit da79ccca1d.

This optimized the unsuccessful case at the expense of the successful one.
This commit is contained in:
Tim Graham 2015-01-30 11:23:20 -05:00
parent 955f70904a
commit 293fd5da5b
2 changed files with 5 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

16
django/db/models/query.py
View file

@ -23,10 +23,6 @@ from django.utils import six
from django.utils import timezone
from django.utils.version import get_version
# The maximum number (one less than the max to be precise) of results to fetch
# in a get() query
MAX_GET_RESULTS = 20
# The maximum number of items to display in a QuerySet.__repr__
REPR_OUTPUT_SIZE = 20
@ -379,21 +375,17 @@ class QuerySet(object):
clone = self.filter(*args, **kwargs)
if self.query.can_filter():
clone = clone.order_by()
if (not clone.query.select_for_update or
connections[self.db].features.supports_select_for_update_with_limit):
clone = clone[:MAX_GET_RESULTS + 1]
num = len(clone)
if num == 1:
return clone._result_cache[0]
if not num:
raise self.model.DoesNotExist(
"%s matching query does not exist." %
self.model._meta.object_name)
raise self.model.MultipleObjectsReturned(
"get() returned more than one %s -- it returned %s!" % (
self.model._meta.object_name,
num if num <= MAX_GET_RESULTS else 'more than %s' % MAX_GET_RESULTS
self.model._meta.object_name
)
raise self.model.MultipleObjectsReturned(
"get() returned more than one %s -- it returned %s!" %
(self.model._meta.object_name, num)
)
def create(self, **kwargs):