A better fix for Bug 577053: We only upgrade an old workflow to a new

one if we're upgrading from a version of Bugzilla before 4.0, and we
figure this out now by checking the existence of bugs_activity.comment_id.
r=LpSolit, a=mkanat

diff --git a/Bugzilla/Install/DB.pm b/Bugzilla/Install/DB.pm
index 687e8b83b0ede10a13b485c28f7343de37d0cbf5..d3dcc175b72c03e88bf3cd5418a00ec389c56922 100644 (file)
--- a/Bugzilla/Install/DB.pm
+++ b/Bugzilla/Install/DB.pm
@@ -2964,10 +2964,9 @@ sub _initialize_workflow_for_upgrade {
     }
 
     # We only populate the workflow here if we're upgrading from a version
-    # before 4.0 (which is where init_workflow was added).
-    my $new_exists = $dbh->selectrow_array(
-         'SELECT 1 FROM bug_status WHERE value = ?', undef, 'NEW');
-    return if !$new_exists;
+    # before 4.0 (which is where init_workflow was added). This was the
+    # first schema change done for 4.0, so we check this.
+    return if $dbh->bz_column_info('bugs_activity', 'comment_id');
 
     # Populate the status_workflow table. We do nothing if the table already
     # has entries. If all bug status transitions have been deleted, the