From eb3699ea775548a22e0407ad12bf8cbdeaf95ff5 Mon Sep 17 00:00:00 2001 From: Mariusz Felisiak Date: Fri, 8 Jul 2022 13:30:12 +0200 Subject: Fixed #33718 -- Dropped support for MySQL 5.7. --- tests/aggregation/tests.py | 6 +++--- tests/backends/mysql/tests.py | 4 ++-- tests/gis_tests/geoapp/tests.py | 5 +---- 3 files changed, 6 insertions(+), 9 deletions(-) (limited to 'tests') diff --git a/tests/aggregation/tests.py b/tests/aggregation/tests.py index c6d73e8042..75a4e0d022 100644 --- a/tests/aggregation/tests.py +++ b/tests/aggregation/tests.py @@ -1837,7 +1837,7 @@ class AggregateTestCase(TestCase): default=datetime.time(17), ) if connection.vendor == "mysql": - # Workaround for #30224 for MySQL 8.0+ & MariaDB. + # Workaround for #30224 for MySQL & MariaDB. expr.default = Cast(expr.default, TimeField()) queryset = Book.objects.annotate(oldest_store_opening=expr).order_by("isbn") self.assertSequenceEqual( @@ -1887,7 +1887,7 @@ class AggregateTestCase(TestCase): def test_aggregation_default_using_date_from_python(self): expr = Min("book__pubdate", default=datetime.date(1970, 1, 1)) if connection.vendor == "mysql": - # Workaround for #30224 for MySQL 5.7+ & MariaDB. + # Workaround for #30224 for MySQL & MariaDB. expr.default = Cast(expr.default, DateField()) queryset = Publisher.objects.annotate(earliest_pubdate=expr).order_by("name") self.assertSequenceEqual( @@ -1938,7 +1938,7 @@ class AggregateTestCase(TestCase): default=datetime.datetime(1970, 1, 1), ) if connection.vendor == "mysql": - # Workaround for #30224 for MySQL 8.0+ & MariaDB. + # Workaround for #30224 for MySQL & MariaDB. expr.default = Cast(expr.default, DateTimeField()) queryset = Book.objects.annotate(oldest_store_opening=expr).order_by("isbn") self.assertSequenceEqual( diff --git a/tests/backends/mysql/tests.py b/tests/backends/mysql/tests.py index d02f465cbf..da6c53de48 100644 --- a/tests/backends/mysql/tests.py +++ b/tests/backends/mysql/tests.py @@ -110,8 +110,8 @@ class Tests(TestCase): mocked_get_database_version.return_value = (10, 3) msg = "MariaDB 10.4 or later is required (found 10.3)." else: - mocked_get_database_version.return_value = (5, 6) - msg = "MySQL 5.7 or later is required (found 5.6)." + mocked_get_database_version.return_value = (5, 7) + msg = "MySQL 8 or later is required (found 5.7)." with self.assertRaisesMessage(NotSupportedError, msg): connection.check_database_version_supported() diff --git a/tests/gis_tests/geoapp/tests.py b/tests/gis_tests/geoapp/tests.py index fd5fc3c793..8a86d4a2be 100644 --- a/tests/gis_tests/geoapp/tests.py +++ b/tests/gis_tests/geoapp/tests.py @@ -345,12 +345,9 @@ 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 connection.ops.oracle or ( - connection.ops.mysql and connection.mysql_version < (8, 0, 0) - ): + if connection.ops.oracle: # Kansas has adjacent vertices with distance 6.99244813842e-12 # which is smaller than the default Oracle tolerance. - # It's invalid on MySQL < 8 also. qs = qs.exclude(name="Kansas") self.assertEqual( State.objects.filter(name="Kansas", poly__isvalid=False).count(), 1 -- cgit v1.3