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

[1.8.x] Refs #14030 -- Added tests for Value aggregates 

Backport of bd4afef984 from master
This commit is contained in:
Josh Smeaton 2015-02-13 10:06:46 +11:00
parent 1784c326b1
commit 47b23ca2ee
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/aggregation/tests.py
View File

@ -8,7 +8,7 @@ from django.core.exceptions import FieldError
from django.db import connection from django.db import connection
from django.db.models import ( from django.db.models import (
F, Aggregate, Avg, Count, DecimalField, FloatField, Func, IntegerField, F, Aggregate, Avg, Count, DecimalField, FloatField, Func, IntegerField,
Max, Min, Sum, Max, Min, Sum, Value,
) )
from django.test import TestCase, ignore_warnings from django.test import TestCase, ignore_warnings
from django.test.utils import Approximate, CaptureQueriesContext from django.test.utils import Approximate, CaptureQueriesContext
@ -706,7 +706,9 @@ class ComplexAggregateTestCase(TestCase):
Book.objects.aggregate(fail=F('price')) Book.objects.aggregate(fail=F('price'))
def test_nonfield_annotation(self): def test_nonfield_annotation(self):
book = Book.objects.annotate(val=Max(2, output_field=IntegerField()))[0] book = Book.objects.annotate(val=Max(Value(2, output_field=IntegerField())))[0]
self.assertEqual(book.val, 2)
book = Book.objects.annotate(val=Max(Value(2), output_field=IntegerField()))[0]
self.assertEqual(book.val, 2) self.assertEqual(book.val, 2)
book = Book.objects.annotate(val=Max(2, output_field=IntegerField()))[0] book = Book.objects.annotate(val=Max(2, output_field=IntegerField()))[0]
self.assertEqual(book.val, 2) self.assertEqual(book.val, 2)