From: Jakub Vrana Date: Mon, 10 Mar 2025 20:09:09 +0000 (+0100) Subject: MySQL: Allow setting default values of text column X-Git-Tag: v5.0.3~28 X-Git-Url: https://git.joonet.de/?a=commitdiff_plain;h=aeac0a332999683337a003eb76b4a6886470a22b;p=adminer.git MySQL: Allow setting default values of text column --- diff --git a/adminer/include/editing.inc.php b/adminer/include/editing.inc.php index 7528ea04..6d1777dc 100644 --- a/adminer/include/editing.inc.php +++ b/adminer/include/editing.inc.php @@ -308,7 +308,7 @@ function default_value($field) { return ($default === null ? "" : (in_array($generated, $driver->generated) ? (JUSH == "mssql" ? " AS ($default)" . ($generated == "VIRTUAL" ? "" : " $generated") . "" : " GENERATED ALWAYS AS ($default) $generated") : " DEFAULT " . (!preg_match('~^GENERATED ~i', $default) && (preg_match('~char|binary|text|enum|set~', $field["type"]) || preg_match('~^(?![a-z])~i', $default)) - ? q($default) + ? (JUSH == "sql" && preg_match('~text~', $field["type"]) ? "(" . q($default) . ")" : q($default)) // MySQL requires () around default value of text column : str_ireplace("current_timestamp()", "CURRENT_TIMESTAMP", (JUSH == "sqlite" ? "($default)" : $default)) ) )); diff --git a/changes.txt b/changes.txt index a8d65b43..a6092a48 100644 --- a/changes.txt +++ b/changes.txt @@ -2,6 +2,7 @@ Adminer dev: Fix gzip export (bug #896) Fix importing multiple SQL files not terminated by semicolon Use for altering collations +MySQL: Allow setting default values of text column MySQL, MariaDB: Fix default values with ' (bug #895) MariaDB: Fix creating and altering generated columns (bug #897)