From 55d0f8a9b86eced03d7a18c721c91426786bb7b4 Mon Sep 17 00:00:00 2001 From: "mkanat%kerio.com" <> Date: Thu, 25 Aug 2005 02:27:51 +0000 Subject: Bug 303860: There is a database change in the wrong place in checksetup.pl Patch By Max Kanat-Alexander r=joel, a=justdave --- checksetup.pl | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/checksetup.pl b/checksetup.pl index 5d84ae7cb..7e57587a5 100755 --- a/checksetup.pl +++ b/checksetup.pl @@ -3998,6 +3998,16 @@ if (!exists $dbh->bz_column_info('whine_queries', 'title')->{DEFAULT}) { NOTNULL => 1, DEFAULT => "''"}); } +# 2005-06-29 bugreport@peshkin.net, bug 299156 +if ($dbh->bz_index_info('attachments', 'attachments_submitter_id_idx') + && (scalar(@{$dbh->bz_index_info('attachments', + 'attachments_submitter_id_idx' + )->{FIELDS}}) < 2) + ) { + $dbh->bz_drop_index('attachments', 'attachments_submitter_id_idx'); +} +$dbh->bz_add_index('attachments', 'attachments_submitter_id_idx', + [qw(submitter_id bug_id)]); # If you had to change the --TABLE-- definition in any way, then add your # differential change code *** A B O V E *** this comment. @@ -4021,17 +4031,6 @@ AddGroup('editcomponents', 'Can create, destroy, and edit components.'); AddGroup('editkeywords', 'Can create, destroy, and edit keywords.'); AddGroup('admin', 'Administrators'); -# 2005-06-29 bugreport@peshkin.net, bug 299156 -if ($dbh->bz_index_info('attachments', 'attachments_submitter_id_idx') - && (scalar(@{$dbh->bz_index_info('attachments', - 'attachments_submitter_id_idx' - )->{FIELDS}}) < 2) - ) { - $dbh->bz_drop_index('attachments', 'attachments_submitter_id_idx'); -} -$dbh->bz_add_index('attachments', 'attachments_submitter_id_idx', - [qw(submitter_id bug_id)]); - if (!GroupDoesExist("editbugs")) { my $id = AddGroup('editbugs', 'Can edit all bug fields.', ".*"); my $sth = $dbh->prepare("SELECT userid FROM profiles"); -- cgit v1.2.3-24-g4f1b