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

bug 649665

Browse Source
This commit is contained in:
Marc Delisle
2002-12-11 11:07:07 +00:00
parent 021dd60fe0
commit af23806b2f
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -7,6 +7,8 @@ $Source$
2002-12-11 Marc Delisle <lem9@users.sourceforge.net> 2002-12-11 Marc Delisle <lem9@users.sourceforge.net>
* lang/galician: update, thanks to Xos<6F> Calvo * lang/galician: update, thanks to Xos<6F> Calvo
* libraries/sqlparser.lib.php3: bug 649665 undefined vars with UNION,
but there is still some work to do about how to split a UNION
2002-12-10 Michal Cihar <nijel@users.sourceforge.net> 2002-12-10 Michal Cihar <nijel@users.sourceforge.net>
* lang/czech*.php3: Updated translation. * lang/czech*.php3: Updated translation.

8
libraries/sqlparser.lib.php3
View File

@@ -2,7 +2,6 @@
/* $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>
@@ -573,6 +572,7 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) {
); );
$subresult_empty = $subresult; $subresult_empty = $subresult;
$seek_queryend = FALSE; $seek_queryend = FALSE;
$seen_end_of_table_ref = FALSE;
/* Description of analyzer results /* Description of analyzer results
* *
@@ -612,6 +612,7 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) {
// 'LOCK IN SHARE MODE', // 'LOCK IN SHARE MODE',
// 'ORDER BY', // 'ORDER BY',
// 'PROCEDURE', // 'PROCEDURE',
// 'UNION',
// 'WHERE' // 'WHERE'
// ); // );
$words_ending_table_ref = array( $words_ending_table_ref = array(
@@ -622,9 +623,10 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) {
'LOCK', 'LOCK',
'ORDER', 'ORDER',
'PROCEDURE', 'PROCEDURE',
'UNION',
'WHERE' 'WHERE'
); );
$words_ending_table_ref_cnt = count($words_ending_table_ref); $words_ending_table_ref_cnt = 9; //count($words_ending_table_ref);
// must be sorted // must be sorted
$supported_query_types = array( $supported_query_types = array(
@@ -660,6 +662,8 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) {
} // end if (type == punct_queryend) } // end if (type == punct_queryend)
} // end if ($seek_queryend) } // end if ($seek_queryend)
// TODO: when we find a UNION, should we split
// in another subresult?
if ($arr[$i]['type'] == 'punct_queryend') { if ($arr[$i]['type'] == 'punct_queryend') {
$result[] = $subresult; $result[] = $subresult;
$subresult = $subresult_empty; $subresult = $subresult_empty;