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

Add support for ON DUPLICATE KEY (bug #1576226).

Browse Source
This commit is contained in:
Michal Čihař
2006-10-17 09:46:07 +00:00
parent 8284c78877
commit 27696bd1e0
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -7,6 +7,8 @@ $HeadURL$
2006-10-17 Michal Čihař <michal@cihar.com> 2006-10-17 Michal Čihař <michal@cihar.com>
* Documentation.html: Fix HTML errors. * 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ř <michal@cihar.com> 2006-10-16 Michal Čihař <michal@cihar.com>
* left.php, navigation.php, scripts/setup.php, js/querywindow.js, * left.php, navigation.php, scripts/setup.php, js/querywindow.js,

3
libraries/sqlparser.data.php
View File

@@ -363,6 +363,7 @@ $PMA_SQPdata_reserved_word = array (
'DO', 'DO',
'DROP', 'DROP',
'DUMPFILE', 'DUMPFILE',
'DUPLICATE',
'DYNAMIC', 'DYNAMIC',
'ELSE', 'ELSE',
'ENCLOSED', 'ENCLOSED',
@@ -578,7 +579,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 = 274; $PMA_SQPdata_reserved_word_cnt = 275;
// words forbidden to be used as column or table name, // words forbidden to be used as column or table name,
// as seen in http://dev.mysql.com/doc/mysql/en/reserved-words.html // as seen in http://dev.mysql.com/doc/mysql/en/reserved-words.html

1
libraries/sqlparser.lib.php
View File

@@ -1960,6 +1960,7 @@ if ( ! defined( 'PMA_MINIMUM_COMMON' ) ) {
'ASC', 'ASC',
'DESC', 'DESC',
'DISTINCT', 'DISTINCT',
'DUPLICATE',
'HOUR', 'HOUR',
'INTERVAL', 'INTERVAL',
'IS', 'IS',