bug 643992

This commit is contained in:
Marc Delisle
2002-11-26 18:29:35 +00:00
parent b9bb61d45e
commit f463bdcf21
3 changed files with 6 additions and 1 deletions

View File

@@ -7,6 +7,8 @@ $Source$
2002-11-26 Marc Delisle <lem9@users.sourceforge.net> 2002-11-26 Marc Delisle <lem9@users.sourceforge.net>
* sql.php3: bug 644108: incorrect affected rows count * 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 <lem9@users.sourceforge.net> 2002-11-25 Marc Delisle <lem9@users.sourceforge.net>
* tbl_properties_structure.php3: wrong back link in case of errors * tbl_properties_structure.php3: wrong back link in case of errors

View File

@@ -274,6 +274,7 @@ if (!defined('PMA_SQP_DATA_INCLUDED')) {
'INSERT', 'INSERT',
'INSERT_ID', 'INSERT_ID',
'INSERT_METHOD', 'INSERT_METHOD',
'INTERVAL',
'INTO', 'INTO',
'IS', 'IS',
'ISOLATION', 'ISOLATION',
@@ -420,7 +421,7 @@ if (!defined('PMA_SQP_DATA_INCLUDED')) {
'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 = 240; $PMA_SQPdata_reserved_word_cnt = 241;
$PMA_SQPdata_column_type = array ( $PMA_SQPdata_column_type = array (
'BIGINT', 'BIGINT',

View File

@@ -2,6 +2,7 @@
/* $Id$ */ /* $Id$ */
// vim: expandtab sw=4 ts=4 sts=4: // vim: expandtab sw=4 ts=4 sts=4:
/** SQL Parser Functions for phpMyAdmin /** SQL Parser Functions for phpMyAdmin
* *
* Copyright 2002 Robin Johnson <robbat2@users.sourceforge.net> * Copyright 2002 Robin Johnson <robbat2@users.sourceforge.net>
@@ -1076,6 +1077,7 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) {
} }
for ($i = 0; $i < $arraysize; $i++) { for ($i = 0; $i < $arraysize; $i++) {
//echo "<b>" . $arr[$i]['data'] . "</b> " . $arr[$i]['type'] . "<br />";
$before = ''; $before = '';
$after = ''; $after = '';
$indent = 0; $indent = 0;