VladPolskiy/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2025-08-16 14:51:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Better handle null timestamps https://github.com/webmin/webmin/issues/921#issuecomment-393014169

Browse Source
This commit is contained in:
Jamie Cameron
2018-05-29 21:21:37 -07:00
parent bedb20168b
commit 6bb264338d
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mysql/save_field.cgi
View File

@ -10,7 +10,13 @@ $access{'edonly'} && &error($text{'dbase_ecannot'});
# Build default clause
if ($in{'default_def'} == 0) {
$default = "default NULL";
if ($in{'type'} eq 'timestamp') {
# Default is already null
$default = "";
}
else {
$default = "default NULL";
}
}
elsif ($in{'default_def'} == 2) {
$default = "default CURRENT_TIMESTAMP";
@ -36,7 +42,7 @@ elsif ($in{'new'}) {
$in{'size'} = $size = &validate_size();
$sql = sprintf "alter table %s add %s %s%s %s %s %s",
&quotestr($in{'table'}), &quotestr($in{'field'}), $in{'type'},
$size, $in{'null'} ? '' : 'not null',
$size, $in{'null'} ? 'null' : 'not null',
$default,
$in{'ext'};
&execute_sql_logged($in{'db'}, $sql);