diff options
| author | Sergey Fedoseev <fedoseev.sergey@gmail.com> | 2016-06-22 00:57:45 +0500 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2016-07-28 18:09:47 -0400 |
| commit | 25581e63823e2961dd67e2beb65f0c927749b712 (patch) | |
| tree | fcc99d1d5542eadff4f1d769918da648a75585e0 /tests | |
| parent | 9805726ddcdef22c471fd8cf39e77f19b6937c28 (diff) | |
[1.10.x] Refs #26657 -- Fixed a crash induced by invalid WKT returned by MySQL 5.7.5+.
Backport of 4178488881f4e703c4e47ea78720dd61e0230ce5 from master
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/gis_tests/geoapp/test_functions.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/gis_tests/geoapp/test_functions.py b/tests/gis_tests/geoapp/test_functions.py index 3d42a4e407..c0e0a37ab3 100644 --- a/tests/gis_tests/geoapp/test_functions.py +++ b/tests/gis_tests/geoapp/test_functions.py @@ -223,7 +223,7 @@ class GISFunctionsTests(TestCase): geom = Point(5, 23, srid=4326) qs = Country.objects.annotate(inter=functions.Intersection('mpoly', geom)) for c in qs: - if spatialite or mysql or oracle: + if spatialite or (mysql and not connection.ops.uses_invalid_empty_geometry_collection) or oracle: # When the intersection is empty, some databases return None. expected = None else: |