From a227ec1c97a138bc7561d5dc865f3769ee6e8a8f Mon Sep 17 00:00:00 2001 From: Jakub Vrana Date: Sat, 21 Jul 2012 09:50:50 -0700 Subject: [PATCH] Don't treat enum in PostgreSQL as special (bug #3545899) --- adminer/edit.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/adminer/edit.inc.php b/adminer/edit.inc.php index e2bd7ae7..74ef66fb 100644 --- a/adminer/edit.inc.php +++ b/adminer/edit.inc.php @@ -53,7 +53,7 @@ if ($_POST["save"]) { $select = array(); foreach ($fields as $name => $field) { if (isset($field["privileges"]["select"])) { - $select[] = ($_POST["clone"] && $field["auto_increment"] ? "'' AS " : (ereg("enum|set", $field["type"]) ? "1*" . idf_escape($name) . " AS " : "")) . idf_escape($name); + $select[] = ($_POST["clone"] && $field["auto_increment"] ? "'' AS " : ($jush == "sql" && ereg("enum|set", $field["type"]) ? "1*" . idf_escape($name) . " AS " : "")) . idf_escape($name); } } $row = array(); @@ -76,7 +76,7 @@ if ($fields) { echo "" . $adminer->fieldName($field); $default = $_GET["set"][bracket_escape($name)]; $value = ($row !== null - ? ($row[$name] != "" && ereg("enum|set", $field["type"]) ? (is_array($row[$name]) ? array_sum($row[$name]) : +$row[$name]) : $row[$name]) + ? ($row[$name] != "" && $jush == "sql" && ereg("enum|set", $field["type"]) ? (is_array($row[$name]) ? array_sum($row[$name]) : +$row[$name]) : $row[$name]) : (!$update && $field["auto_increment"] ? "" : (isset($_GET["select"]) ? false : ($default !== null ? $default : $field["default"]))) ); if (!$_POST["save"] && is_string($value)) {