From: Max Kanat-Alexander <mkanat@bugzilla.org>
Date: Tue, 1 Jun 2010 03:47:25 +0000 (-0700)
Subject: Bug 561379: Upgrading from 3.4.4 to 3.6 would fail with ORA-01400,
X-Git-Tag: bugzilla-3.6.1~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fce2c82412d2057f50fb84066ff77735ff14b4cb;p=thirdparty%2Fbugzilla.git

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)
---

diff --git a/Bugzilla/Install/DB.pm b/Bugzilla/Install/DB.pm
index 3ea770be68..4ae1885967 100644
--- a/Bugzilla/Install/DB.pm
+++ b/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,