Use ST_SRID() in mysql driver for MySQL 8

`SRID()` is no longer available in MySQL 8 and has been replaced with `ST_SRID`
vrana · May 23, 2021 · db01282 · db01282 · 104979058 · Jul 9, 2021
1 parent 1f173e1
commit db01282
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/adminer/drivers/mysql.inc.php b/adminer/drivers/mysql.inc.php
@@ -1099,7 +1099,8 @@ function unconvert_field($field, $return) {
  $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
@@ -1,2 +1,2 @@
 <?php
-$VERSION = "4.8.1";
+$VERSION = "4.8.2-dev";
diff --git 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)