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

Fix for bug #621357

Browse Source
This commit is contained in:
Robin Johnson
2002-10-13 09:55:26 +00:00
parent 519092b263
commit 7da05ddf04
2 changed files with 67 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2002-10-13 Robin Johnson <robbat2@users.sourceforge.net>
* libraries/sqlparser.lib.php3: bug #621357
2002-10-11 Marc Delisle <lem9@users.sourceforge.net> 2002-10-11 Marc Delisle <lem9@users.sourceforge.net>
* libraries/common.lib.php3: bug 620624 * libraries/common.lib.php3: bug 620624

105
libraries/sqlparser.lib.php3
View File

@@ -32,6 +32,18 @@
if (!defined('PMA_SQP_LIB_INCLUDED')) { if (!defined('PMA_SQP_LIB_INCLUDED')) {
define('PMA_SQP_LIB_INCLUDED', 1); define('PMA_SQP_LIB_INCLUDED', 1);
if(defined('PMA_MULTIBYTE_ENCODING')) {
$GLOBALS['PMA_SQP_strlen'] = 'mb_strlen';
$GLOBALS['PMA_SQP_strpos'] = 'mb_strpos';
$GLOBALS['PMA_SQP_strrpos'] = 'mb_strrpos';
$GLOBALS['PMA_SQP_substr'] = 'mb_substr';
} else {
$GLOBALS['PMA_SQP_strlen'] = 'strlen';
$GLOBALS['PMA_SQP_strpos'] = 'strpos';
$GLOBALS['PMA_SQP_strrpos'] = 'strrpos';
$GLOBALS['PMA_SQP_substr'] = 'substr';
}
/** /**
* Include the string library as we use it heavily * Include the string library as we use it heavily
*/ */
@@ -169,7 +181,7 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) {
return $sql; return $sql;
} }
$len = strlen($sql); $len = $GLOBALS['PMA_SQP_strlen']($sql);
if ($len == 0) { if ($len == 0) {
return array(); return array();
} }
@@ -234,18 +246,18 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) {
$type = 'mysql'; $type = 'mysql';
case '-': case '-':
$type = 'ansi'; $type = 'ansi';
$pos = strpos($sql, "\n", $count2); $pos = $GLOBALS['PMA_SQP_strpos']($sql, "\n", $count2);
break; break;
case '/': case '/':
$type = 'c'; $type = 'c';
$pos = strpos($sql, '*/', $count2); $pos = $GLOBALS['PMA_SQP_strpos']($sql, '*/', $count2);
$pos += 2; $pos += 2;
break; break;
default: default:
break; break;
} // end switch } // end switch
$count2 = ($pos < $count2) ? $len : $pos; $count2 = ($pos < $count2) ? $len : $pos;
$str = substr($sql, $count1, $count2 - $count1); $str = $GLOBALS['PMA_SQP_substr']($sql, $count1, $count2 - $count1);
PMA_SQP_arrayAdd($sql_array, 'comment_' . $type, $str, $arraysize); PMA_SQP_arrayAdd($sql_array, 'comment_' . $type, $str, $arraysize);
continue; continue;
} // end if } // end if
@@ -261,7 +273,7 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) {
$oldpos = 0; $oldpos = 0;
do { do {
$oldpos = $pos; $oldpos = $pos;
$pos = strpos(' ' . $sql, $quotetype, $oldpos + 1) - 1; $pos = $GLOBALS['PMA_SQP_strpos'](' ' . $sql, $quotetype, $oldpos + 1) - 1;
// ($pos === FALSE) // ($pos === FALSE)
if ($pos < 0) { if ($pos < 0) {
$debugstr = $GLOBALS['strSQPBugUnclosedQuote'] . ' @ ' . $startquotepos. "\n" $debugstr = $GLOBALS['strSQPBugUnclosedQuote'] . ' @ ' . $startquotepos. "\n"
@@ -305,7 +317,7 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) {
default: default:
break; break;
} // end switch } // end switch
$data = substr($sql, $count1, $count2 - $count1); $data = $GLOBALS['PMA_SQP_substr']($sql, $count1, $count2 - $count1);
PMA_SQP_arrayAdd($sql_array, $type, $data, $arraysize); PMA_SQP_arrayAdd($sql_array, $type, $data, $arraysize);
continue; continue;
} }
@@ -344,7 +356,7 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) {
if ($l == 1) { if ($l == 1) {
$punct_data = $c; $punct_data = $c;
} else { } else {
$punct_data = substr($sql, $count1, $l); $punct_data = $GLOBALS['PMA_SQP_substr']($sql, $count1, $l);
} }
// Special case, sometimes, althought two characters are // Special case, sometimes, althought two characters are
@@ -381,10 +393,10 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) {
$punct_data = $first; $punct_data = $first;
} else if (($last2 == '/*') || ($last2 == '--')) { } else if (($last2 == '/*') || ($last2 == '--')) {
$count2 -= 2; $count2 -= 2;
$punct_data = substr($sql, $count1, $count2 - $count1); $punct_data = $GLOBALS['PMA_SQP_substr']($sql, $count1, $count2 - $count1);
} else if (($last == '-') || ($last == '+') || ($last == '!')) { } else if (($last == '-') || ($last == '+') || ($last == '!')) {
$count2--; $count2--;
$punct_data = substr($sql, $count1, $count2 - $count1); $punct_data = $GLOBALS['PMA_SQP_substr']($sql, $count1, $count2 - $count1);
} else { } else {
$debugstr = $GLOBALS['strSQPBugUnknownPunctuation'] . ' @ ' . ($count1+1) . "\n" $debugstr = $GLOBALS['strSQPBugUnknownPunctuation'] . ' @ ' . ($count1+1) . "\n"
. 'STR: ' . $punct_data; . 'STR: ' . $punct_data;
@@ -423,7 +435,7 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) {
continue; continue;
} else { } else {
$debugstr = $GLOBALS['strSQPBugInvalidIdentifer'] . ' @ ' . ($count1+1) . "\n" $debugstr = $GLOBALS['strSQPBugInvalidIdentifer'] . ' @ ' . ($count1+1) . "\n"
. 'STR: ' . substr($sql, $count1, $count2 - $count1); . 'STR: ' . $GLOBALS['PMA_SQP_substr']($sql, $count1, $count2 - $count1);
PMA_SQP_throwError($debugstr, $sql); PMA_SQP_throwError($debugstr, $sql);
return $sql; return $sql;
} }
@@ -451,7 +463,7 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) {
} // end while } // end while
$l = $count2 - $count1; $l = $count2 - $count1;
$str = substr($sql, $count1, $l); $str = $GLOBALS['PMA_SQP_substr']($sql, $count1, $l);
$type = ''; $type = '';
if ($is_digit) { if ($is_digit) {
@@ -480,7 +492,7 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) {
$count2++; $count2++;
$debugstr = 'C1 C2 LEN: ' . $count1 . ' ' . $count2 . ' ' . $len . "\n" $debugstr = 'C1 C2 LEN: ' . $count1 . ' ' . $count2 . ' ' . $len . "\n"
. 'STR: ' . substr($sql, $count1, $count2 - $count1) . "\n"; . 'STR: ' . $GLOBALS['PMA_SQP_substr']($sql, $count1, $count2 - $count1) . "\n";
PMA_SQP_bug($debugstr, $sql); PMA_SQP_bug($debugstr, $sql);
return $sql; return $sql;
@@ -488,38 +500,49 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) {
if ($arraysize > 0) { if ($arraysize > 0) {
$t_next = $sql_array[0]['type']; $t_next = $sql_array[0]['type'];
$t_prev = ''; $t_prev = '';
$t_cur = ''; $t_cur = '';
} }
for ($i = 0; $i < $arraysize; $i++) { for ($i = 0; $i < $arraysize; $i++) {
$t_prev = $t_cur; $t_prev = $t_cur;
$t_cur = $t_next; $t_cur = $t_next;
if (($i + 1) < $arraysize) { if (($i + 1) < $arraysize) {
$t_next = $sql_array[$i + 1]['type']; $t_next = $sql_array[$i + 1]['type'];
} else {
$t_next = '';
}
if ($t_cur == 'alpha') {
$t_suffix = '_identifier';
$d_cur_upper = strtoupper($sql_array[$i]['data']);
if($d_cur_upper == 'SET') {
echo "T: $t_next\n";
}
if (($t_next == 'punct_qualifier') || ($t_prev == 'punct_qualifier')) {
$t_suffix = '_identifier';
} else if (($t_next == 'punct_bracket_open_round')
&& PMA_STR_binarySearchInArr($d_cur_upper, $PMA_SQPdata_function_name, $PMA_SQPdata_function_name_cnt)) {
$t_suffix = '_functionName';
} else if (PMA_STR_binarySearchInArr($d_cur_upper, $PMA_SQPdata_column_type, $PMA_SQPdata_column_type_cnt)) {
$t_suffix = '_columnType';
//temporary fix for BUG #621357
//TODO FIX PROPERLY NEEDS OVERHAUL OF SQL TOKENIZER
if($d_cur_upper == 'SET' && $t_next != 'punct_bracket_open_round') {
$t_suffix = '_reservedWord';
}
//END OF TEMPORARY FIX
} else if (PMA_STR_binarySearchInArr($d_cur_upper, $PMA_SQPdata_reserved_word, $PMA_SQPdata_reserved_word_cnt)) {
$t_suffix = '_reservedWord';
} else if (PMA_STR_binarySearchInArr($d_cur_upper, $PMA_SQPdata_column_attrib, $PMA_SQPdata_column_attrib_cnt)) {
$t_suffix = '_columnAttrib';
} else { } else {
$t_next = ''; // Do nothing
}
if ($t_cur == 'alpha') {
$t_suffix = '_identifier';
$d_cur_upper = strtoupper($sql_array[$i]['data']);
if (($t_next == 'punct_qualifier') || ($t_prev == 'punct_qualifier')) {
$t_suffix = '_identifier';
} else if (($t_next == 'punct_bracket_open_round')
&& PMA_STR_binarySearchInArr($d_cur_upper, $PMA_SQPdata_function_name, $PMA_SQPdata_function_name_cnt)) {
$t_suffix = '_functionName';
} else if (PMA_STR_binarySearchInArr($d_cur_upper, $PMA_SQPdata_reserved_word, $PMA_SQPdata_reserved_word_cnt)) {
$t_suffix = '_reservedWord';
} else if (PMA_STR_binarySearchInArr($d_cur_upper, $PMA_SQPdata_column_type, $PMA_SQPdata_column_type_cnt)) {
$t_suffix = '_columnType';
} else if (PMA_STR_binarySearchInArr($d_cur_upper, $PMA_SQPdata_column_attrib, $PMA_SQPdata_column_attrib_cnt)) {
$t_suffix = '_columnAttrib';
} else {
// Do nothing
}
$sql_array[$i]['type'] .= $t_suffix;
} }
$sql_array[$i]['type'] .= $t_suffix;
}
} }
// Stores the size of the array inside the array, as count() is a slow // Stores the size of the array inside the array, as count() is a slow
@@ -634,10 +657,10 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) {
*/ */
function PMA_SQP_formatHtml_colorize($arr) function PMA_SQP_formatHtml_colorize($arr)
{ {
$i = strpos($arr['type'], '_'); $i = $GLOBALS['PMA_SQP_strpos']($arr['type'], '_');
$class = ''; $class = '';
if ($i > 0) { if ($i > 0) {
$class = 'syntax_' . substr($arr['type'], 0, $i) . ' '; $class = 'syntax_' . $GLOBALS['PMA_SQP_substr']($arr['type'], 0, $i) . ' ';
} }
$class .= 'syntax_' . $arr['type']; $class .= 'syntax_' . $arr['type'];