beenull/adminerevo
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Use ST_SRID() in mysql driver for MySQL 8

Browse source 
`SRID()` is no longer available in MySQL 8 and has been replaced with `ST_SRID`
This commit is contained in:
Benjamin Cremer 2021-03-12 10:29:32 +01:00 committed by Jakub Vrana
parent 1f173e18bd
commit db01282e29
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
adminer/drivers/mysql.inc.php
View file

@ -1099,7 +1099,8 @@ if (!defined("DRIVER")) {
$return = "CONV($return, 2, 10) + 0"; $return = "CONV($return, 2, 10) + 0";
} }
if (preg_match("~geometry|point|linestring|polygon~", $field["type"])) { if (preg_match("~geometry|point|linestring|polygon~", $field["type"])) {
$return = (min_version(8) ? "ST_" : "") . "GeomFromText($return, SRID($field[field]))"; $prefix = (min_version(8) ? "ST_" : "");
$return = $prefix . "GeomFromText($return, $prefix" . "SRID($field[field]))";
} }
return $return; return $return;
} }

2
adminer/include/version.inc.php
View file

@ -1,2 +1,2 @@
<?php <?php
$VERSION = "4.8.1"; $VERSION = "4.8.2-dev";

3
changes.txt
View file

@ -1,3 +1,6 @@
Adminer 4.8.2-dev:
MySQL: Use ST_SRID() instead of SRID() for MySQL 8 (PR #418)
Adminer 4.8.1 (released 2021-05-14): Adminer 4.8.1 (released 2021-05-14):
Internet Explorer or PDO in Adminer 4.7.8-4.8.0: Fix XSS in doc_link (bug #797) Internet Explorer or PDO in Adminer 4.7.8-4.8.0: Fix XSS in doc_link (bug #797)
Fix more PHP 8 warnings (bug #781) Fix more PHP 8 warnings (bug #781)