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

bug 981343 CURRENT_TIMESTAMP

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $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> 2004-07-25 Marc Delisle <lem9@users.sourceforge.net>
* main.php, libraries/common.lib.php: bug 997682: * main.php, libraries/common.lib.php: bug 997682:
illegal mix of collations illegal mix of collations

3
libraries/sqlparser.data.php
View File

@@ -232,6 +232,7 @@ $PMA_SQPdata_reserved_word = array (
'CONSTRAINT', 'CONSTRAINT',
'CREATE', 'CREATE',
'CROSS', 'CROSS',
'CURRENT_TIMESTAMP',
'DATA', 'DATA',
'DATABASE', 'DATABASE',
'DATABASES', 'DATABASES',
@@ -455,7 +456,7 @@ $PMA_SQPdata_reserved_word = array (
'YEAR_MONTH' 'YEAR_MONTH'
); );
//$PMA_SQPdata_reserved_word_cnt = count($PMA_SQPdata_reserved_word); //$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 ( $PMA_SQPdata_column_type = array (
'BIGINT', 'BIGINT',

8
libraries/sqlparser.lib.php
View File

@@ -1461,8 +1461,14 @@ if ($is_minimum_common == FALSE) {
if ($arr[$i+3]['type'] == 'alpha_reservedWord') { if ($arr[$i+3]['type'] == 'alpha_reservedWord') {
$value = $third_upper_data . '_' . strtoupper($arr[$i+3]['data']); $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;
} }
$foreign[$foreign_key_number][$clause] = $value;
} }
} }
} }