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

MySQL, MariaDB: Fix default values with ' (fix #895)

Browse Source
This commit is contained in:
Jakub Vrana
2025-03-10 21:01:21 +01:00
parent e589ee3fde
commit 31f8f61d0e
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -587,15 +587,28 @@ if (!defined('Adminer\DRIVER')) {
* @return array [$name => ["field" => , "full_type" => , "type" => , "length" => , "unsigned" => , "default" => , "null" => , "auto_increment" => , "on_update" => , "collation" => , "privileges" => , "comment" => , "primary" => , "generated" => ]] * @return array [$name => ["field" => , "full_type" => , "type" => , "length" => , "unsigned" => , "default" => , "null" => , "auto_increment" => , "on_update" => , "collation" => , "privileges" => , "comment" => , "primary" => , "generated" => ]]
*/ */
function fields($table) { function fields($table) {
global $connection;
$maria = preg_match('~MariaDB~', $connection->server_info);
$return = array(); $return = array();
foreach (get_rows("SELECT * FROM information_schema.COLUMNS WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = " . q($table) . " ORDER BY ORDINAL_POSITION") as $row) { foreach (get_rows("SELECT * FROM information_schema.COLUMNS WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = " . q($table) . " ORDER BY ORDINAL_POSITION") as $row) {
$field = $row["COLUMN_NAME"]; $field = $row["COLUMN_NAME"];
$default = $row["COLUMN_DEFAULT"];
$type = $row["COLUMN_TYPE"]; $type = $row["COLUMN_TYPE"];
$generation = $row["GENERATION_EXPRESSION"];
$extra = $row["EXTRA"]; $extra = $row["EXTRA"];
// https://mariadb.com/kb/en/library/show-columns/, https://github.com/vrana/adminer/pull/359#pullrequestreview-276677186 // https://mariadb.com/kb/en/library/show-columns/, https://github.com/vrana/adminer/pull/359#pullrequestreview-276677186
preg_match('~^(VIRTUAL|PERSISTENT|STORED)~', $extra, $generated); preg_match('~^(VIRTUAL|PERSISTENT|STORED)~', $extra, $generated);
preg_match('~^([^( ]+)(?:\((.+)\))?( unsigned)?( zerofill)?$~', $type, $match); preg_match('~^([^( ]+)(?:\((.+)\))?( unsigned)?( zerofill)?$~', $type, $match);
$default = $row["COLUMN_DEFAULT"];
$is_text = preg_match('~text~', $match[1]);
if (!$maria && $is_text) {
// default value a'b of text column is stored as _utf8mb4\'a\\\'b\' in MySQL
$default = preg_replace("~^(_\w+)?('.*')$~", '\2', stripslashes($default));
}
if ($maria || $is_text) {
$default = preg_replace_callback("~^'(.*)'$~", function ($match) {
return str_replace("''", "'", stripslashes($match[1]));
}, $default);
}
$return[$field] = array( $return[$field] = array(
"field" => $field, "field" => $field,
"full_type" => $type, "full_type" => $type,
@@ -603,11 +616,8 @@ if (!defined('Adminer\DRIVER')) {
"length" => $match[2], "length" => $match[2],
"unsigned" => ltrim($match[3] . $match[4]), "unsigned" => ltrim($match[3] . $match[4]),
"default" => ($generated "default" => ($generated
? $row["GENERATION_EXPRESSION"] ? ($maria ? $generation : stripslashes($generation))
: ($default != "" || preg_match("~char|set~", $match[1]) : ($default != "" || preg_match("~char|set~", $match[1]) ? $default : null)
? (preg_match('~text~', $match[1]) ? stripslashes(preg_replace("~^'(.*)'\$~", '\1', $default)) : $default)
: null
)
), ),
"null" => ($row["IS_NULLABLE"] == "YES"), "null" => ($row["IS_NULLABLE"] == "YES"),
"auto_increment" => ($extra == "auto_increment"), "auto_increment" => ($extra == "auto_increment"),

1
changes.txt
View File

@@ -2,6 +2,7 @@ Adminer dev:
Fix gzip export (bug #896) Fix gzip export (bug #896)
Fix importing multiple SQL files not terminated by semicolon Fix importing multiple SQL files not terminated by semicolon
Use <datalist> for altering collations Use <datalist> for altering collations
MySQL, MariaDB: Fix default values with ' (bug #895)
MariaDB: Fix creating and altering generated columns (bug #897) MariaDB: Fix creating and altering generated columns (bug #897)
Adminer 5.0.2 (released 2025-03-10): Adminer 5.0.2 (released 2025-03-10):