Use ST_GeomFromText in MySQL 8 (bug #574)

diff --git a/adminer/drivers/mysql.inc.php b/adminer/drivers/mysql.inc.php
index 34096740d326a3c96b0eb98c6b9767e33bc0f510..3a974d1dc7671b5c03f8c622b085a9e3fc5f7193 100644 (file)
--- a/adminer/drivers/mysql.inc.php
+++ b/adminer/drivers/mysql.inc.php
@@ -1021,7 +1021,7 @@ if (!defined("DRIVER")) {
                        $return = "CONV($return, 2, 10) + 0";
                }
                if (preg_match("~geometry|point|linestring|polygon~", $field["type"])) {
-                       $return = "GeomFromText($return)";
+                       $return = (min_version(8) ? "ST_" : "") . "GeomFromText($return)";
                }
                return $return;
        }

diff --git a/changes.txt b/changes.txt
index 71a965fda5fb799467e80130b1922e3ee423edb4..2550fb45d23398a41166642561c13ebf2be2b739 100644 (file)
--- a/changes.txt
+++ b/changes.txt
@@ -1,4 +1,5 @@
 Adminer 4.6.1-dev:
+MySQL: Support geometry in MySQL 8 (bug #574)
 PostgreSQL: Don't treat interval type as number (bug #474)
 PostgreSQL: Fix condition for selecting no rows