mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-12-04 00:55:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fixed #28658 -- Added DISTINCT handling to the Aggregate class.

Browse source
This commit is contained in:
Simon Charette 2019-01-09 17:52:36 -05:00 • committed by Tim Graham
parent 222caab68a
commit bc05547cd8
9 changed files with 83 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tests/aggregation/tests.py
View file

@ -1026,7 +1026,7 @@ class AggregateTestCase(TestCase):
# test completely changing how the output is rendered
def lower_case_function_override(self, compiler, connection):
sql, params = compiler.compile(self.source_expressions[0])
substitutions = {'function': self.function.lower(), 'expressions': sql}
substitutions = {'function': self.function.lower(), 'expressions': sql, 'distinct': ''}
substitutions.update(self.extra)
return self.template % substitutions, params
setattr(MySum, 'as_' + connection.vendor, lower_case_function_override)
@ -1053,7 +1053,7 @@ class AggregateTestCase(TestCase):
# test overriding all parts of the template
def be_evil(self, compiler, connection):
substitutions = {'function': 'MAX', 'expressions': '2'}
substitutions = {'function': 'MAX', 'expressions': '2', 'distinct': ''}
substitutions.update(self.extra)
return self.template % substitutions, ()
setattr(MySum, 'as_' + connection.vendor, be_evil)