From 4dd48fca3c4519b3414cce059272b657f91c312a Mon Sep 17 00:00:00 2001 From: "mkanat%bugzilla.org" Date: Tue, 1 Jun 2010 04:02:47 +0000 Subject: [PATCH] Bug 561379: Upgrading from 3.4.4 to 3.6 would fail with ORA-01400, because checksetup.pl was trying to run code that should never run on Oracle. r=mkanat, a=mkanat (module owner) git-svn-id: svn://10.0.0.236/branches/BUGZILLA-3_6-BRANCH@260403 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/webtools/bugzilla/.bzrrev | 2 +- mozilla/webtools/bugzilla/Bugzilla/Install/DB.pm | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/mozilla/webtools/bugzilla/.bzrrev b/mozilla/webtools/bugzilla/.bzrrev index f336ebb5010..ae3de5bfea4 100644 --- a/mozilla/webtools/bugzilla/.bzrrev +++ b/mozilla/webtools/bugzilla/.bzrrev @@ -1 +1 @@ -7104 \ No newline at end of file +7105 \ No newline at end of file diff --git a/mozilla/webtools/bugzilla/Bugzilla/Install/DB.pm b/mozilla/webtools/bugzilla/Bugzilla/Install/DB.pm index 3ea770be68a..4ae1885967c 100644 --- a/mozilla/webtools/bugzilla/Bugzilla/Install/DB.pm +++ b/mozilla/webtools/bugzilla/Bugzilla/Install/DB.pm @@ -1883,6 +1883,12 @@ sub _remove_spaces_and_commas_from_flagtypes { sub _setup_usebuggroups_backward_compatibility { my $dbh = Bugzilla->dbh; + + # Don't run this on newer Bugzillas. This is a reliable test because + # the longdescs table existed in 2.16 (which had usebuggroups) + # but not in 2.18, and this code happens between 2.16 and 2.18. + return if $dbh->bz_column_info('longdescs', 'already_wrapped'); + # 2002-11-24 - bugreport@peshkin.net - bug 147275 # # If group_control_map is empty, backward-compatibility @@ -1890,6 +1896,7 @@ sub _setup_usebuggroups_backward_compatibility { my ($maps_exist) = $dbh->selectrow_array( "SELECT DISTINCT 1 FROM group_control_map"); if (!$maps_exist) { + print "Converting old usebuggroups controls...\n"; # Initially populate group_control_map. # First, get all the existing products and their groups. my $sth = $dbh->prepare("SELECT groups.id, products.id, groups.name,