зеркало из https://github.com/mozilla/pjs.git
Bug 286686: ORDER BY column needs to be selected or grouped
Patch By Tomas Kopal <Tomas.Kopal@altap.cz> r=mkanat, a=justdave
This commit is contained in:
Родитель
7da9618f88
Коммит
957baf6388
|
@ -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, " .
|
||||
"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, " .
|
||||
"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);
|
||||
|
|
|
@ -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,
|
||||
longdescs.bug_when') . qq{
|
||||
ORDER BY longdescs.bug_when};
|
||||
$sth = $dbh->prepare($q);
|
||||
$sth->execute(@{$date_values});
|
||||
|
|
Загрузка…
Ссылка в новой задаче