bug 981343 CURRENT_TIMESTAMP

This commit is contained in:
Marc Delisle
2004-07-27 11:39:40 +00:00
parent 781aada903
commit 6f2bd8c543
3 changed files with 13 additions and 2 deletions

View File

@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
$Id$
$Source$
2004-07-27 Marc Delisle <lem9@users.sourceforge.net>
* libraries/sqlparser.lib.php /sqlparser.data.php: bug 981343,
cannot copy a table with a timestamp (MySQL 4.1.2)
2004-07-25 Marc Delisle <lem9@users.sourceforge.net>
* main.php, libraries/common.lib.php: bug 997682:
illegal mix of collations

View File

@@ -232,6 +232,7 @@ $PMA_SQPdata_reserved_word = array (
'CONSTRAINT',
'CREATE',
'CROSS',
'CURRENT_TIMESTAMP',
'DATA',
'DATABASE',
'DATABASES',
@@ -455,7 +456,7 @@ $PMA_SQPdata_reserved_word = array (
'YEAR_MONTH'
);
//$PMA_SQPdata_reserved_word_cnt = count($PMA_SQPdata_reserved_word);
$PMA_SQPdata_reserved_word_cnt = 260;
$PMA_SQPdata_reserved_word_cnt = 261;
$PMA_SQPdata_column_type = array (
'BIGINT',

View File

@@ -1461,11 +1461,17 @@ if ($is_minimum_common == FALSE) {
if ($arr[$i+3]['type'] == 'alpha_reservedWord') {
$value = $third_upper_data . '_' . strtoupper($arr[$i+3]['data']);
}
} else {
// for example: ON UPDATE CURRENT_TIMESTAMP
// which is not for a foreign key
$value = '';
}
if (!empty($value)) {
$foreign[$foreign_key_number][$clause] = $value;
}
}
}
}
}