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

bug 1492772, SQL parsing EXTRACT YEAR_MONTH

Browse Source
This commit is contained in:
Marc Delisle
2006-08-12 19:14:48 +00:00
parent b0fba36259
commit 8e2f52ac8d
2 changed files with 38 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -5,6 +5,10 @@ phpMyAdmin - ChangeLog
$Id$ $Id$
$Source$ $Source$
2006-08-12 Marc Delisle <lem9@users.sourceforge.net>
* libraries/sqlparser.data.php: bug #1492772, parsing EXTRACT YEAR_MONTH
(there were sorting errors in the function names array)
2006-08-11 Marc Delisle <lem9@users.sourceforge.net> 2006-08-11 Marc Delisle <lem9@users.sourceforge.net>
* libraries/auth/config.auth.lib.php: bug #1536112, config not loaded * libraries/auth/config.auth.lib.php: bug #1536112, config not loaded
(MySQL error 2002 or 2003) (MySQL error 2002 or 2003)

55
libraries/sqlparser.data.php
View File

@@ -15,7 +15,11 @@
* *
* 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 easier to use only uppercase for proper sorting. In case of
* doubt, use the DEBUG code after this function's definition.
*/ */
$PMA_SQPdata_function_name = array ( $PMA_SQPdata_function_name = array (
@@ -25,7 +29,7 @@ $PMA_SQPdata_function_name = array (
'ADDTIME', 'ADDTIME',
'AES_DECRYPT', 'AES_DECRYPT',
'AES_ENCRYPT', 'AES_ENCRYPT',
'Area', // polygon-property-functions.html 'AREA', // polygon-property-functions.html
'ASCII', 'ASCII',
'ASIN', 'ASIN',
'ATAN', 'ATAN',
@@ -42,7 +46,7 @@ $PMA_SQPdata_function_name = array (
'CAST', 'CAST',
'CEIL', 'CEIL',
'CEILING', 'CEILING',
'Centroid', // multipolygon-property-functions.html '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
@@ -84,15 +88,15 @@ $PMA_SQPdata_function_name = array (
'DEGREES', 'DEGREES',
'DES_DECRYPT', 'DES_DECRYPT',
'DES_ENCRYPT', 'DES_ENCRYPT',
'Dimension', // general-geometry-property-functions.html 'DIMENSION', // general-geometry-property-functions.html
'ELT', 'ELT',
'ENCODE', 'ENCODE',
'ENCRYPT', 'ENCRYPT',
'EndPoint', // linestring-property-functions.html 'ENDPOINT', // linestring-property-functions.html
'Envelope', // general-geometry-property-functions.html 'ENVELOPE', // general-geometry-property-functions.html
'EXP', 'EXP',
'EXPORT_SET', 'EXPORT_SET',
'ExteriorRing', // polygon-property-functions.html 'EXTERIORRING', // polygon-property-functions.html
'EXTRACT', 'EXTRACT',
'FIELD', 'FIELD',
'FIND_IN_SET', 'FIND_IN_SET',
@@ -101,11 +105,11 @@ $PMA_SQPdata_function_name = array (
'FOUND_ROWS', 'FOUND_ROWS',
'FROM_DAYS', 'FROM_DAYS',
'FROM_UNIXTIME', 'FROM_UNIXTIME',
'GeometryN', // geometrycollection-property-functions.html 'GEOMETRYN', // geometrycollection-property-functions.html
'GeometryType', // general-geometry-property-functions.html 'GEOMETRYTYPE', // general-geometry-property-functions.html
'GET_FORMAT', 'GET_FORMAT',
'GET_LOCK', 'GET_LOCK',
'GLength', // linestring-property-functions.html 'GLENGTH', // linestring-property-functions.html
'GREATEST', 'GREATEST',
'GROUP_CONCAT', 'GROUP_CONCAT',
'GROUP_UNIQUE_USERS', 'GROUP_UNIQUE_USERS',
@@ -117,13 +121,13 @@ $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', // polygon-property-functions.html
'INTERVAL', 'INTERVAL',
'ISCLOSED', // multilinestring-property-functions.html
'ISEMPTY', // general-geometry-property-functions.html
'ISNULL', 'ISNULL',
'IsClosed', // multilinestring-property-functions.html 'ISRING', // linestring-property-functions.html
'IsEmpty', // general-geometry-property-functions.html 'ISSIMPLE', // general-geometry-property-functions.html
'IsRing', // linestring-property-functions.html
'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',
@@ -158,9 +162,9 @@ $PMA_SQPdata_function_name = array (
'MONTHNAME', 'MONTHNAME',
'NOW', 'NOW',
'NULLIF', 'NULLIF',
'NumGeometries', // geometrycollection-property-functions.html 'NUMGEOMETRIES', // geometrycollection-property-functions.html
'NumInteriorRings', // polygon-property-functions.html 'NUMINTERIORRINGS', // polygon-property-functions.html
'NumPoints', // linestring-property-functions.html 'NUMPOINTS', // linestring-property-functions.html
'OCT', 'OCT',
'OCTET_LENGTH', 'OCTET_LENGTH',
'OLD_PASSWORD', 'OLD_PASSWORD',
@@ -169,8 +173,8 @@ $PMA_SQPdata_function_name = array (
'PERIOD_ADD', 'PERIOD_ADD',
'PERIOD_DIFF', 'PERIOD_DIFF',
'PI', 'PI',
'PointN', // linestring-property-functions.html 'POINTN', // linestring-property-functions.html
'PointOnSurface', // multipolygon-property-functions.html 'POINTONSURFACE', // multipolygon-property-functions.html
'POSITION', 'POSITION',
'POW', 'POW',
'POWER', 'POWER',
@@ -200,7 +204,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', // linestring-property-functions.html
'STD', 'STD',
'STDDEV', 'STDDEV',
'STDDEV_POP', // group-by-functions.html 'STDDEV_POP', // group-by-functions.html
@@ -251,6 +255,15 @@ $PMA_SQPdata_function_name = array (
); );
//$PMA_SQPdata_function_name_cnt = count($PMA_SQPdata_function_name); //$PMA_SQPdata_function_name_cnt = count($PMA_SQPdata_function_name);
$PMA_SQPdata_function_name_cnt = 229; $PMA_SQPdata_function_name_cnt = 229;
// 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>';
//}
$PMA_SQPdata_column_attrib = array ( $PMA_SQPdata_column_attrib = array (
'ARCHIVE', // Engine 'ARCHIVE', // Engine