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

MySQL column names, reserved and forbidden words updated, bug #1657037 Missing column type "geometry"

Browse Source
This commit is contained in:
Sebastian Mendel
2007-02-13 08:18:13 +00:00
parent 8d11216638
commit b201038ac6
2 changed files with 36 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -8,8 +8,10 @@ $HeadURL$
2007-02-12 Sebastian Mendel <cybot_tm@users.sourceforge.net> 2007-02-12 Sebastian Mendel <cybot_tm@users.sourceforge.net>
* libraries/database_interface.lib.php: bug #1616486 server_databases does * libraries/database_interface.lib.php: bug #1616486 server_databases does
not show all databases not show all databases
* libraries/sqlparser.data.php: function names updated, * libraries/sqlparser.data.php: MySQL function and column names, reserved
and forbidden words updated,
bug #1657045 Spatial functions not supported bug #1657045 Spatial functions not supported
bug #1657037 Missing column type "geometry"
2007-02-10 Marc Delisle <lem9@users.sourceforge.net> 2007-02-10 Marc Delisle <lem9@users.sourceforge.net>
* lang/spanish update, thanks to Daniel Hinostroza * lang/spanish update, thanks to Daniel Hinostroza

39
libraries/sqlparser.data.php
View File

@@ -386,9 +386,14 @@ $PMA_SQPdata_column_attrib = array (
$PMA_SQPdata_column_attrib_cnt = 29; $PMA_SQPdata_column_attrib_cnt = 29;
/** /**
* words that are reserved by MySQL and may not be used as identifiers without quotes
*
* @see http://dev.mysql.com/doc/refman/5.1/en/reserved-words.html
*
* @global array MySQL reserved words * @global array MySQL reserved words
*/ */
$PMA_SQPdata_reserved_word = array ( $PMA_SQPdata_reserved_word = array (
'ACCESSIBLE', // 5.1
'ACTION', 'ACTION',
'ADD', 'ADD',
'AFTER', 'AFTER',
@@ -517,6 +522,7 @@ $PMA_SQPdata_reserved_word = array (
'LEVEL', 'LEVEL',
'LIKE', 'LIKE',
'LIMIT', 'LIMIT',
'LINEAR', // 5.1
'LINES', 'LINES',
'LOAD', 'LOAD',
'LOCAL', 'LOCAL',
@@ -578,7 +584,10 @@ $PMA_SQPdata_reserved_word = array (
'RAID_CHUNKS', 'RAID_CHUNKS',
'RAID_CHUNKSIZE', 'RAID_CHUNKSIZE',
'RAID_TYPE', 'RAID_TYPE',
'RANGE', // 5.1
'READ', 'READ',
'READ_ONLY', // 5.1
'READ_WRITE', // 5.1
'REFERENCES', 'REFERENCES',
'REGEXP', 'REGEXP',
'RELOAD', 'RELOAD',
@@ -672,15 +681,16 @@ $PMA_SQPdata_reserved_word = array (
* *
* @global integer MySQL reserved words count * @global integer MySQL reserved words count
*/ */
$PMA_SQPdata_reserved_word_cnt = 275; $PMA_SQPdata_reserved_word_cnt = 280;
/** /**
* words forbidden to be used as column or table name, * words forbidden to be used as column or table name wihtout quotes
* 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
* *
* @global array MySQL forbidden words * @global array MySQL forbidden words
*/ */
$PMA_SQPdata_forbidden_word = array ( $PMA_SQPdata_forbidden_word = array (
'ACCESSIBLE', // 5.1
'ACTION', 'ACTION',
'ADD', 'ADD',
'AFTER', 'AFTER',
@@ -894,6 +904,7 @@ $PMA_SQPdata_forbidden_word = array (
'LEVEL', 'LEVEL',
'LIKE', 'LIKE',
'LIMIT', 'LIMIT',
'LINEAR', // 5.1
'LINES', 'LINES',
'LINESTRING', 'LINESTRING',
'LOAD', 'LOAD',
@@ -1001,7 +1012,10 @@ $PMA_SQPdata_forbidden_word = array (
'RAID_CHUNKS', 'RAID_CHUNKS',
'RAID_CHUNKSIZE', 'RAID_CHUNKSIZE',
'RAID_TYPE', 'RAID_TYPE',
'RANGE', // 5.1
'READ', 'READ',
'READ_ONLY', // 5.1
'READ_WRITE', // 5.1
'READS', 'READS',
'REAL', 'REAL',
'RECOVER', 'RECOVER',
@@ -1166,9 +1180,14 @@ $PMA_SQPdata_forbidden_word = array (
* *
* @global integer MySQL forbidden words count * @global integer MySQL forbidden words count
*/ */
$PMA_SQPdata_forbidden_word_cnt = 479; $PMA_SQPdata_forbidden_word_cnt = 484;
/** /**
* the MySQL column/data types
*
* @see http://dev.mysql.com/doc/refman/5.1/en/data-types.html
* @see http://dev.mysql.com/doc/refman/5.1/en/mysql-spatial-datatypes.html
*
* @global array MySQL column types * @global array MySQL column types
*/ */
$PMA_SQPdata_column_type = array ( $PMA_SQPdata_column_type = array (
@@ -1177,7 +1196,7 @@ $PMA_SQPdata_column_type = array (
'BIT', 'BIT',
'BLOB', 'BLOB',
'BOOL', 'BOOL',
'BOOLEAN', // numeric-type-overview.html 'BOOLEAN', // numeric-type-overview.html
'CHAR', 'CHAR',
'CHARACTER', 'CHARACTER',
'DATE', 'DATE',
@@ -1189,6 +1208,8 @@ $PMA_SQPdata_column_type = array (
'FLOAT', 'FLOAT',
'FLOAT4', 'FLOAT4',
'FLOAT8', 'FLOAT8',
'GEOMETRY', // spatial
'GEOMETRYCOLLECTION', // spatial
'INT', 'INT',
'INT1', 'INT1',
'INT2', 'INT2',
@@ -1196,6 +1217,7 @@ $PMA_SQPdata_column_type = array (
'INT4', 'INT4',
'INT8', 'INT8',
'INTEGER', 'INTEGER',
'LINESTRING', // spatial
'LONG', 'LONG',
'LONGBLOB', 'LONGBLOB',
'LONGTEXT', 'LONGTEXT',
@@ -1203,10 +1225,15 @@ $PMA_SQPdata_column_type = array (
'MEDIUMINT', 'MEDIUMINT',
'MEDIUMTEXT', 'MEDIUMTEXT',
'MIDDLEINT', 'MIDDLEINT',
'MULTILINESTRING', // spatial
'MULTIPOINT', // spatial
'MULTIPOLYGON', // spatial
'NCHAR', 'NCHAR',
'NUMERIC', 'NUMERIC',
'POINT', // spatial
'POLYGON', // spatial
'REAL', 'REAL',
'SERIAL', //BIGINT UNSIGNED NOT NULL AUTO_INCREMENT UNIQUE 'SERIAL', // alsias for BIGINT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY
'SET', 'SET',
'SMALLINT', 'SMALLINT',
'TEXT', 'TEXT',
@@ -1224,7 +1251,7 @@ $PMA_SQPdata_column_type = array (
* *
* @global integer MySQL column types count * @global integer MySQL column types count
*/ */
$PMA_SQPdata_column_type_cnt = 46; $PMA_SQPdata_column_type_cnt = 54;
/* /*
* check counts * check counts