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

Added 'COLLATE' and 'RETURN'

Browse Source
This commit is contained in:
Alexander M. Turek
2003-12-29 17:20:12 +00:00
parent f10c27765e
commit 2f1812f256
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -12,6 +12,9 @@ $Source$
* tbl_properties_strcuture, tbl_properties_table_info.php: * tbl_properties_strcuture, tbl_properties_table_info.php:
- Changed "Charset" label to "Collation" because it fits better; - Changed "Charset" label to "Collation" because it fits better;
- The column collations weren't displayed with MySQL 5.0. - The column collations weren't displayed with MySQL 5.0.
* libraries/sqlparser.data.php: New reserved words:
- COLLATE (since MySQL 4.1.0);
- RETURN (since MySQL 5.0.0).
2003-12-28 Marc Delisle <lem9@users.sourceforge.net> 2003-12-28 Marc Delisle <lem9@users.sourceforge.net>
### 2.5.5 released ### 2.5.5 released

4
libraries/sqlparser.data.php
View File

@@ -220,6 +220,7 @@ $PMA_SQPdata_reserved_word = array (
'CHECK', 'CHECK',
'CHECKSUM', 'CHECKSUM',
'CLIENT', 'CLIENT',
'COLLATE',
'COLLATION', 'COLLATION',
'COLUMN', 'COLUMN',
'COLUMNS', 'COLUMNS',
@@ -381,6 +382,7 @@ $PMA_SQPdata_reserved_word = array (
'RESET', 'RESET',
'RESTORE', 'RESTORE',
'RESTRICT', 'RESTRICT',
'RETURN',
'RETURNS', 'RETURNS',
'REVOKE', 'REVOKE',
'RIGHT', 'RIGHT',
@@ -451,7 +453,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 = 256; $PMA_SQPdata_reserved_word_cnt = 258;
$PMA_SQPdata_column_type = array ( $PMA_SQPdata_column_type = array (
'BIGINT', 'BIGINT',