summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorRussell Keith-Magee <russell@keith-magee.com>2011-02-08 14:06:59 +0000
committerRussell Keith-Magee <russell@keith-magee.com>2011-02-08 14:06:59 +0000
commitbbfdb36b5485adc84adf7c6090cbd0ea9789d02b (patch)
treec55f7467ef438a8b0751bc92a3f0e99748036f88 /django
parent27e7fcbab015452cb4201f32eb2682bd8dc23feb (diff)
[1.2.X] Fixed #15116 -- Strip ordering clause from in_bulk() queries, since ordering information will be lost. Thanks to lamby for the report and patch.
Backport of r15457 from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15459 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django')
-rw-r--r--django/db/models/query.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/django/db/models/query.py b/django/db/models/query.py
index 3aeb071c81..fe23f1a573 100644
--- a/django/db/models/query.py
+++ b/django/db/models/query.py
@@ -417,6 +417,7 @@ class QuerySet(object):
return {}
qs = self._clone()
qs.query.add_filter(('pk__in', id_list))
+ qs.query.clear_ordering(force_empty=True)
return dict([(obj._get_pk_val(), obj) for obj in qs.iterator()])
def delete(self):