Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-12 21:05:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 285401: Checksetup fails to complete on PostgreSQL

Browse Source 
Patch By Max Kanat-Alexander <mkanat@kerio.com> r=glob, a=justdave
This commit is contained in:
mkanat%kerio.com 2005-03-10 08:14:22 +00:00
parent 8b46dbab3b
commit 4ad9e8e382
1 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
webtools/bugzilla/checksetup.pl
View File

@ -1653,8 +1653,9 @@ sub AddGroup {
print "Adding group $name ...\n"; print "Adding group $name ...\n";
my $sth = $dbh->prepare('INSERT INTO groups my $sth = $dbh->prepare('INSERT INTO groups
(name, description, userregexp, isbuggroup) (name, description, userregexp, isbuggroup,
VALUES (?, ?, ?, ?)'); last_changed)
VALUES (?, ?, ?, ?, NOW())');
$sth->execute($name, $desc, $userregexp, 0); $sth->execute($name, $desc, $userregexp, 0);
my $last = $dbh->bz_last_key('groups', 'id'); my $last = $dbh->bz_last_key('groups', 'id');
@ -3696,10 +3697,14 @@ if (!GroupDoesExist('bz_canusewhines')) {
my $whineatothers_group = AddGroup('bz_canusewhineatothers', my $whineatothers_group = AddGroup('bz_canusewhineatothers',
'Can configure whine reports for ' . 'Can configure whine reports for ' .
'other users'); 'other users');
$dbh->do("INSERT IGNORE INTO group_group_map " . my $group_exists = $dbh->selectrow_array(
q{SELECT 1 FROM group_group_map
WHERE member_id = ? AND grantor_id = ? AND grant_type = ?},
undef, $whineatothers_group, $whine_group, GROUP_MEMBERSHIP);
$dbh->do("INSERT INTO group_group_map " .
"(member_id, grantor_id, grant_type) " . "(member_id, grantor_id, grant_type) " .
"VALUES (${whineatothers_group}, ${whine_group}, " . "VALUES (${whineatothers_group}, ${whine_group}, " .
GROUP_MEMBERSHIP . ")"); GROUP_MEMBERSHIP . ")") unless $group_exists;
} }
########################################################################### ###########################################################################
@ -3813,10 +3818,9 @@ if ($sth->rows == 0) {
$login = ""; $login = "";
} }
} }
$login = $dbh->quote($login);
$sth = $dbh->prepare("SELECT login_name FROM profiles " . $sth = $dbh->prepare("SELECT login_name FROM profiles " .
"WHERE login_name=$login"); "WHERE login_name = ?");
$sth->execute; $sth->execute($login);
if ($sth->rows > 0) { if ($sth->rows > 0) {
print "$login already has an account.\n"; print "$login already has an account.\n";
print "Make this user the administrator? [Y/n] "; print "Make this user the administrator? [Y/n] ";
@ -3909,24 +3913,17 @@ if ($sth->rows == 0) {
$SIG{QUIT} = 'DEFAULT'; $SIG{QUIT} = 'DEFAULT';
$SIG{TERM} = 'DEFAULT'; $SIG{TERM} = 'DEFAULT';
$realname = $dbh->quote($realname);
$cryptedpassword = $dbh->quote($cryptedpassword);
# Set default email flags for the Admin, same as for users
my $defaultflagstring =
$dbh->quote(Bugzilla::Constants::DEFAULT_EMAIL_SETTINGS);
$dbh->do( $dbh->do(
"INSERT " . q{INSERT INTO profiles (login_name, realname, cryptpassword,
" INTO profiles (login_name, realname, cryptpassword, emailflags) " . emailflags, disabledtext, refreshed_when)
"VALUES ($login, $realname, $cryptedpassword, $defaultflagstring)"); VALUES (?, ?, ?, ?, ?, ?)},
undef, $login, $realname, $cryptedpassword,
Bugzilla::Constants::DEFAULT_EMAIL_SETTINGS, '', '1900-01-01 00:00:00');
} }
# Put the admin in each group if not already # Put the admin in each group if not already
my $query = "select userid from profiles where login_name = $login"; my $userid = $dbh->selectrow_array(
$sth = $dbh->prepare($query); "SELECT userid FROM profiles WHERE login_name = ?", undef, $login);
$sth->execute();
my ($userid) = $sth->fetchrow_array();
# Admins get explicit membership and bless capability for the admin group # Admins get explicit membership and bless capability for the admin group
my ($admingroupid) = $dbh->selectrow_array("SELECT id FROM groups my ($admingroupid) = $dbh->selectrow_array("SELECT id FROM groups