diff options
| author | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2018-05-31 16:38:42 +0200 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2018-05-31 10:38:42 -0400 |
| commit | d0ad03cded64fc307b15668c81d0c65fd8486eff (patch) | |
| tree | c829c8b3be854a09a6dd1e2772a4d1777d050077 | |
| parent | 8a6fcfdc77d84bd5cebf1e6a6dd65c64f9cb40b8 (diff) | |
Refs #29416 -- Fixed GeoExpressionsTests.test_multiple_annotation() on MySQL 5.7+.
Failure introduced in b6e48f514ebe4e31b76e1750e043d4f296e645dc.
| -rw-r--r-- | tests/gis_tests/geoapp/test_expressions.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/gis_tests/geoapp/test_expressions.py b/tests/gis_tests/geoapp/test_expressions.py index 2d0ebbcae0..89e83a782f 100644 --- a/tests/gis_tests/geoapp/test_expressions.py +++ b/tests/gis_tests/geoapp/test_expressions.py @@ -3,7 +3,7 @@ from unittest import skipUnless from django.contrib.gis.db.models import F, GeometryField, Value, functions from django.contrib.gis.geos import Point, Polygon 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 ..utils import postgis @@ -56,7 +56,7 @@ class GeoExpressionsTests(TestCase): poly=Polygon(((1, 1), (1, 2), (2, 2), (2, 1), (1, 1))), ) 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')) self.assertTrue(qs.first()) |
