From f98e1c01eafa724cb87772ae03b3fd1158e9fd50 Mon Sep 17 00:00:00 2001
From: Tom <tom@tomforb.es>
Date: Thu, 5 Jul 2018 21:06:09 +0100
Subject: [PATCH] Refs #29451 -- Fixed test_isvalid_lookup on MySQL 8+.
---
tests/gis_tests/geoapp/tests.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/gis_tests/geoapp/tests.py b/tests/gis_tests/geoapp/tests.py
index 7859adf219..eaf7e61321 100644
--- a/tests/gis_tests/geoapp/tests.py
+++ b/tests/gis_tests/geoapp/tests.py
@@ -300,10 +300,10 @@ class GeoLookupTest(TestCase):
invalid_geom = fromstr('POLYGON((0 0, 0 1, 1 1, 1 0, 1 1, 1 0, 0 0))')
State.objects.create(name='invalid', poly=invalid_geom)
qs = State.objects.all()
- if oracle or mysql:
+ if oracle or (mysql and connection.mysql_version < (8, 0, 0)):
# Kansas has adjacent vertices with distance 6.99244813842e-12
# which is smaller than the default Oracle tolerance.
- # It's invalid on MySQL too.
+ # It's invalid on MySQL < 8 also.
qs = qs.exclude(name='Kansas')
self.assertEqual(State.objects.filter(name='Kansas', poly__isvalid=False).count(), 1)
self.assertEqual(qs.filter(poly__isvalid=False).count(), 1)