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

Fix #14383 #12865 - Fix GIS functions for mysql 8.0

Browse Source 
Fixes: #14383
Fixes: #12865
Signed-off-by: William Desportes <williamdes@wdes.fr>
This commit is contained in:
William Desportes 2019-04-03 16:12:12 +02:00
parent d4bc58add6
commit 9ed068aacb
No known key found for this signature in database
GPG Key ID: 90A0EF1B8251A889
4 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gis_data_editor.php
View File

@ -88,7 +88,8 @@ $result = "'" . $wkt . "'," . $srid;
$visualizationSettings = array(
'width' => 450,
'height' => 300,
'spatialColumn' => 'wkt'
'spatialColumn' => 'wkt',
'mysqlVersion' => $GLOBALS['dbi']->getVersion()
);
$data = array(array('wkt' => $wkt_with_zero, 'srid' => $srid));
$visualization = GisVisualization::getByData($data, $visualizationSettings)

3
libraries/classes/Controllers/Table/TableGisVisualizationController.php
View File

@ -119,6 +119,9 @@ class TableGisVisualizationController extends TableController
}
}
// Check mysql version
$this->visualizationSettings['mysqlVersion'] = $this->dbi->getVersion();
// Get settings if any posted
if (Core::isValid($_REQUEST['visualizationSettings'], 'array')) {
$this->visualizationSettings = $_REQUEST['visualizationSettings'];

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

@ -163,6 +163,14 @@ class GisVisualization
private function _modifySqlQuery($sql_query, $rows, $pos)
{
$modified_query = 'SELECT ';
$spatialAsText = 'ASTEXT';
$spatialSrid = 'SRID';
if ($this->_userSpecifiedSettings['mysqlVersion'] >= 50600) {
$spatialAsText = 'ST_ASTEXT';
$spatialSrid = 'ST_SRID';
}
// If label column is chosen add it to the query
if (!empty($this->_userSpecifiedSettings['labelColumn'])) {
$modified_query .= Util::backquote(
@ -170,8 +178,8 @@ class GisVisualization
)
. ', ';
}
// Wrap the spatial column with 'ASTEXT()' function and add it
$modified_query .= 'ASTEXT('
// Wrap the spatial column with 'ST_ASTEXT()' function and add it
$modified_query .= $spatialAsText . '('
. Util::backquote($this->_userSpecifiedSettings['spatialColumn'])
. ') AS ' . Util::backquote(
$this->_userSpecifiedSettings['spatialColumn']
@ -179,7 +187,7 @@ class GisVisualization
. ', ';
// Get the SRID
$modified_query .= 'SRID('
$modified_query .= $spatialSrid . '('
. Util::backquote($this->_userSpecifiedSettings['spatialColumn'])
. ') AS ' . Util::backquote('srid') . ' ';
@ -542,7 +550,12 @@ class GisVisualization
*/
private function _scaleDataSet(array $data)
{
$min_max = array();
$min_max = array(
'maxX' => 0.0,
'maxY' => 0.0,
'minX' => 0.0,
'minY' => 0.0
);
$border = 15;
// effective width and height of the plot
$plot_width = $this->_settings['width'] - 2 * $border;

10
libraries/classes/Util.php
View File

@ -2991,9 +2991,15 @@ class Util
{
// Convert to WKT format
$hex = bin2hex($data);
$wktsql = "SELECT ASTEXT(x'" . $hex . "')";
$spatialAsText = 'ASTEXT';
$spatialSrid = 'SRID';
if ($GLOBALS['dbi']->getVersion() >= 50600) {
$spatialAsText = 'ST_ASTEXT';
$spatialSrid = 'ST_SRID';
}
$wktsql = "SELECT $spatialAsText(x'" . $hex . "')";
if ($includeSRID) {
$wktsql .= ", SRID(x'" . $hex . "')";
$wktsql .= ", $spatialSrid(x'" . $hex . "')";
}
$wktresult = $GLOBALS['dbi']->tryQuery(