diff --git a/ChangeLog b/ChangeLog index 4f49b913b..fcf3e4d6a 100755 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,8 @@ $Source$ 2002-11-26 Marc Delisle * sql.php3: bug 644108: incorrect affected rows count + * libraries/sqlparser.data.php3: bug 643992, INTERVAL can be a + function but also a reserved word for date arithmetic functions 2002-11-25 Marc Delisle * tbl_properties_structure.php3: wrong back link in case of errors diff --git a/libraries/sqlparser.data.php3 b/libraries/sqlparser.data.php3 index 969a6829d..99382d1c8 100644 --- a/libraries/sqlparser.data.php3 +++ b/libraries/sqlparser.data.php3 @@ -274,6 +274,7 @@ if (!defined('PMA_SQP_DATA_INCLUDED')) { 'INSERT', 'INSERT_ID', 'INSERT_METHOD', + 'INTERVAL', 'INTO', 'IS', 'ISOLATION', @@ -420,7 +421,7 @@ if (!defined('PMA_SQP_DATA_INCLUDED')) { 'YEAR_MONTH' ); //$PMA_SQPdata_reserved_word_cnt = count($PMA_SQPdata_reserved_word); - $PMA_SQPdata_reserved_word_cnt = 240; + $PMA_SQPdata_reserved_word_cnt = 241; $PMA_SQPdata_column_type = array ( 'BIGINT', diff --git a/libraries/sqlparser.lib.php3 b/libraries/sqlparser.lib.php3 index 811720f0b..ee74fd27d 100644 --- a/libraries/sqlparser.lib.php3 +++ b/libraries/sqlparser.lib.php3 @@ -2,6 +2,7 @@ /* $Id$ */ // vim: expandtab sw=4 ts=4 sts=4: + /** SQL Parser Functions for phpMyAdmin * * Copyright 2002 Robin Johnson @@ -1076,6 +1077,7 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) { } for ($i = 0; $i < $arraysize; $i++) { + //echo "" . $arr[$i]['data'] . " " . $arr[$i]['type'] . "
"; $before = ''; $after = ''; $indent = 0;