From: Benjamin Cremer <bc@benjamin-cremer.de>
Date: Fri, 12 Mar 2021 09:29:32 +0000 (+0100)
Subject: Use ST_SRID() in mysql driver for MySQL 8
X-Git-Tag: v4.16.0~145
X-Git-Url: https://git.joonet.de/?a=commitdiff_plain;h=db01282e29986ffa265555a59aef8a99eef5843c;p=adminer.git

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 ebb5106b..1ba8d651 100644
--- 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 59333b95..9ef310c8 100644
--- 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 b016ff71..aa8a7cf2 100644
--- 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)