From: Jáchym Toušek <enumag@gmail.com>
Date: Wed, 17 Jan 2018 08:50:45 +0000 (+0100)
Subject: Fix NULL value in edit form with Postgres
X-Git-Tag: v4.5.0~42
X-Git-Url: https://git.joonet.de/?a=commitdiff_plain;h=019ada8da5dbb49d3e8dbaa88fc3a7253dd74af1;p=adminer.git

Fix NULL value in edit form with Postgres
---

diff --git a/adminer/drivers/pgsql.inc.php b/adminer/drivers/pgsql.inc.php
index 8d8e6987..aed3da58 100644
--- 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 158bdf53..e4765b26 100644
--- 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):