MySQL: Support geometry in MySQL 8 (bug #574)

diff --git a/adminer/drivers/mysql.inc.php b/adminer/drivers/mysql.inc.php
index e43d3c7e6294e0f5b0769e31656a7b5faf57d94a..872ea938a31998cae00e787e46d1934ecbae996c 100644 (file)
--- a/adminer/drivers/mysql.inc.php
+++ b/adminer/drivers/mysql.inc.php
@@ -981,6 +981,7 @@ if (!defined("DRIVER")) {
        * @return string
        */
        function convert_field($field) {
+               global $connection;
                if (preg_match("~binary~", $field["type"])) {
                        return "HEX(" . idf_escape($field["field"]) . ")";
                }
@@ -988,7 +989,7 @@ if (!defined("DRIVER")) {
                        return "BIN(" . idf_escape($field["field"]) . " + 0)"; // + 0 is required outside MySQLnd
                }
                if (preg_match("~geometry|point|linestring|polygon~", $field["type"])) {
-                       return "AsWKT(" . idf_escape($field["field"]) . ")";
+                       return ($connection->server_info >= 8 ? "ST_" : "") . "AsWKT(" . idf_escape($field["field"]) . ")";
                }
        }
 

diff --git a/changes.txt b/changes.txt
index 0c31d8df9aef54429eddb447d5016cbbcea020e2..15fdbb2c94fb08c2660b4f5724a59a1975d449f9 100644 (file)
--- a/changes.txt
+++ b/changes.txt
@@ -1,6 +1,7 @@
 Adminer 4.4.1-dev:
 Adminer: Fix Search data in tables (regression from 4.4.0)
 CSP: Allow any styles, images, media and fonts, disallow base-uri
+MySQL: Support geometry in MySQL 8 (bug #574)
 SQLite: Enable foreign key checks
 PostgreSQL: Respect NULL default value
 PostgreSQL: Do not export triggers if not requested