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

This commit was manufactured by cvs2svn to create branch 'MAINT_2_9_0'.

Browse Source
This commit is contained in:
Michal Čihař
2006-09-29 21:12:52 +00:00
parent 37319e821b
commit 59a92cd8ff
92 changed files with 7318 additions and 7371 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libraries/sqlparser.lib.php
View File

@@ -1512,7 +1512,12 @@ if ( ! defined( 'PMA_MINIMUM_COMMON' ) ) {
$group_by_clause .= $arr[$i]['data'] . $sep;
}
if ($in_order_by && $upper_data != 'ORDER' && $upper_data != 'BY') {
$order_by_clause .= $arr[$i]['data'] . $sep;
// add a space only before ASC or DESC
// not around the dot between dbname and tablename
if ($arr[$i]['type'] == 'alpha_reservedWord') {
$order_by_clause .= $sep;
}
$order_by_clause .= $arr[$i]['data'];
}
if ($in_having && $upper_data != 'HAVING') {
$having_clause .= $arr[$i]['data'] . $sep;