diff --git a/ChangeLog b/ChangeLog index a1ac94e14..a8e463e01 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,8 @@ $HeadURL$ 2006-10-17 Michal Čihař * Documentation.html: Fix HTML errors. + * libraries/sqlparser.data.php, libraries/sqlparser.lib.php: Add support + for ON DUPLICATE KEY (bug #1576226). 2006-10-16 Michal Čihař * left.php, navigation.php, scripts/setup.php, js/querywindow.js, diff --git a/libraries/sqlparser.data.php b/libraries/sqlparser.data.php index 8d5b02d3d..838490641 100644 --- a/libraries/sqlparser.data.php +++ b/libraries/sqlparser.data.php @@ -363,6 +363,7 @@ $PMA_SQPdata_reserved_word = array ( 'DO', 'DROP', 'DUMPFILE', + 'DUPLICATE', 'DYNAMIC', 'ELSE', 'ENCLOSED', @@ -578,7 +579,7 @@ $PMA_SQPdata_reserved_word = array ( 'YEAR_MONTH' ); //$PMA_SQPdata_reserved_word_cnt = count($PMA_SQPdata_reserved_word); -$PMA_SQPdata_reserved_word_cnt = 274; +$PMA_SQPdata_reserved_word_cnt = 275; // words forbidden to be used as column or table name, // as seen in http://dev.mysql.com/doc/mysql/en/reserved-words.html diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php index b6dd158bf..f392e1a04 100644 --- a/libraries/sqlparser.lib.php +++ b/libraries/sqlparser.lib.php @@ -1960,6 +1960,7 @@ if ( ! defined( 'PMA_MINIMUM_COMMON' ) ) { 'ASC', 'DESC', 'DISTINCT', + 'DUPLICATE', 'HOUR', 'INTERVAL', 'IS',