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

bug #1163595, problem 4

Browse Source
This commit is contained in:
Marc Delisle
2005-04-01 20:50:59 +00:00
parent 6289ccb49c
commit effac6b69f
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -8,7 +8,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 * libraries/common.lib.php: DEFAULT CURRENT_TIMESTAMP is only
for TIMESTAMP (bug when changing from a TIMESTAMP to a non-TIMESTAMP type) for TIMESTAMP (bug when changing from a TIMESTAMP to a non-TIMESTAMP type) * (same): bug #1163595, problem 4: a TIMESTAMP must be explicitely
set to NULL to have the NULL attribute
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).

9
libraries/common.lib.php
View File

@@ -2533,6 +2533,12 @@ if (typeof(document.getElementById) != 'undefined'
$query .= PMA_generateCharsetQueryPart($collation); $query .= PMA_generateCharsetQueryPart($collation);
} }
if (!empty($null)) {
$query .= ' NOT NULL';
} else {
$query .= ' NULL';
}
if ($default_current_timestamp && strtoupper($full_field_type) == 'TIMESTAMP') { if ($default_current_timestamp && strtoupper($full_field_type) == 'TIMESTAMP') {
$query .= ' DEFAULT CURRENT_TIMESTAMP'; $query .= ' DEFAULT CURRENT_TIMESTAMP';
} elseif (!empty($default)) { } elseif (!empty($default)) {
@@ -2543,9 +2549,6 @@ if (typeof(document.getElementById) != 'undefined'
} }
} }
if (!empty($null)) {
$query .= ' NOT NULL';
}
if (!empty($extra)) { if (!empty($extra)) {
$query .= ' ' . $extra; $query .= ' ' . $extra;
} }