mirror/php-adminer
1
0
Fork 0
mirror of https://github.com/vrana/adminer.git synced 2025-08-08 15:47:00 +02:00
Code Issues Releases Wiki Activity

Use ST_GeomFromText in MySQL 8 (bug #574)

Browse Source
This commit is contained in:
Jakub Vrana
2018-02-06 13:07:37 +01:00
parent c52fb951b0
commit c2de3b8ec1
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
adminer/drivers/mysql.inc.php
View File

@@ -1021,7 +1021,7 @@ if (!defined("DRIVER")) {
$return = "CONV($return, 2, 10) + 0"; $return = "CONV($return, 2, 10) + 0";
} }
if (preg_match("~geometry|point|linestring|polygon~", $field["type"])) { if (preg_match("~geometry|point|linestring|polygon~", $field["type"])) {
$return = "GeomFromText($return)"; $return = (min_version(8) ? "ST_" : "") . "GeomFromText($return)";
} }
return $return; return $return;
} }

1
changes.txt
View File

@@ -1,4 +1,5 @@
Adminer 4.6.1-dev: Adminer 4.6.1-dev:
MySQL: Support geometry in MySQL 8 (bug #574)
PostgreSQL: Don't treat interval type as number (bug #474) PostgreSQL: Don't treat interval type as number (bug #474)
PostgreSQL: Fix condition for selecting no rows PostgreSQL: Fix condition for selecting no rows