Refactor upgrade scripts to better delete files and workflow activities.

perlDreamer · perlDreamer · commit 0da6ffab1548 · 2012-01-03T12:42:00.000-08:00
diff --git a/share/upgrades/7.10.23-8.0.0/removeAdminBar.pl b/share/upgrades/7.10.23-8.0.0/removeAdminBar.pl
@@ -42,7 +42,6 @@
 
 start_step "Removing Admin Bar module";
 
-my $webgui_root = realpath( File::Spec->catdir( WebGUI::Paths->configBase, (File::Spec->updir) x 1) );
-unlink File::Spec->catfile($webgui_root, 'lib', 'WebGUI', 'Macro', 'AdminBar.pm');
+rm_lib('WebGUI::Macro::AdminBar');
 
 done;
diff --git a/share/upgrades/7.10.23-8.0.0/removeFilePile.pl b/share/upgrades/7.10.23-8.0.0/removeFilePile.pl
@@ -11,7 +11,6 @@
 
 start_step "Removing FilePile asset module";
 
-my $webgui_root = realpath( File::Spec->catdir( WebGUI::Paths->configBase, (File::Spec->updir) x 1 ) );
-unlink File::Spec->catfile($webgui_root, 'lib', 'WebGUI', 'Asset', 'FilePile.pm');
+rm_lib('WebGUI::Asset::FilePile');
 
 done;
diff --git a/share/upgrades/7.10.23-8.0.0/removeWebGUIStatistics.pl b/share/upgrades/7.10.23-8.0.0/removeWebGUIStatistics.pl
@@ -7,12 +7,17 @@
 
 config->deleteFromHash( 'adminConsole', 'statistics' );
 
+report "Deleting Workflow Activities";
+my $activity = dbh->write(q|delete from WorkflowActivity where className='WebGUI::Workflow::Activity::SendWebguiStats'|);
+
+report "Deleting Workflow and Cron";
 my $workflow = WebGUI::Workflow->new(session, 'send_webgui_statistics');
 $workflow->delete;
 ##This may not be in there if it is not enabled.
 my $task = WebGUI::Workflow::Cron->new(session, 'send_webgui_statistics');
 $task && $task->delete;
 
+report "Deleting files";
 my $webgui_root = realpath( File::Spec->catdir( WebGUI::Paths->configBase, (File::Spec->updir) x 1 ) );
 unlink File::Spec->catfile($webgui_root, 'lib', 'WebGUI', 'Operation', 'Statistics.pm');
 unlink File::Spec->catfile($webgui_root, 'lib', 'WebGUI', 'Workflow', 'Activity', 'SendWebguiStats.pm');
