gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge #17022 - Use correct min MySQL version for axis-order (8.0.1)

Browse Source 
Pull-request: #17022

Signed-off-by: William Desportes <williamdes@wdes.fr>
This commit is contained in:
William Desportes 2021-07-20 01:46:13 +02:00
commit 5d61d0b87e
No known key found for this signature in database
GPG Key ID: 90A0EF1B8251A889
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/classes/Gis/GisVisualization.php
View File

@ -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\'';
}

2
libraries/classes/Util.php
View File

@ -1662,7 +1662,7 @@ class Util
$spatialSrid = 'ST_SRID';
}
if ($mysqlVersionInt >= 80010 && ! $dbi->isMariaDb()) {
if ($mysqlVersionInt >= 80001 && ! $dbi->isMariaDb()) {
$axisOrder = ', \'axis-order=long-lat\'';
}

4
test/classes/Gis/GisVisualizationTest.php
View File

@ -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,
]),

4
test/classes/UtilTest.php
View File

@ -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\')',