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

bug 636575

Browse Source
This commit is contained in:
Marc Delisle
2002-11-11 18:26:41 +00:00
parent af84e6ce23
commit 12fb6cda18
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -7,6 +7,7 @@ $Source$
2002-11-11 Marc Delisle <lem9@users.sourceforge.net> 2002-11-11 Marc Delisle <lem9@users.sourceforge.net>
* libraries/sqlparser.lib.php3: LEFT JOIN ... USING * libraries/sqlparser.lib.php3: LEFT JOIN ... USING
* libraries/sqlparser.lib.php3: bug 636575 (double quotes)
2002-11-10 Alexander M. Turek <rabus@users.sourceforge.net> 2002-11-10 Alexander M. Turek <rabus@users.sourceforge.net>
* lang/german-*.inc.php3: Fixed a typo. * lang/german-*.inc.php3: Fixed a typo.

19
libraries/sqlparser.lib.php3
View File

@@ -592,7 +592,7 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) {
* not present (for example no select_expression alias). * not present (for example no select_expression alias).
* *
* There is a debug section at the end of the main loop, if you want to * There is a debug section at the end of the main loop, if you want to
* witness the exact contents of select_expr and table_ref * see the exact contents of select_expr and table_ref
*/ */
// must be sorted // must be sorted
// TODO: current logic checks for only one word, so I put only the // TODO: current logic checks for only one word, so I put only the
@@ -699,10 +699,20 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) {
// ============================== // ==============================
if (($arr[$i]['type'] == 'quote_backtick') if (($arr[$i]['type'] == 'quote_backtick')
|| ($arr[$i]['type'] == 'quote_double')
|| ($arr[$i]['type'] == 'alpha_identifier')) { || ($arr[$i]['type'] == 'alpha_identifier')) {
// remove backticks if any //TODO: check embedded double quotes or backticks?
$identifier = str_replace('`','',$arr[$i]['data']); // and/or remove just the first and last character?
if ($arr[$i]['type'] == 'quote_backtick') {
// remove backticks
$identifier = str_replace('`','',$arr[$i]['data']);
}
if ($arr[$i]['type'] == 'quote_double') {
// remove double quotes
$identifier = str_replace('"','',$arr[$i]['data']);
}
if ($subresult['querytype'] == 'SELECT') { if ($subresult['querytype'] == 'SELECT') {
if (!$seen_from) { if (!$seen_from) {
@@ -729,7 +739,7 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) {
} // end if ($save_table_ref &&!$seen_end_of_table_ref) } // end if ($save_table_ref &&!$seen_end_of_table_ref)
} // end if (!$seen_from) } // end if (!$seen_from)
} // end if (querytype SELECT) } // end if (querytype SELECT)
} // end if ( quote_backtick or alpha_identifier) } // end if ( quote_backtick or double quote or alpha_identifier)
// =================================== // ===================================
if ($arr[$i]['type'] == 'punct_qualifier') { if ($arr[$i]['type'] == 'punct_qualifier') {
@@ -873,6 +883,7 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) {
// set the $previous_was_identifier to FALSE if the current // set the $previous_was_identifier to FALSE if the current
// token is not an identifier // token is not an identifier
if (($arr[$i]['type'] != 'alpha_identifier') if (($arr[$i]['type'] != 'alpha_identifier')
&& ($arr[$i]['type'] != 'quote_double')
&& ($arr[$i]['type'] != 'quote_backtick')) { && ($arr[$i]['type'] != 'quote_backtick')) {
$previous_was_identifier = FALSE; $previous_was_identifier = FALSE;
} // end if } // end if