p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #29108 -- Fixed crash in aggregation of distinct+ordered+sliced querysets. 

Regression in 4acae21846.
Thanks Stephen Brooks for the report.
This commit is contained in:
Simon Charette 2018-02-08 09:59:25 -05:00 committed by Tim Graham
parent 01bfa9219b
commit d61fe24601
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
django/db/models/sql/compiler.py
View File

@ -547,7 +547,9 @@ class SQLCompiler:
# to exclude extraneous selects. # to exclude extraneous selects.
sub_selects = [] sub_selects = []
sub_params = [] sub_params = []
for select, _, alias in self.select: for index, (select, _, alias) in enumerate(self.select, start=1):
if not alias and with_col_aliases:
alias = 'col%d' % index
if alias: if alias:
sub_selects.append("%s.%s" % ( sub_selects.append("%s.%s" % (
self.connection.ops.quote_name('subquery'), self.connection.ops.quote_name('subquery'),
@ -561,7 +563,7 @@ class SQLCompiler:
return 'SELECT %s FROM (%s) subquery' % ( return 'SELECT %s FROM (%s) subquery' % (
', '.join(sub_selects), ', '.join(sub_selects),
' '.join(result), ' '.join(result),
), sub_params + params ), tuple(sub_params + params)
return ' '.join(result), tuple(params) return ' '.join(result), tuple(params)
finally: finally:

3
docs/releases/2.0.3.txt
View File

@ -9,4 +9,5 @@ Django 2.0.3 fixes several bugs in 2.0.2.
Bugfixes Bugfixes
======== ========
* ... * Fixed a regression that caused sliced ``QuerySet.distinct().order_by()``
followed by ``count()`` to crash (:ticket:`29108`).

3
tests/queries/tests.py
View File

@ -1918,6 +1918,9 @@ class Queries6Tests(TestCase):
qs = Tag.objects.exclude(category=None).exclude(category__name='foo') qs = Tag.objects.exclude(category=None).exclude(category__name='foo')
self.assertEqual(str(qs.query).count(' INNER JOIN '), 1) self.assertEqual(str(qs.query).count(' INNER JOIN '), 1)
def test_distinct_ordered_sliced_subquery_aggregation(self):
self.assertEqual(Tag.objects.distinct().order_by('category__name')[:3].count(), 3)
class RawQueriesTests(TestCase): class RawQueriesTests(TestCase):
def setUp(self): def setUp(self):