MySQL: Support geometry in MySQL 8 (bug #574)
This commit is contained in:
parent
a2adb67d2f
commit
c789c147b7
|
@ -981,6 +981,7 @@ if (!defined("DRIVER")) {
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
function convert_field($field) {
|
function convert_field($field) {
|
||||||
|
global $connection;
|
||||||
if (preg_match("~binary~", $field["type"])) {
|
if (preg_match("~binary~", $field["type"])) {
|
||||||
return "HEX(" . idf_escape($field["field"]) . ")";
|
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
|
return "BIN(" . idf_escape($field["field"]) . " + 0)"; // + 0 is required outside MySQLnd
|
||||||
}
|
}
|
||||||
if (preg_match("~geometry|point|linestring|polygon~", $field["type"])) {
|
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"]) . ")";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
Adminer 4.4.1-dev:
|
Adminer 4.4.1-dev:
|
||||||
Adminer: Fix Search data in tables (regression from 4.4.0)
|
Adminer: Fix Search data in tables (regression from 4.4.0)
|
||||||
CSP: Allow any styles, images, media and fonts, disallow base-uri
|
CSP: Allow any styles, images, media and fonts, disallow base-uri
|
||||||
|
MySQL: Support geometry in MySQL 8 (bug #574)
|
||||||
SQLite: Enable foreign key checks
|
SQLite: Enable foreign key checks
|
||||||
PostgreSQL: Respect NULL default value
|
PostgreSQL: Respect NULL default value
|
||||||
PostgreSQL: Do not export triggers if not requested
|
PostgreSQL: Do not export triggers if not requested
|
||||||
|
|
Loading…
Reference in a new issue