Bug 286686: ORDER BY column needs to be selected or grouped

Patch By Tomas Kopal <Tomas.Kopal@altap.cz> r=mkanat, a=justdave

diff --git a/Bugzilla/User.pm b/Bugzilla/User.pm
index 0d1b815c05a8c91d5e8f85311752d25b30e41399..2096db407ee0386a2a0347ecfb7b070fd912fb1d 100644 (file)
--- a/Bugzilla/User.pm
+++ b/Bugzilla/User.pm
@@ -598,7 +598,8 @@ sub match {
 
         # Build the query.
         my $sqlstr = &::SqlQuote($wildstr);
-        my $query  = "SELECT DISTINCT userid, realname, login_name " .
+        my $query  = "SELECT DISTINCT userid, realname, login_name, " .\r
+                     "LENGTH(login_name) AS namelength " .
                      "FROM profiles ";
         if (&::Param('usevisibilitygroups')) {
             $query .= ", user_group_map ";
@@ -613,7 +614,7 @@ sub match {
                       "AND grant_type <> " . GRANT_DERIVED;
         }
         $query    .= " AND disabledtext = '' " if $exclude_disabled;
-        $query    .= "ORDER BY length(login_name) ";
+        $query    .= "ORDER BY namelength ";
         $query    .= $dbh->sql_limit($limit) if $limit;
 
         # Execute the query, retrieve the results, and make them into
@@ -648,7 +649,8 @@ sub match {
 
         my $sqlstr = &::SqlQuote(uc($str));
 
-        my $query   = "SELECT DISTINCT userid, realname, login_name " .
+        my $query   = "SELECT DISTINCT userid, realname, login_name, " .\r
+                      "LENGTH(login_name) AS namelength " .
                       "FROM  profiles";
         if (&::Param('usevisibilitygroups')) {
             $query .= ", user_group_map";
@@ -665,7 +667,7 @@ sub match {
                       " AND grant_type <> " . GRANT_DERIVED;
         }
         $query     .= " AND disabledtext = ''" if $exclude_disabled;
-        $query     .= " ORDER BY length(login_name)";
+        $query     .= " ORDER BY namelength";
         $query     .= " " . $dbh->sql_limit($limit) if $limit;
         &::PushGlobalSQLState();
         &::SendSQL($query);

diff --git a/summarize_time.cgi b/summarize_time.cgi
index 67bc255e8917bcf401029b0e3b9784e14bdaf824..eb3aff23067c110fd6fca695f36a99712ee56709 100755 (executable)
--- a/summarize_time.cgi
+++ b/summarize_time.cgi
@@ -322,7 +322,8 @@ sub get_inactive_bugs {
             WHERE  longdescs.bug_id IN ($buglist)
                    $date_bits } .
          $dbh->sql_group_by('longdescs.bug_id',
-                            'bugs.short_desc, bugs.bug_status') . qq{
+                            'bugs.short_desc, bugs.bug_status,\r
+                             longdescs.bug_when') . qq{
             ORDER BY longdescs.bug_when};
     $sth = $dbh->prepare($q);
     $sth->execute(@{$date_values});