Fix NULL value in edit form with Postgres

diff --git a/adminer/drivers/pgsql.inc.php b/adminer/drivers/pgsql.inc.php
index 8d8e698734acaee2824dcdc3029603dfc1744460..aed3da5815056de21b3004a934edfc3ab01dc85a 100644 (file)
--- a/adminer/drivers/pgsql.inc.php
+++ b/adminer/drivers/pgsql.inc.php
@@ -304,7 +304,7 @@ ORDER BY a.attnum"
                        $row["auto_increment"] = preg_match('~^nextval\\(~i', $row["default"]);
                        $row["privileges"] = array("insert" => 1, "select" => 1, "update" => 1);
                        if (preg_match('~(.+)::[^)]+(.*)~', $row["default"], $match)) {
-                               $row["default"] = ($match[1][0] == "'" ? idf_unescape($match[1]) : $match[1]) . $match[2];
+                               $row["default"] = ($match[1] == "NULL" ? null : (($match[1][0] == "'" ? idf_unescape($match[1]) : $match[1]) . $match[2]));
                        }
                        $return[$row["field"]] = $row;
                }

diff --git a/changes.txt b/changes.txt
index 158bdf531be078158efd7bfcbbde88fe105cc176..e4765b26b5a7bf5cbfeec8c7dbeb8286cfe31b14 100644 (file)
--- a/changes.txt
+++ b/changes.txt
@@ -2,6 +2,7 @@ Adminer 4.4.1-dev:
 Adminer: Fix Search data in tables (regression from 4.4.0)
 CSP: Allow any images, media and fonts, disallow base-uri
 SQLite: Enable foreign key checks
+PostgreSQL: Respect NULL default value
 Elasticsearch: Insert, update, delete
 
 Adminer 4.4.0 (released 2018-01-17):