diff options
| author | mkanat%kerio.com <> | 2005-03-05 16:36:07 +0100 |
|---|---|---|
| committer | mkanat%kerio.com <> | 2005-03-05 16:36:07 +0100 |
| commit | 0c1b77e123dbafb96168fe6affd6373b9aa081fe (patch) | |
| tree | 9f4bf1de4a3b85d423238ed47a56746d70181e24 /Bugzilla/User.pm | |
| parent | 8b47184604eb5868736e0a2a8ae894f6feceaa95 (diff) | |
| download | bugzilla-0c1b77e123dbafb96168fe6affd6373b9aa081fe.tar.gz bugzilla-0c1b77e123dbafb96168fe6affd6373b9aa081fe.tar.xz | |
Bug 284598: INSTR function is not supported by postgres
Patch By Tomas Kopal <Tomas.Kopal@altap.cz> r=mkanat, a=justdave
Diffstat (limited to 'Bugzilla/User.pm')
| -rw-r--r-- | Bugzilla/User.pm | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/Bugzilla/User.pm b/Bugzilla/User.pm index 040836616..dc11822bc 100644 --- a/Bugzilla/User.pm +++ b/Bugzilla/User.pm @@ -618,23 +618,25 @@ sub match { my $sqlstr = &::SqlQuote(uc($str)); - my $query = "SELECT DISTINCT userid, realname, login_name " . - "FROM profiles "; + my $query = "SELECT DISTINCT userid, realname, login_name " . + "FROM profiles"; if (&::Param('usevisibilitygroups')) { - $query .= ", user_group_map "; + $query .= ", user_group_map"; } - $query .= "WHERE (INSTR(UPPER(login_name), $sqlstr) " . - "OR INSTR(UPPER(realname), $sqlstr)) "; + $query .= " WHERE " . $dbh->sql_position($sqlstr, + "UPPER(login_name)") . + " OR " . $dbh->sql_position($sqlstr, + "UPPER(realname)"); if (&::Param('usevisibilitygroups')) { - $query .= "AND user_group_map.user_id = userid " . - "AND isbless = 0 " . - "AND group_id IN(" . - join(', ', (-1, @{$user->visible_groups_inherited})) . ") " . - "AND grant_type <> " . GRANT_DERIVED; + $query .= " AND user_group_map.user_id = userid" . + " AND isbless = 0" . + " AND group_id IN(" . + join(', ', (-1, @{$user->visible_groups_inherited})) . ")" . + " AND grant_type <> " . GRANT_DERIVED; } - $query .= " AND disabledtext = '' " if $exclude_disabled; - $query .= "ORDER BY length(login_name) "; - $query .= $dbh->sql_limit($limit) if $limit; + $query .= " AND disabledtext = ''" if $exclude_disabled; + $query .= " ORDER BY length(login_name)"; + $query .= " " . $dbh->sql_limit($limit) if $limit; &::PushGlobalSQLState(); &::SendSQL($query); push(@users, new Bugzilla::User(&::FetchSQLData())) while &::MoreSQLData(); |