p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed #29503 -- Made __in lookup keep order of values in query. 

Regression in 86eccdc8b6.
This commit is contained in:
Nick Pope 2018-06-18 14:22:27 +01:00 committed by Tim Graham
parent d21d1f9e05
commit b0fbfae093
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
django/db/models/lookups.py
View File

@ -6,6 +6,7 @@ from django.core.exceptions import EmptyResultSet
from django.db.models.expressions import Func, Value from django.db.models.expressions import Func, Value
from django.db.models.fields import DateTimeField, Field, IntegerField from django.db.models.fields import DateTimeField, Field, IntegerField
from django.db.models.query_utils import RegisterLookupMixin from django.db.models.query_utils import RegisterLookupMixin
from django.utils.datastructures import OrderedSet
from django.utils.functional import cached_property from django.utils.functional import cached_property
@ -326,7 +327,7 @@ class In(FieldGetDbPrepValueIterableMixin, BuiltinLookup):
if self.rhs_is_direct_value(): if self.rhs_is_direct_value():
try: try:
rhs = set(self.rhs) rhs = OrderedSet(self.rhs)
except TypeError: # Unhashable items in self.rhs except TypeError: # Unhashable items in self.rhs
rhs = self.rhs rhs = self.rhs

4
tests/lookup/tests.py
View File

@ -556,6 +556,10 @@ class LookupTests(TestCase):
): ):
list(Article.objects.filter(id__in=Article.objects.using('other').all())) list(Article.objects.filter(id__in=Article.objects.using('other').all()))
def test_in_keeps_value_ordering(self):
query = Article.objects.filter(slug__in=['a%d' % i for i in range(1, 8)]).values('pk').query
self.assertIn(' IN (a1, a2, a3, a4, a5, a6, a7) ', str(query))
def test_error_messages(self): def test_error_messages(self):
# Programming errors are pointed out with nice error messages # Programming errors are pointed out with nice error messages
with self.assertRaisesMessage( with self.assertRaisesMessage(