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

function names updated, bug #1657045 Spatial functions not supported

Browse Source
This commit is contained in:
Sebastian Mendel
2007-02-12 16:26:22 +00:00
parent 1955075af2
commit a8073cedfd
2 changed files with 156 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -8,6 +8,8 @@ $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,
bug #1657045 Spatial functions not supported
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

202
libraries/sqlparser.data.php
View File

@@ -1,9 +1,7 @@
<?php <?php
/* $Id$ */
// vim: expandtab sw=4 ts=4 sts=4: // vim: expandtab sw=4 ts=4 sts=4:
/**
* SQL Parser Matching Data
/** SQL Parser Matching Data
* *
* Copyright 2002 Robin Johnson <robbat2@users.sourceforge.net> * Copyright 2002 Robin Johnson <robbat2@users.sourceforge.net>
* http://www.orbis-terrarum.net/?l=people.robbat2 * http://www.orbis-terrarum.net/?l=people.robbat2
@@ -15,26 +13,37 @@
* *
* Note: before adding a value in the arrays, ensure that you respect * Note: before adding a value in the arrays, ensure that you respect
* proper sorting, especially with underscores. And don't forget to * proper sorting, especially with underscores. And don't forget to
* update the _cnt variable at the end of each array. * update the _cnt variable at the end of each array.
* (It's slower to have PHP do the count). * (It's slower to have PHP do the count).
* *
* It's easier to use only uppercase for proper sorting. In case of * It's easier to use only uppercase for proper sorting. In case of
* doubt, use the DEBUG code after this function's definition. * doubt, use the DEBUG code after this function's definition.
*
* @version$Id$
*/ */
/**
* @global array MySQL function names
*/
$PMA_SQPdata_function_name = array ( $PMA_SQPdata_function_name = array (
'ABS', 'ABSS',
'ACOS', 'ACOS',
'ADDDATE', 'ADDDATE',
'ADDTIME', 'ADDTIME',
'AES_DECRYPT', 'AES_DECRYPT',
'AES_ENCRYPT', 'AES_ENCRYPT',
'AREA', // polygon-property-functions.html 'AREA', // Area() polygon-property-functions.html
'ASBINARY', // AsBinary()
'ASCII', 'ASCII',
'ASIN', 'ASIN',
'ASTEXT', // AsText()
'ATAN', 'ATAN',
'ATAN2', 'ATAN2',
'AVG', 'AVG',
'BDMPOLYFROMTEXT', // BdMPolyFromText()
'BDMPOLYFROMWKB', // BdMPolyFromWKB()
'BDPOLYFROMTEXT', // BdPolyFromText()
'BDPOLYFROMWKB', // BdPolyFromWKB()
'BENCHMARK', 'BENCHMARK',
'BIN', 'BIN',
'BIT_AND', 'BIT_AND',
@@ -42,11 +51,12 @@ $PMA_SQPdata_function_name = array (
'BIT_LENGTH', 'BIT_LENGTH',
'BIT_OR', 'BIT_OR',
'BIT_XOR', // group-by-functions.html 'BIT_XOR', // group-by-functions.html
'Boundary', // general-geometry-property-functions.html 'BOUNDARY', // Boundary() general-geometry-property-functions.html
'BUFFER', // Buffer()
'CAST', 'CAST',
'CEIL', 'CEIL',
'CEILING', 'CEILING',
'CENTROID', // multipolygon-property-functions.html 'CENTROID', // Centroid() multipolygon-property-functions.html
'CHAR', // string-functions.html 'CHAR', // string-functions.html
'CHARACTER_LENGTH', 'CHARACTER_LENGTH',
'CHARSET', // information-functions.html 'CHARSET', // information-functions.html
@@ -58,13 +68,16 @@ $PMA_SQPdata_function_name = array (
'CONCAT', 'CONCAT',
'CONCAT_WS', 'CONCAT_WS',
'CONNECTION_ID', 'CONNECTION_ID',
'CONTAINS', // Contains()
'CONV', 'CONV',
'CONVERT', 'CONVERT',
'CONVERT_TZ', 'CONVERT_TZ',
'CONVEXHULL', // ConvexHull()
'COS', 'COS',
'COT', 'COT',
'COUNT', 'COUNT',
'CRC32', // mathematical-functions.html 'CRC32', // mathematical-functions.html
'CROSSES', // Crosses()
'CURDATE', 'CURDATE',
'CURRENT_DATE', 'CURRENT_DATE',
'CURRENT_TIME', 'CURRENT_TIME',
@@ -88,17 +101,21 @@ $PMA_SQPdata_function_name = array (
'DEGREES', 'DEGREES',
'DES_DECRYPT', 'DES_DECRYPT',
'DES_ENCRYPT', 'DES_ENCRYPT',
'DIMENSION', // general-geometry-property-functions.html 'DIFFERENCE', // Difference()
'DIMENSION', // Dimension() general-geometry-property-functions.html
'DISJOINT', // Disjoint()
'DISTANCE', // Distance()
'ELT', 'ELT',
'ENCODE', 'ENCODE',
'ENCRYPT', 'ENCRYPT',
'ENDPOINT', // linestring-property-functions.html 'ENDPOINT', // EndPoint() linestring-property-functions.html
'ENVELOPE', // general-geometry-property-functions.html 'ENVELOPE', // Envelope() general-geometry-property-functions.html
'EQUALS', // Equals()
'EXP', 'EXP',
'EXPORT_SET', 'EXPORT_SET',
'EXTERIORRING', // polygon-property-functions.html 'EXTERIORRING', // ExteriorRing() polygon-property-functions.html
'EXTRACT', 'EXTRACT',
'EXTRACTVALUE', // xml-functions.html 'EXTRACTVALUE', // ExtractValue() xml-functions.html
'FIELD', 'FIELD',
'FIND_IN_SET', 'FIND_IN_SET',
'FLOOR', 'FLOOR',
@@ -106,11 +123,20 @@ $PMA_SQPdata_function_name = array (
'FOUND_ROWS', 'FOUND_ROWS',
'FROM_DAYS', 'FROM_DAYS',
'FROM_UNIXTIME', 'FROM_UNIXTIME',
'GEOMETRYN', // geometrycollection-property-functions.html 'GEOMCOLLFROMTEXT', // GeomCollFromText()
'GEOMETRYTYPE', // general-geometry-property-functions.html 'GEOMCOLLFROMWKB', // GeomCollFromWKB()
'GEOMETRYCOLLECTION', // GeometryCollection()
'GEOMETRYCOLLECTIONFROMTEXT', // GeometryCollectionFromText()
'GEOMETRYCOLLECTIONFROMWKB', // GeometryCollectionFromWKB()
'GEOMETRYFROMTEXT', // GeometryFromText()
'GEOMETRYFROMWKB', // GeometryFromWKB()
'GEOMETRYN', // GeometryN() geometrycollection-property-functions.html
'GEOMETRYTYPE', // GeometryType() general-geometry-property-functions.html
'GEOMFROMTEXT', // GeomFromText()
'GEOMFROMWKB', // GeomFromWKB()
'GET_FORMAT', 'GET_FORMAT',
'GET_LOCK', 'GET_LOCK',
'GLENGTH', // linestring-property-functions.html 'GLENGTH', // GLength() linestring-property-functions.html
'GREATEST', 'GREATEST',
'GROUP_CONCAT', 'GROUP_CONCAT',
'GROUP_UNIQUE_USERS', 'GROUP_UNIQUE_USERS',
@@ -122,13 +148,15 @@ $PMA_SQPdata_function_name = array (
'INET_NTOA', 'INET_NTOA',
'INSERT', // string-functions.html 'INSERT', // string-functions.html
'INSTR', 'INSTR',
'INTERIORRINGN', // polygon-property-functions.html 'INTERIORRINGN', // InteriorRingN() polygon-property-functions.html
'INTERSECTION', // Intersection()
'INTERSECTS', // Intersects()
'INTERVAL', 'INTERVAL',
'ISCLOSED', // multilinestring-property-functions.html 'ISCLOSED', // IsClosed() multilinestring-property-functions.html
'ISEMPTY', // general-geometry-property-functions.html 'ISEMPTY', // IsEmpty() general-geometry-property-functions.html
'ISNULL', 'ISNULL',
'ISRING', // linestring-property-functions.html 'ISRING', // IsRing() linestring-property-functions.html
'ISSIMPLE', // general-geometry-property-functions.html 'ISSIMPLE', // IsSimple() general-geometry-property-functions.html
'IS_FREE_LOCK', 'IS_FREE_LOCK',
'IS_USED_LOCK', // miscellaneous-functions.html 'IS_USED_LOCK', // miscellaneous-functions.html
'LAST_DAY', 'LAST_DAY',
@@ -137,6 +165,11 @@ $PMA_SQPdata_function_name = array (
'LEAST', 'LEAST',
'LEFT', 'LEFT',
'LENGTH', 'LENGTH',
'LINEFROMTEXT', // LineFromText()
'LINEFROMWKB', // LineFromWKB()
'LINESTRING', // LineString()
'LINESTRINGFROMTEXT', // LineStringFromText()
'LINESTRINGFROMWKB', // LineStringFromWKB()
'LN', 'LN',
'LOAD_FILE', 'LOAD_FILE',
'LOCALTIME', 'LOCALTIME',
@@ -153,29 +186,62 @@ $PMA_SQPdata_function_name = array (
'MAKE_SET', 'MAKE_SET',
'MASTER_POS_WAIT', 'MASTER_POS_WAIT',
'MAX', 'MAX',
'MBRCONTAINS', // MBRContains()
'MBRDISJOINT', // MBRDisjoint()
'MBREQUAL', // MBREqual()
'MBRINTERSECTS', // MBRIntersects()
'MBROVERLAPS', // MBROverlaps()
'MBRTOUCHES', // MBRTouches()
'MBRWITHIN', // MBRWithin()
'MD5', 'MD5',
'MICROSECOND', 'MICROSECOND',
'MID', 'MID',
'MIN', 'MIN',
'MINUTE', 'MINUTE',
'MLINEFROMTEXT', // MLineFromText()
'MLINEFROMWKB', // MLineFromWKB()
'MOD', 'MOD',
'MONTH', 'MONTH',
'MONTHNAME', 'MONTHNAME',
'NOW', 'NOW',
'MPOINTFROMTEXT', // MPointFromText()
'MPOINTFROMWKB', // MPointFromWKB()
'MPOLYFROMTEXT', // MPolyFromText()
'MPOLYFROMWKB', // MPolyFromWKB()
'MULTILINESTRING', // MultiLineString()
'MULTILINESTRINGFROMTEXT', // MultiLineStringFromText()
'MULTILINESTRINGFROMWKB', // MultiLineStringFromWKB()
'MULTIPOINT', // MultiPoint()
'MULTIPOINTFROMTEXT', // MultiPointFromText()
'MULTIPOINTFROMWKB', // MultiPointFromWKB()
'MULTIPOLYGON', // MultiPolygon()
'MULTIPOLYGONFROMTEXT', // MultiPolygonFromText()
'MULTIPOLYGONFROMWKB', // MultiPolygonFromWKB()
'NAME_CONST', // NAME_CONST()
'NOW', // NOW()
'NULLIF', 'NULLIF',
'NUMGEOMETRIES', // geometrycollection-property-functions.html 'NUMGEOMETRIES', // NumGeometries() geometrycollection-property-functions.html
'NUMINTERIORRINGS', // polygon-property-functions.html 'NUMINTERIORRINGS', // NumInteriorRings() polygon-property-functions.html
'NUMPOINTS', // linestring-property-functions.html 'NUMPOINTS', // NumPoints() linestring-property-functions.html
'OCT', 'OCT',
'OCTET_LENGTH', 'OCTET_LENGTH',
'OLD_PASSWORD', 'OLD_PASSWORD',
'ORD', 'ORD',
'OVERLAPS', // Overlaps()
'PASSWORD', 'PASSWORD',
'PERIOD_ADD', 'PERIOD_ADD',
'PERIOD_DIFF', 'PERIOD_DIFF',
'PI', 'PI',
'POINTN', // linestring-property-functions.html 'POINT', // Point()
'POINTONSURFACE', // multipolygon-property-functions.html 'POINTFROMTEXT', // PointFromText()
'POINTFROMWKB', // PointFromWKB()
'POINTN', // PointN() inestring-property-functions.html
'POINTONSURFACE', // PointOnSurface() multipolygon-property-functions.html
'POLYFROMTEXT', // PolyFromText()
'POLYFROMWKB', // PolyFromWKB()
'POLYGON', // Polygon()
'POLYGONFROMTEXT', // PolygonFromText()
'POLYGONFROMWKB', // PolygonFromWKB()
'POSITION', 'POSITION',
'POW', 'POW',
'POWER', 'POWER',
@@ -183,6 +249,7 @@ $PMA_SQPdata_function_name = array (
'QUOTE', 'QUOTE',
'RADIANS', 'RADIANS',
'RAND', 'RAND',
'RELATED', // Related()
'RELEASE_LOCK', 'RELEASE_LOCK',
'REPEAT', 'REPEAT',
'REPLACE', // string-functions.html 'REPLACE', // string-functions.html
@@ -205,7 +272,7 @@ $PMA_SQPdata_function_name = array (
'SPACE', 'SPACE',
'SQRT', 'SQRT',
'SRID', // general-geometry-property-functions.html 'SRID', // general-geometry-property-functions.html
'STARTPOINT', // linestring-property-functions.html 'STARTPOINT', // StartPoint() linestring-property-functions.html
'STD', 'STD',
'STDDEV', 'STDDEV',
'STDDEV_POP', // group-by-functions.html 'STDDEV_POP', // group-by-functions.html
@@ -213,10 +280,12 @@ $PMA_SQPdata_function_name = array (
'STRCMP', 'STRCMP',
'STR_TO_DATE', 'STR_TO_DATE',
'SUBDATE', 'SUBDATE',
'SUBSTR',
'SUBSTRING', 'SUBSTRING',
'SUBSTRING_INDEX', 'SUBSTRING_INDEX',
'SUBTIME', 'SUBTIME',
'SUM', 'SUM',
'SYMDIFFERENCE', // SymDifference()
'SYSDATE', 'SYSDATE',
'SYSTEM_USER', 'SYSTEM_USER',
'TAN', 'TAN',
@@ -227,6 +296,7 @@ $PMA_SQPdata_function_name = array (
'TIMESTAMPDIFF', 'TIMESTAMPDIFF',
'TIME_FORMAT', 'TIME_FORMAT',
'TIME_TO_SEC', 'TIME_TO_SEC',
'TOUCHES', // Touches()
'TO_DAYS', 'TO_DAYS',
'TRIM', 'TRIM',
'TRUNCATE', // mathematical-functions.html 'TRUNCATE', // mathematical-functions.html
@@ -236,7 +306,7 @@ $PMA_SQPdata_function_name = array (
'UNHEX', // string-functions.html 'UNHEX', // string-functions.html
'UNIQUE_USERS', 'UNIQUE_USERS',
'UNIX_TIMESTAMP', 'UNIX_TIMESTAMP',
'UPDATEXML', // xml-functions.html 'UPDATEXML', // UpdateXML() xml-functions.html
'UPPER', 'UPPER',
'USER', 'USER',
'UTC_DATE', 'UTC_DATE',
@@ -250,23 +320,33 @@ $PMA_SQPdata_function_name = array (
'WEEK', 'WEEK',
'WEEKDAY', 'WEEKDAY',
'WEEKOFYEAR', 'WEEKOFYEAR',
'WITHIN', // Within()
'X', // point-property-functions.html 'X', // point-property-functions.html
'Y', // point-property-functions.html 'Y', // point-property-functions.html
'YEAR', 'YEAR',
'YEARWEEK' 'YEARWEEK'
); );
//$PMA_SQPdata_function_name_cnt = count($PMA_SQPdata_function_name); /**
$PMA_SQPdata_function_name_cnt = 231; * $PMA_SQPdata_function_name_cnt = count($PMA_SQPdata_function_name);
// DEBUG *
//$test_PMA_SQPdata_function_name = $PMA_SQPdata_function_name; * @global integer MySQL attributes count
//sort($PMA_SQPdata_function_name); */
//if ($PMA_SQPdata_function_name != $test_PMA_SQPdata_function_name) { $PMA_SQPdata_function_name_cnt = 299;
// echo 'sort properly like this<pre>';
// print_r($PMA_SQPdata_function_name);
// echo '</pre>';
//}
/*
* DEBUG
$test_PMA_SQPdata_function_name = $PMA_SQPdata_function_name;
sort($PMA_SQPdata_function_name);
if ($PMA_SQPdata_function_name != $test_PMA_SQPdata_function_name) {
echo 'sort properly like this<pre>';
print_r($PMA_SQPdata_function_name);
echo '</pre>';
}
*/
/**
* @global array MySQL attributes
*/
$PMA_SQPdata_column_attrib = array ( $PMA_SQPdata_column_attrib = array (
'ARCHIVE', // Engine 'ARCHIVE', // Engine
'ASCII', 'ASCII',
@@ -298,9 +378,16 @@ $PMA_SQPdata_column_attrib = array (
'VARYING', 'VARYING',
'ZEROFILL' 'ZEROFILL'
); );
//$PMA_SQPdata_column_attrib_cnt = count($PMA_SQPdata_column_attrib); /**
* $PMA_SQPdata_column_attrib_cnt = count($PMA_SQPdata_column_attrib);
*
* @global integer MySQL attributes count
*/
$PMA_SQPdata_column_attrib_cnt = 29; $PMA_SQPdata_column_attrib_cnt = 29;
/**
* @global array MySQL reserved words
*/
$PMA_SQPdata_reserved_word = array ( $PMA_SQPdata_reserved_word = array (
'ACTION', 'ACTION',
'ADD', 'ADD',
@@ -580,11 +667,19 @@ $PMA_SQPdata_reserved_word = array (
'XOR', 'XOR',
'YEAR_MONTH' 'YEAR_MONTH'
); );
//$PMA_SQPdata_reserved_word_cnt = count($PMA_SQPdata_reserved_word); /**
* $PMA_SQPdata_reserved_word_cnt = count($PMA_SQPdata_reserved_word);
*
* @global integer MySQL reserved words count
*/
$PMA_SQPdata_reserved_word_cnt = 275; $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 * words forbidden to be used as column or table name,
* as seen in http://dev.mysql.com/doc/mysql/en/reserved-words.html
*
* @global array MySQL forbidden words
*/
$PMA_SQPdata_forbidden_word = array ( $PMA_SQPdata_forbidden_word = array (
'ACTION', 'ACTION',
'ADD', 'ADD',
@@ -1066,9 +1161,16 @@ $PMA_SQPdata_forbidden_word = array (
'YEAR_MONTH', 'YEAR_MONTH',
'ZEROFILL' 'ZEROFILL'
); );
// echo count($PMA_SQPdata_forbidden_word); /**
* count($PMA_SQPdata_forbidden_word);
*
* @global integer MySQL forbidden words count
*/
$PMA_SQPdata_forbidden_word_cnt = 479; $PMA_SQPdata_forbidden_word_cnt = 479;
/**
* @global array MySQL column types
*/
$PMA_SQPdata_column_type = array ( $PMA_SQPdata_column_type = array (
'BIGINT', 'BIGINT',
'BINARY', 'BINARY',
@@ -1117,13 +1219,17 @@ $PMA_SQPdata_column_type = array (
'VARCHAR', 'VARCHAR',
'YEAR' 'YEAR'
); );
//$PMA_SQPdata_column_type_cnt = count($PMA_SQPdata_column_type); /**
* $PMA_SQPdata_column_type_cnt = count($PMA_SQPdata_column_type);
*
* @global integer MySQL column types count
*/
$PMA_SQPdata_column_type_cnt = 46; $PMA_SQPdata_column_type_cnt = 46;
// check counts
/* /*
* check counts
foreach ( $GLOBALS as $n => $a ) { foreach ( $GLOBALS as $n => $a ) {
echo is_array( $a ) ? $n . ': ' . count( $a ) . '<br />' : ''; echo is_array( $a ) ? $n . ': ' . count( $a ) . '<br />' : '';
} }
*/ */
?> ?>