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

bug #1394779, SQL executer tries to find keys from current table

Browse Source
This commit is contained in:
Marc Delisle
2006-01-11 20:16:20 +00:00
parent fb7ba99648
commit 841b3403c7
3 changed files with 5 additions and 2 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$
2006-01-11 Marc Delisle <lem9@users.sourceforge.net>
* sql.php, libraries/sqlparser.lib.php: other fixes for bug #1394479
2006-01-11 Michal Čihař <michal@cihar.com> 2006-01-11 Michal Čihař <michal@cihar.com>
* main.php: Do not fail if no server is defined. * main.php: Do not fail if no server is defined.
* main.php, libraries/left_header.inc.php, * main.php, libraries/left_header.inc.php,

2
libraries/sqlparser.lib.php
View File

@@ -1541,7 +1541,7 @@ if ( ! defined( 'PMA_MINIMUM_COMMON' ) ) {
// clear $upper_data for next iteration // clear $upper_data for next iteration
$upper_data=''; $upper_data='';
if ($collect_section_before_limit) { if ($collect_section_before_limit && $arr[$i]['type'] != 'punct_queryend') {
$section_before_limit .= $arr[$i]['data'] . $sep; $section_before_limit .= $arr[$i]['data'] . $sep;
} else { } else {
$section_after_limit .= $arr[$i]['data'] . $sep; $section_after_limit .= $arr[$i]['data'] . $sep;

2
sql.php
View File

@@ -337,7 +337,7 @@ else {
// a section_after_limit, we now have to analyze $display_query // a section_after_limit, we now have to analyze $display_query
// to display it correctly // to display it correctly
if (!empty($analyzed_sql[0]['section_after_limit'])) { if (!empty($analyzed_sql[0]['section_after_limit']) && trim($analyzed_sql[0]['section_after_limit']) != ';') {
$analyzed_display_query = PMA_SQP_analyze(PMA_SQP_parse($display_query)); $analyzed_display_query = PMA_SQP_analyze(PMA_SQP_parse($display_query));
$display_query = $analyzed_display_query[0]['section_before_limit'] . "\n" . $sql_limit_to_append . $analyzed_display_query[0]['section_after_limit']; $display_query = $analyzed_display_query[0]['section_before_limit'] . "\n" . $sql_limit_to_append . $analyzed_display_query[0]['section_after_limit'];
} }