From: lpsolit%gmail.com <>
Date: Fri, 7 Oct 2005 03:48:08 +0000 (+0000)
Subject: Bug 302785: [PostgreSQL] Bugzilla cannot order a buglist by number of votes - Patch... 
X-Git-Tag: bugzilla-2.20.1~122
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be3ed9c27c69b2d8f90d9ab7d59f5bafd83425bc;p=thirdparty%2Fbugzilla.git

Bug 302785: [PostgreSQL] Bugzilla cannot order a buglist by number of votes - Patch by Frédéric Buclin <LpSolit@gmail.com> r=joel a=justdave
---

diff --git a/Bugzilla/Search.pm b/Bugzilla/Search.pm
index 56d2846f37..0e9a56b0f5 100644
--- a/Bugzilla/Search.pm
+++ b/Bugzilla/Search.pm
@@ -1380,10 +1380,11 @@ sub init {
         next if ($field =~ /(AVG|SUM|COUNT|MAX|MIN|VARIANCE)\s*\(/i ||
                  $field =~ /^\d+$/ || $field eq "bugs.bug_id" ||
                  $field =~ /^relevance/);
-        if ($field =~ /.*AS\s+(\w+)$/i) {
+        # The structure of fields is of the form:
+        # [foo AS] {bar | bar.baz} [ASC | DESC]
+        # Only the mandatory part bar OR bar.baz is of interest
+        if ($field =~ /(?:.*\s+AS\s+)?(\w+(\.\w+)?)(?:\s+(ASC|DESC))?$/i) {
             push(@groupby, $1) if !grep($_ eq $1, @groupby);
-        } else {
-            push(@groupby, $field) if !grep($_ eq $field, @groupby);
         }
     }
     $query .= ") " . $dbh->sql_group_by("bugs.bug_id", join(', ', @groupby));