Respect field function

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@851 7c3ca157-0c34-0410-bff1-cbf682f78f5c

diff --git a/adminer/edit.inc.php b/adminer/edit.inc.php
index bdb7d5e2eed41e2423420f48ff534b59f8ebb716..a81a60a351a1e4bd5ee2ef767526fc4c446fe893 100644 (file)
--- a/adminer/edit.inc.php
+++ b/adminer/edit.inc.php
@@ -78,7 +78,7 @@ if ($fields) {
                        ? (strlen($row[$name]) && ($field["type"] == "enum" || $field["type"] == "set") ? intval($row[$name]) : $row[$name])
                        : ($_POST["clone"] && $field["auto_increment"] ? "" : (isset($_GET["select"]) ? false : $field["default"]))
                );
-               $function = ($_POST["save"] ? (string) $_POST["function"][$name] : ($field[($where ? "on_update" : "default")] == "CURRENT_TIMESTAMP" ? "now" : ($value === false ? null : (isset($value) ? '' : 'NULL'))));
+               $function = ($_POST["save"] ? (string) $_POST["function"][$name] : ($where && $field["on_update"] == "CURRENT_TIMESTAMP" ? "now" : ($value === false ? null : (isset($value) ? '' : 'NULL'))));
                input($name, $field, $value, $function);
                if (isset($_GET["default"]) && $field["type"] == "timestamp") {
                        if (!isset($create) && !$_POST) {

diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php
index 9d909019ccd0298b3218830a550f0aa20876aa47..0d84836b2781073ad90cd7a3468d423b7e5ac3e8 100644 (file)
--- a/adminer/include/functions.inc.php
+++ b/adminer/include/functions.inc.php
@@ -348,8 +348,6 @@ function process_input($name, $field) {
                        return false; //! report errors
                }
                return "_binary" . $dbh->quote($file);
-       } elseif ($field["type"] == "timestamp" && $value == "CURRENT_TIMESTAMP") {
-               return $value;
        } elseif (ereg('^(now|uuid)$', $function)) {
                return "$function()";
        } elseif (ereg('^[+-]$', $function)) {
@@ -360,6 +358,8 @@ function process_input($name, $field) {
                return "$function(" . idf_escape($name) . ", " . $dbh->quote($value) . ")";
        } elseif (ereg('^(md5|sha1|password)$', $function)) {
                return "$function(" . $dbh->quote($value) . ")";
+       } elseif ($field["type"] == "timestamp" && $value == "CURRENT_TIMESTAMP") {
+               return $value;
        } else {
                return $dbh->quote($value);
        }

diff --git a/changes.txt b/changes.txt
index d1782af012dd54791fc0646adc1c6a1da6c6ac53..13420ba6f5af6cf549714c2935670a4f6af9ce3a 100644 (file)
--- a/changes.txt
+++ b/changes.txt
@@ -7,6 +7,7 @@ Create single column foreign key in table structure
 Separate types to groups in table creation
 Show type in field name title (thanks to Jakub Sochor)
 Preselect now() for timestamp columns (thanks to paranoiq)
+Clear history (thanks to paranoiq)
 Faster multiple update, clone and delete
 Use HTML Strict instead of XHTML
 Fix grant ALL PRIVILEGES with GRANT OPTION

diff --git a/todo.txt b/todo.txt
index a89e816cacfda17582bc64bc87f3b6542bf42711..5f8f4602f0c149c858c263fe54003e75f77a1822 100644 (file)
--- a/todo.txt
+++ b/todo.txt
@@ -13,6 +13,7 @@ Edit default values directly in table creation
 Offer enum and set items in search - whisperer
 Use event $intervals + microseconds in relative date functions
 Ability to select external style - list downloaded by JavaScript
+Table list cache - SHOW TABLE STATUS is slow with big InnoDB tables
 ? Column and table names auto-completition in SQL textarea
 ? Save token also to cookie - for session expiration and login in other window
 ? Save uploaded files after error to session variable instead of hidden field