X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FUpgrade.pm;h=72761b49e4f9804d243f1bb6c6ac4d445bbf3596;hb=58c9445c8c514996203fef3486f2a9a864087155;hp=9af84a177546dc7f7db699470bfca816af6c4d87;hpb=bd7f30df84e16933ff1ef61de6afc1cf156a16b9;p=freeside.git

diff --git a/FS/FS/Upgrade.pm b/FS/FS/Upgrade.pm
index 9af84a177..72761b49e 100644
--- a/FS/FS/Upgrade.pm
+++ b/FS/FS/Upgrade.pm
@@ -1,7 +1,7 @@
 package FS::Upgrade;
 
 use strict;
-use vars qw( @ISA @EXPORT_OK );
+use vars qw( @ISA @EXPORT_OK $DEBUG );
 use Exporter;
 use Tie::IxHash;
 use FS::UID qw( dbh driver_name );
@@ -14,6 +14,8 @@ $FS::svc_domain::whois_hack = 1;
 @ISA = qw( Exporter );
 @EXPORT_OK = qw( upgrade upgrade_sqlradius );
 
+$DEBUG = 1;
+
 =head1 NAME
 
 FS::Upgrade - Database upgrade routines
@@ -38,11 +40,11 @@ database upgrades.
 sub upgrade {
   my %opt = @_;
 
+  my $data = upgrade_data(%opt);
+
   my $oldAutoCommit = $FS::UID::AutoCommit;
   local $FS::UID::AutoCommit = 0;
-  $FS::UID::AutoCommit = 0;
-
-  my $data = upgrade_data(%opt);
+  local $FS::UID::AutoCommit = 0;
 
   foreach my $table ( keys %$data ) {
 
@@ -51,7 +53,20 @@ sub upgrade {
     die $@ if $@;
 
     if ( $class->can('_upgrade_data') ) {
+      warn "Upgrading $table...\n";
+
+      my $start = time;
+
       $class->_upgrade_data(%opt);
+
+      if ( $oldAutoCommit ) {
+        warn "  committing\n";
+        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";
@@ -69,10 +84,6 @@ sub upgrade {
 
   }
 
-  if ( $oldAutoCommit ) {
-    dbh->commit or die dbh->errstr;
-  }
-
 }
 
 
@@ -81,9 +92,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...
@@ -113,6 +129,18 @@ sub upgrade_data {
     #fixup access rights
     'access_right' => [],
 
+    #change recur_flat and enable_prorate
+    'part_pkg_option' => [],
+
+    #add weights to pkg_category
+    'pkg_category' => [],
+
+    #cdrbatch fixes
+    'cdr' => [],
+
+    #default namespace
+    'payment_gateway' => [],
+
   ;
 
   \%hash;
@@ -142,7 +170,8 @@ sub upgrade_sqlradius {
     my $str2time = str2time_sql( $dbh->{Driver}->{Name} );
     my $group = "UserName";
     $group .= ",Realm"
-      if ( ref($part_export) =~ /withdomain/ );
+      if ref($part_export) =~ /withdomain/
+      || $dbh->{Driver}->{Name} =~ /^Pg/; #hmm
 
     my $sth_alter = $dbh->prepare(
       "ALTER TABLE radacct ADD COLUMN FreesideStatus varchar(32) NULL"
@@ -155,7 +184,10 @@ sub upgrade_sqlradius {
         $sth_update->execute or die $errmsg.$sth_update->errstr;
       } else {
         my $error = $sth_alter->errstr;
-        warn $errmsg.$error unless $error =~ /Duplicate column name/i;
+        warn $errmsg.$error
+          unless $error =~ /Duplicate column name/i  #mysql
+              || $error =~ /already exists/i;        #Pg
+;
       }
     } else {
       my $error = $dbh->errstr;
@@ -168,21 +200,26 @@ sub upgrade_sqlradius {
     if ( $sth_index ) {
       unless ( $sth_index->execute ) {
         my $error = $sth_index->errstr;
-        warn $errmsg.$error unless $error =~ /Duplicate key name/i;
+        warn $errmsg.$error
+          unless $error =~ /Duplicate key name/i #mysql
+              || $error =~ /already exists/i;    #Pg
       }
     } else {
       my $error = $dbh->errstr;
-      warn $errmsg.$error; #unless $error =~ /exists/i;
+      warn $errmsg.$error. ' (preparing statement)';#unless $error =~ /exists/i;
     }
 
+    my $times = ($dbh->{Driver}->{Name} =~ /^mysql/)
+      ? ' AcctStartTime != 0 AND AcctStopTime != 0 '
+      : ' AcctStartTime IS NOT NULL AND AcctStopTime IS NOT NULL ';
+
     my $sth = $dbh->prepare("SELECT UserName,
                                     Realm,
                                     $str2time max(AcctStartTime)),
                                     $str2time max(AcctStopTime))
                               FROM radacct
                               WHERE FreesideStatus = 'done'
-                                AND AcctStartTime != 0
-                                AND AcctStopTime  != 0
+                                AND $times
                               GROUP BY $group
                             ")
       or die $errmsg.$dbh->errstr;
@@ -192,17 +229,25 @@ sub upgrade_sqlradius {
       my ($username, $realm, $start, $stop) = @$row;
   
       $username = lc($username) unless $conf->exists('username-uppercase');
-      my $extra_sql = '';
+
+      my $exportnum = $part_export->exportnum;
+      my $extra_sql = " AND exportnum = $exportnum ".
+                      " AND exportsvcnum IS NOT NULL ";
+
       if ( ref($part_export) =~ /withdomain/ ) {
-        $extra_sql = " And '$realm' = ( SELECT domain FROM svc_domain
+        $extra_sql = " AND '$realm' = ( SELECT domain FROM svc_domain
                          WHERE svc_domain.svcnum = svc_acct.domsvc ) ";
       }
   
-      my $svc_acct = qsearchs( 'svc_acct',
-                               { 'username' => $username },
-                               '',
-                               $extra_sql,
-                             );
+      my $svc_acct = qsearchs({
+        'select'    => 'svc_acct.*',
+        'table'     => 'svc_acct',
+        'addl_from' => 'LEFT JOIN cust_svc   USING ( svcnum )'.
+                       'LEFT JOIN export_svc USING ( svcpart )',
+        'hashref'   => { 'username' => $username },
+        'extra_sql' => $extra_sql,
+      });
+
       if ($svc_acct) {
         $svc_acct->last_login($start)
           if $start && (!$svc_acct->last_login || $start > $svc_acct->last_login);