beenull/adminerevo
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Preserve original timestamp value in multiple update (bug #3312614)

Browse source
This commit is contained in:
Jakub Vrana 2011-06-08 12:48:39 +02:00
parent 2140f09b68
commit c0c21d4d12
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
adminer/edit.inc.php
View file

@ -78,7 +78,7 @@ if ($fields) {
if (!$_POST["save"] && is_string($value)) { if (!$_POST["save"] && is_string($value)) {
$value = $adminer->editVal($value, $field); $value = $adminer->editVal($value, $field);
} }
$function = ($_POST["save"] ? (string) $_POST["function"][$name] : ($where && $field["on_update"] == "CURRENT_TIMESTAMP" ? "now" : ($value === false ? null : (isset($value) ? '' : 'NULL')))); $function = ($_POST["save"] ? (string) $_POST["function"][$name] : ($update && $field["on_update"] == "CURRENT_TIMESTAMP" ? "now" : ($value === false ? null : (isset($value) ? '' : 'NULL'))));
if ($field["type"] == "timestamp" && $value == "CURRENT_TIMESTAMP") { if ($field["type"] == "timestamp" && $value == "CURRENT_TIMESTAMP") {
$value = ""; $value = "";
$function = "now"; $function = "now";

2
adminer/include/functions.inc.php
View file

@ -722,7 +722,7 @@ function process_input($field) {
return null; return null;
} }
if ($function == "orig") { if ($function == "orig") {
return false; return ($field["on_update"] == "CURRENT_TIMESTAMP" ? idf_escape($field["field"]) : false);
} }
if ($function == "NULL") { if ($function == "NULL") {
return "NULL"; return "NULL";

1
changes.txt
View file

@ -2,6 +2,7 @@ Adminer 3.3.0-dev:
Use Esc to disable in-place edit Use Esc to disable in-place edit
Shortcut for database privileges Shortcut for database privileges
Append new index with auto index selection (bug #3282127) Append new index with auto index selection (bug #3282127)
Preserve original timestamp value in multiple update (bug #3312614)
Bit type default value Bit type default value
Display foreign key name in tooltip Display foreign key name in tooltip
Display default column value in table overview Display default column value in table overview