Use ST_SRID() in mysql driver for MySQL 8

`SRID()` is no longer available in MySQL 8 and has been replaced with `ST_SRID`

diff --git a/adminer/drivers/mysql.inc.php b/adminer/drivers/mysql.inc.php
index ebb5106b443106b9d1eb47a168cf7a2e9550dffe..1ba8d651205c673ef98dca197a4bd48b75d0ce17 100644 (file)
--- a/adminer/drivers/mysql.inc.php
+++ b/adminer/drivers/mysql.inc.php
@@ -1099,7 +1099,8 @@ if (!defined("DRIVER")) {
                        $return = "CONV($return, 2, 10) + 0";
                }
                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;
        }

diff --git a/adminer/include/version.inc.php b/adminer/include/version.inc.php
index 59333b9552467d47a0e3c9d660af7e46f7454d28..9ef310c8caf921de4471a753b252317983b868f6 100644 (file)
--- a/adminer/include/version.inc.php
+++ b/adminer/include/version.inc.php
@@ -1,2 +1,2 @@
 <?php
-$VERSION = "4.8.1";
+$VERSION = "4.8.2-dev";

diff --git a/changes.txt b/changes.txt
index b016ff71dc4099547295ef592fe15528ab754594..aa8a7cf252c4ecaf5bcc870e850e0f2b72f5b614 100644 (file)
--- a/changes.txt
+++ b/changes.txt
@@ -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):
 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)