From 72aa3c5127d84b5c161e7528287b9e876c4bd54f Mon Sep 17 00:00:00 2001 From: Jakub Vrana Date: Tue, 23 Jan 2018 08:36:11 +0100 Subject: [PATCH] Support current_timestamp() as default of time fields (bug #572) --- adminer/include/editing.inc.php | 2 +- changes.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/adminer/include/editing.inc.php b/adminer/include/editing.inc.php index ec77389b..e525a540 100644 --- a/adminer/include/editing.inc.php +++ b/adminer/include/editing.inc.php @@ -198,7 +198,7 @@ function process_field($field, $type_field) { process_type($type_field), ($field["null"] ? " NULL" : " NOT NULL"), // NULL for timestamp (isset($default) ? " DEFAULT " . ( - (preg_match('~time~', $field["type"]) && preg_match('~^CURRENT_TIMESTAMP$~i', $default)) + (preg_match('~time~', $field["type"]) && preg_match('~^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)) diff --git a/changes.txt b/changes.txt index 05b65f1c..59b1319f 100644 --- a/changes.txt +++ b/changes.txt @@ -1,5 +1,6 @@ Adminer 4.4.1-dev: Display newlines in column comments (bug #573) +Support current_timestamp() as default of time fields (bug #572) Adminer: Fix Search data in tables (regression from 4.4.0) CSP: Allow any styles, images, media and fonts, disallow base-uri MySQL: Support geometry in MySQL 8 (bug #574)