From c1c6b01195f6a9f6fba2a9e4529dcc99b278e856 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20Kr=C3=B6g?= <maxi_kroeg@web.de>
Date: Tue, 20 Jul 2021 01:28:29 +0200
Subject: [PATCH] Use correct min MySQL version for axis-order (8.0.1)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

There was no version 8.0.10
https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-1.html

Signed-off-by: Maximilian Krög <maxi_kroeg@web.de>
---
 libraries/classes/Gis/GisVisualization.php | 4 ++--
 libraries/classes/Util.php                 | 2 +-
 test/classes/Gis/GisVisualizationTest.php  | 4 ++--
 test/classes/UtilTest.php                  | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/libraries/classes/Gis/GisVisualization.php b/libraries/classes/Gis/GisVisualization.php
index 97912765ca..2dea3c46f7 100644
--- a/libraries/classes/Gis/GisVisualization.php
+++ b/libraries/classes/Gis/GisVisualization.php
@@ -211,8 +211,8 @@ class GisVisualization
             $spatialSrid = 'ST_SRID';
         }
 
-        // If MYSQL version >= 8.1 override default axis order
-        if ($this->userSpecifiedSettings['mysqlVersion'] >= 80010 && ! $isMariaDb) {
+        // If MYSQL version >= 8.0.1 override default axis order
+        if ($this->userSpecifiedSettings['mysqlVersion'] >= 80001 && ! $isMariaDb) {
             $axisOrder = ', \'axis-order=long-lat\'';
         }
 
diff --git a/libraries/classes/Util.php b/libraries/classes/Util.php
index 03998b1fe9..4fe4653c1d 100644
--- a/libraries/classes/Util.php
+++ b/libraries/classes/Util.php
@@ -1662,7 +1662,7 @@ class Util
             $spatialSrid = 'ST_SRID';
         }
 
-        if ($mysqlVersionInt >= 80010 && ! $dbi->isMariaDb()) {
+        if ($mysqlVersionInt >= 80001 && ! $dbi->isMariaDb()) {
             $axisOrder = ', \'axis-order=long-lat\'';
         }
 
diff --git a/test/classes/Gis/GisVisualizationTest.php b/test/classes/Gis/GisVisualizationTest.php
index 67ad7a3e2f..15c3b6de80 100644
--- a/test/classes/Gis/GisVisualizationTest.php
+++ b/test/classes/Gis/GisVisualizationTest.php
@@ -132,13 +132,13 @@ class GisVisualizationTest extends AbstractTestCase
     }
 
     /**
-     * Modify the query for an MySQL 8.1 version
+     * Modify the query for an MySQL 8.0.1 version
      */
     public function testModifyQueryVersion8(): void
     {
         $queryString = $this->callFunction(
             GisVisualization::getByData([], [
-                'mysqlVersion' => 80010,
+                'mysqlVersion' => 80001,
                 'spatialColumn' => 'abc',
                 'isMariaDB' => false,
             ]),
diff --git a/test/classes/UtilTest.php b/test/classes/UtilTest.php
index 862c2e64de..b2d11a012f 100644
--- a/test/classes/UtilTest.php
+++ b/test/classes/UtilTest.php
@@ -2267,7 +2267,7 @@ class UtilTest extends AbstractTestCase
                 ],
                 '\'POINT(1 1)\',0',
                 true,
-                80010,
+                80001,
             ],
             [
                 'SELECT ST_ASTEXT(x\'000000000101000000000000000000f03f000000000000f03f\'),'
@@ -2288,7 +2288,7 @@ class UtilTest extends AbstractTestCase
                 ],
                 'POINT(1 1)',
                 false,
-                80010,
+                80001,
             ],
             [
                 'SELECT ST_ASTEXT(x\'000000000101000000000000000000f03f000000000000f03f\')',