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

bug 816666 ambiguous order clauses

Browse Source
This commit is contained in:
Marc Delisle
2003-11-27 14:10:15 +00:00
parent d8c9b4aabe
commit b5e55d13d0
2 changed files with 21 additions and 18 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$
2003-11-27 Marc Delisle <lem9@users.sourceforge.net>
* libraries/display_tbl.lib.php: bug 816666: sort order and aliases
2003-11-26 Alexander M. Turek <lifeforrent@derrabus.de> 2003-11-26 Alexander M. Turek <lifeforrent@derrabus.de>
* Almost every file: * Almost every file:
- Replaced all include / require commands by require_once where possible; - Replaced all include / require commands by require_once where possible;

36
libraries/display_tbl.lib.php
View File

@@ -742,33 +742,33 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
// 2.1 Results can be sorted // 2.1 Results can be sorted
if ($is_display['sort_lnk'] == '1') { if ($is_display['sort_lnk'] == '1') {
// 2.1.1 Checks if the current column is used to sort the // 2.1.1 Checks if the table name is required; it's the case
// for a query with a "JOIN" statement and if the column
// isn't aliased, or in queries like
// SELECT `1`.`master_field` , `2`.`master_field`
// FROM `PMA_relation` AS `1` , `PMA_relation` AS `2`
if (($is_join
&& !preg_match('~([^[:space:],]|`[^`]`)[[:space:]]+(as[[:space:]]+)?' . $fields_meta[$i]->name . '~i', $select_stt[1], $parts))
|| (
$analyzed_sql[0]['select_expr'][$i]['expr'] !=
$analyzed_sql[0]['select_expr'][$i]['column']) ) {
$sort_tbl = PMA_backquote($fields_meta[$i]->table) . '.';
} else {
$sort_tbl = '';
}
// 2.1.2 Checks if the current column is used to sort the
// results // results
if (empty($sql_order)) { if (empty($sql_order)) {
$is_in_sort = FALSE; $is_in_sort = FALSE;
} else { } else {
// $pattern = str_replace('\\', '\\\\', $fields_meta[$i]->name);
// $pattern = str_replace('(','\(', $pattern);
// $pattern = str_replace(')','\)', $pattern);
// $pattern = str_replace('*','\*', $pattern);
// field name may be preceded by a space, or any number // field name may be preceded by a space, or any number
// of characters followed by a dot (tablename.fieldname) // of characters followed by a dot (tablename.fieldname)
// $is_in_sort = eregi('([[:space:]]|(.*\.))(`?)' . $pattern . '(`?)[ ,$]', $sql_order); // so do a direct comparison
// instead of using eregi(), now do a direct comparison
// for the sort expression (avoids problems with queries // for the sort expression (avoids problems with queries
// like "SELECT id, count(id)..." and clicking to sort // like "SELECT id, count(id)..." and clicking to sort
// on id or on count(id) ) // on id or on count(id) )
$is_in_sort = (PMA_backquote($fields_meta[$i]->name) == $sort_expression ? TRUE : FALSE); $is_in_sort = ($sort_tbl . PMA_backquote($fields_meta[$i]->name) == $sort_expression ? TRUE : FALSE);
}
// 2.1.2 Checks if the table name is required (it's the case
// for a query with a "JOIN" statement and if the column
// isn't aliased)
if ($is_join
&& !preg_match('~([^[:space:],]|`[^`]`)[[:space:]]+(as[[:space:]]+)?' . $fields_meta[$i]->name . '~i', $select_stt[1], $parts)) {
$sort_tbl = PMA_backquote($fields_meta[$i]->table) . '.';
} else {
$sort_tbl = '';
} }
// 2.1.3 Check the field name for backquotes. // 2.1.3 Check the field name for backquotes.
// If it contains some, it's probably a function column // If it contains some, it's probably a function column