From: Jakub Vrana <jakub@vrana.cz>
Date: Tue, 30 Jan 2018 15:24:31 +0000 (+0100)
Subject: PostgreSQL: Allow now() as default value (bug #525)
X-Git-Tag: v4.6.0~51
X-Git-Url: https://git.joonet.de/?a=commitdiff_plain;h=4bb2f806b10666ddfe10c1f0631f38b50753fc0d;p=adminer.git

PostgreSQL: Allow now() as default value (bug #525)
---

diff --git a/adminer/include/editing.inc.php b/adminer/include/editing.inc.php
index 9c66ec55..d0bf401b 100644
--- a/adminer/include/editing.inc.php
+++ b/adminer/include/editing.inc.php
@@ -199,7 +199,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('~^(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))
diff --git a/changes.txt b/changes.txt
index e4aed502..2e1f7a64 100644
--- a/changes.txt
+++ b/changes.txt
@@ -4,6 +4,7 @@ PHP <5.3 compatibility even with Elasticsearch enabled
 MariaDB: Support JSON since MariaDB 10.2
 PostgreSQL: Support functions
 PostgreSQL: Allow editing views with uppercase letters (bug #467)
+PostgreSQL: Allow now() as default value (bug #525)
 SimpleDB: Document that allow_url_fopen is required
 Malay translation