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

Use now function instead of CURRENT_TIMESTAMP

Browse source 
git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@996 7c3ca157-0c34-0410-bff1-cbf682f78f5c
This commit is contained in:
jakubvrana 2009-08-21 17:08:10 +00:00
parent a8bf261ab7
commit 2959a052c4
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
adminer/edit.inc.php
View file

@ -78,6 +78,10 @@ if ($fields) {
$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'))));
if ($field["type"] == "timestamp" && $value == "CURRENT_TIMESTAMP") {
$value = "";
$function = "now";
}
input($field, $value, $function);
echo "\n";
}

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

@ -400,8 +400,6 @@ class Adminer {
$return = "$function(" . idf_escape($name) . ", $return)";
} elseif (ereg('^(md5|sha1|password)$', $function)) {
$return = "$function($return)";
} elseif (ereg('date|time', $field["type"]) && $value == "CURRENT_TIMESTAMP") {
$return = $value;
}
return $return;
}

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

@ -331,8 +331,6 @@ ORDER BY ORDINAL_POSITION"); //! requires MySQL 5
);
if (!ereg('varchar|text', $field["type"]) && $field["full_type"] != "tinyint(1)" && !strlen($value)) {
$return = "NULL";
} elseif (ereg('date|time', $field["type"]) && $value == "CURRENT_TIMESTAMP") {
$return = $value;
}
return $return;
}