innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Refs #29416 -- Fixed GeoExpressionsTests.test_multiple_annotation() on MySQL 5.7+. 

Failure introduced in b6e48f514e.
This commit is contained in:
Mariusz Felisiak 2018-05-31 16:38:42 +02:00 committed by Tim Graham
parent 8a6fcfdc77
commit d0ad03cded
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/gis_tests/geoapp/test_expressions.py
View File

@ -3,7 +3,7 @@ from unittest import skipUnless
from django.contrib.gis.db.models import F, GeometryField, Value, functions from django.contrib.gis.db.models import F, GeometryField, Value, functions
from django.contrib.gis.geos import Point, Polygon from django.contrib.gis.geos import Point, Polygon
from django.db import connection from django.db import connection
from django.db.models import Count from django.db.models import Count, Min
from django.test import TestCase, skipUnlessDBFeature from django.test import TestCase, skipUnlessDBFeature
from ..utils import postgis from ..utils import postgis
@ -56,7 +56,7 @@ class GeoExpressionsTests(TestCase):
poly=Polygon(((1, 1), (1, 2), (2, 2), (2, 1), (1, 1))), poly=Polygon(((1, 1), (1, 2), (2, 2), (2, 1), (1, 1))),
) )
qs = City.objects.values('name').annotate( qs = City.objects.values('name').annotate(
distance=functions.Distance('multifields__point', multi_field.city.point), distance=Min(functions.Distance('multifields__point', multi_field.city.point)),
).annotate(count=Count('multifields')) ).annotate(count=Count('multifields'))
self.assertTrue(qs.first()) self.assertTrue(qs.first())