nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

default current_timestamp is only for TIMESTAMP

Browse Source
This commit is contained in:
Marc Delisle
2005-04-01 17:19:38 +00:00
parent 5dc8c5152c
commit 6289ccb49c
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -7,6 +7,8 @@ $Source$
2005-04-01 Marc Delisle <lem9@users.sourceforge.net> 2005-04-01 Marc Delisle <lem9@users.sourceforge.net>
* tbl_addfield.php: TIMESTAMP options support * tbl_addfield.php: TIMESTAMP options support
* libraries/common.lib.php: DEFAULT CURRENT_TIMESTAMP is only
for TIMESTAMP (bug when changing from a TIMESTAMP to a non-TIMESTAMP type)
2005-03-31 Alexander M. Turek <me@derrabus.de> 2005-03-31 Alexander M. Turek <me@derrabus.de>
* left.php: Undefined offset (Bug #1174045). * left.php: Undefined offset (Bug #1174045).

2
libraries/common.lib.php
View File

@@ -2533,7 +2533,7 @@ if (typeof(document.getElementById) != 'undefined'
$query .= PMA_generateCharsetQueryPart($collation); $query .= PMA_generateCharsetQueryPart($collation);
} }
if ($default_current_timestamp) { if ($default_current_timestamp && strtoupper($full_field_type) == 'TIMESTAMP') {
$query .= ' DEFAULT CURRENT_TIMESTAMP'; $query .= ' DEFAULT CURRENT_TIMESTAMP';
} elseif (!empty($default)) { } elseif (!empty($default)) {
if (strtoupper($default) == 'NULL') { if (strtoupper($default) == 'NULL') {