X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2FUpgrade.pm;h=576676f76ed480e2337c9a0a8ff14ee3c212a7da;hp=452c5a300cbe1efed27301cbc3a7330028974317;hb=20f38e4c256094bd938b732950e8f93319f851a5;hpb=b333223b0223e560a877e1d5f4c433b5ef6da54f

diff --git a/FS/FS/Upgrade.pm b/FS/FS/Upgrade.pm
index 452c5a300..576676f76 100644
--- a/FS/FS/Upgrade.pm
+++ b/FS/FS/Upgrade.pm
@@ -40,10 +40,6 @@ database upgrades.
 sub upgrade {
   my %opt = @_;
 
-  my $oldAutoCommit = $FS::UID::AutoCommit;
-  local $FS::UID::AutoCommit = 0;
-  $FS::UID::AutoCommit = 0;
-
   my $data = upgrade_data(%opt);
 
   foreach my $table ( keys %$data ) {
@@ -54,7 +50,22 @@ sub upgrade {
 
     if ( $class->can('_upgrade_data') ) {
       warn "Upgrading $table...\n";
+
+      my $start = time;
+
+      my $oldAutoCommit = $FS::UID::AutoCommit;
+      local $FS::UID::AutoCommit = 0;
+      $FS::UID::AutoCommit = 0;
+
       $class->_upgrade_data(%opt);
+
+      if ( $oldAutoCommit ) {
+        dbh->commit or die dbh->errstr;
+      }
+      
+      #warn "\e[1K\rUpgrading $table... done in ". (time-$start). " seconds\n";
+      warn "  done in ". (time-$start). " seconds\n";
+
     } else {
       warn "WARNING: asked for upgrade of $table,".
            " but FS::$table has no _upgrade_data method\n";
@@ -72,10 +83,6 @@ sub upgrade {
 
   }
 
-  if ( $oldAutoCommit ) {
-    dbh->commit or die dbh->errstr;
-  }
-
 }
 
 
@@ -84,12 +91,14 @@ sub upgrade_data {
 
   tie my %hash, 'Tie::IxHash', 
 
+    #cust_main (remove paycvv from history)
+    'cust_main' => [],
+
     #msgcat
     'msgcat' => [],
 
     #reason type and reasons
     'reason_type'     => [],
-    'reason'          => [],
     'cust_pkg_reason' => [],
 
     #need part_pkg before cust_credit...
@@ -116,9 +125,34 @@ sub upgrade_data {
     #usage_classes if we have none
     'usage_class' => [],
 
+    #phone_type if we have none
+    'phone_type' => [],
+
     #fixup access rights
     'access_right' => [],
 
+    #change recur_flat and enable_prorate
+    'part_pkg_option' => [],
+
+    #add weights to pkg_category
+    'pkg_category' => [],
+
+    #cdrbatch fixes
+    'cdr' => [],
+
+    #otaker->usernum
+    'cust_attachment' => [],
+    #'cust_credit' => [],
+    #'cust_main' => [],
+    'cust_main_note' => [],
+    #'cust_pay' => [],
+    'cust_pay_void' => [],
+    'cust_pkg' => [],
+    #'cust_pkg_reason' => [],
+    'cust_pkg_discount' => [],
+    'cust_refund' => [],
+    'banned_pay' => [],
+
   ;
 
   \%hash;