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

bug 906551

Browse Source
This commit is contained in:
Marc Delisle
2004-03-18 22:00:48 +00:00
parent 78b92f76e1
commit 36c32393d9
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -8,6 +8,7 @@ $Source$
2004-03-18 Marc Delisle <lem9@users.sourceforge.net> 2004-03-18 Marc Delisle <lem9@users.sourceforge.net>
* lang/romanian: Updated, thanks to Valics Lehel. * lang/romanian: Updated, thanks to Valics Lehel.
* libraries/common.lib.php: bug 913704, delete link in db search * libraries/common.lib.php: bug 913704, delete link in db search
* libraries/sqlparser.lib.php: bug 906551, GRANT...TO: another case
2004-03-13 Marc Delisle <lem9@users.sourceforge.net> 2004-03-13 Marc Delisle <lem9@users.sourceforge.net>
* sql.php: bug 913630: did not detect correctly DELETE FROM table * sql.php: bug 913630: did not detect correctly DELETE FROM table

18
libraries/sqlparser.lib.php
View File

@@ -450,6 +450,7 @@ if ($is_minimum_common == FALSE) {
//TODO: a @ can also be present in expressions like //TODO: a @ can also be present in expressions like
// FROM 'user'@'%' // FROM 'user'@'%'
// or TO 'user'@'%'
// in this case, the @ is wrongly marked as alpha_variable // in this case, the @ is wrongly marked as alpha_variable
$is_sql_variable = ($c == '@'); $is_sql_variable = ($c == '@');
@@ -1835,11 +1836,18 @@ if ($is_minimum_common == FALSE) {
// //
// also we must not be inside a privilege list // also we must not be inside a privilege list
if ($i > 0) { if ($i > 0) {
// the alpha_identifier condition is there to // the alpha_identifier exception is there to
// catch cases like // catch cases like
// GRANT SELECT ON mydb.mytable TO myuser@localhost // GRANT SELECT ON mydb.mytable TO myuser@localhost
// (else, we get mydb.mytableTO ) // (else, we get mydb.mytableTO )
if (!$in_priv_list || $typearr[1] == 'alpha_identifier') { //
// the quote_single exception is there to
// catch cases like
// GRANT ... TO 'marc'@'domain.com' IDENTIFIED...
//
// TODO: fix all cases and find why this happens
if (!$in_priv_list || $typearr[1] == 'alpha_identifier' || $typearr[1] == 'quote_single' || $typearr[1] == 'white_newline') {
$before .= $space_alpha_reserved_word; $before .= $space_alpha_reserved_word;
} }
} else { } else {
@@ -1912,7 +1920,11 @@ if ($is_minimum_common == FALSE) {
} }
break; break;
case 'alpha_variable': case 'alpha_variable':
// other workaround for a problem similar to the one
// explained below for quote_single
if (!$in_priv_list) {
$after = ' '; $after = ' ';
}
break; break;
case 'quote_double': case 'quote_double':
case 'quote_single': case 'quote_single':
@@ -1921,7 +1933,7 @@ if ($is_minimum_common == FALSE) {
// the @ is incorrectly marked as alpha_variable // the @ is incorrectly marked as alpha_variable
// in the parser, and here, the '%' gets a blank before, // in the parser, and here, the '%' gets a blank before,
// which is a syntax error // which is a syntax error
if ($typearr[1]!='alpha_variable') { if ($typearr[1] !='alpha_variable') {
$before .= ' '; $before .= ' ';
} }
if ($infunction && $typearr[3] == 'punct_bracket_close_round') { if ($infunction && $typearr[3] == 'punct_bracket_close_round') {