From 851700516defae51cf97ff541efd34df05402826 Mon Sep 17 00:00:00 2001 From: Jakub Vrana Date: Tue, 30 Jan 2018 16:50:37 +0100 Subject: [PATCH] Fully support functions in default values --- adminer/include/editing.inc.php | 7 +------ changes.txt | 1 + 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/adminer/include/editing.inc.php b/adminer/include/editing.inc.php index d0bf401b..3f62132b 100644 --- a/adminer/include/editing.inc.php +++ b/adminer/include/editing.inc.php @@ -198,12 +198,7 @@ function process_field($field, $type_field) { idf_escape(trim($field["field"])), process_type($type_field), ($field["null"] ? " NULL" : " NOT NULL"), // NULL for timestamp - (isset($default) ? " DEFAULT " . ( - (preg_match('~time~', $field["type"]) && preg_match('~^(now\(\)|CURRENT_TIMESTAMP(\(\)))?$~i', $default)) - || ($jush == "sqlite" && preg_match('~^CURRENT_(TIME|TIMESTAMP|DATE)$~i', $default)) - || ($field["type"] == "bit" && preg_match("~^([0-9]+|b'[0-1]+')\$~", $default)) - || ($jush == "pgsql" && preg_match("~^[a-z]+\\(('[^']*')+\\)\$~", $default)) - ? $default : q($default)) : ""), + (isset($default) ? " DEFAULT " . (preg_match('~char|binary|text|enum|set~', $field["type"]) && !preg_match('~^\\d*\\.?\\d+$~', $default) ? q($default) : $default) : ""), (preg_match('~timestamp|datetime~', $field["type"]) && $field["on_update"] ? " ON UPDATE $field[on_update]" : ""), (support("comment") && $field["comment"] != "" ? " COMMENT " . q($field["comment"]) : ""), ($field["auto_increment"] ? auto_increment() : null), diff --git a/changes.txt b/changes.txt index 2e1f7a64..e8bcf53e 100644 --- a/changes.txt +++ b/changes.txt @@ -1,6 +1,7 @@ Adminer 4.5.1-dev: Fix counting selected rows after going back to select page PHP <5.3 compatibility even with Elasticsearch enabled +Fully support functions in default values MariaDB: Support JSON since MariaDB 10.2 PostgreSQL: Support functions PostgreSQL: Allow editing views with uppercase letters (bug #467)