Skip to content

bugzilla
bugzilla
Commit 4adb6602 authored by mkanat%kerio.com's avatar mkanat%kerio.com
Browse files
Options

Bug 285407: User cannot log in on PostgreSQL

Patch By Max Kanat-Alexander <mkanat@kerio.com> r=bugreport, a=myk
parent 66b4c871
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 4 deletions
Bugzilla/User.pm
View file @ 4adb6602
...@@ -204,12 +204,14 @@ sub queries { ...@@ -204,12 +204,14 @@ sub queries {
my $dbh = Bugzilla->dbh; my $dbh = Bugzilla->dbh;
my $sth = $dbh->prepare(q{ SELECT my $sth = $dbh->prepare(q{ SELECT
DISTINCT name, query, linkinfooter, DISTINCT name, query, linkinfooter,
IF(whine_queries.id IS NOT NULL, 1, 0) CASE WHEN whine_queries.id
IS NOT NULL THEN 1 ELSE 0 END,
UPPER(name) AS uppername
FROM namedqueries FROM namedqueries
LEFT JOIN whine_queries LEFT JOIN whine_queries
ON whine_queries.query_name = name ON whine_queries.query_name = name
WHERE userid=? WHERE userid=?
ORDER BY UPPER(name)}); ORDER BY uppername});
$sth->execute($self->{id}); $sth->execute($self->{id});
my @queries; my @queries;
...@@ -494,8 +496,8 @@ sub derive_groups { ...@@ -494,8 +496,8 @@ sub derive_groups {
$group_sth ||= $dbh->prepare(q{SELECT grantor_id $group_sth ||= $dbh->prepare(q{SELECT grantor_id
FROM group_group_map FROM group_group_map
WHERE member_id=? WHERE member_id=?
AND grant_type=' . AND grant_type = } .
GROUP_MEMBERSHIP . '}); GROUP_MEMBERSHIP);
$group_sth->execute($group); $group_sth->execute($group);
while (my ($groupid) = $group_sth->fetchrow_array) { while (my ($groupid) = $group_sth->fetchrow_array) {
if (!defined($groupidschecked{"$groupid"})) { if (!defined($groupidschecked{"$groupid"})) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment