X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2FUpgrade.pm;h=8cc5c61b879985e5a89fe65a0480e60ae70d58e7;hp=dec4d483d9daa6d7363742a41f03f8a3941e6c5d;hb=03ceab71dad1e5eb366865d304e5e459cc905ce4;hpb=12587c5314c2a2ee40ab046af1552a40db5e0eaf diff --git a/FS/FS/Upgrade.pm b/FS/FS/Upgrade.pm index dec4d483d..8cc5c61b8 100644 --- a/FS/FS/Upgrade.pm +++ b/FS/FS/Upgrade.pm @@ -1,12 +1,12 @@ 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 ); use FS::Conf; -use FS::Record; +use FS::Record qw(qsearchs str2time_sql); use FS::svc_domain; $FS::svc_domain::whois_hack = 1; @@ -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,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 ) { @@ -51,7 +49,23 @@ sub upgrade { die $@ if $@; 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"; @@ -69,10 +83,6 @@ sub upgrade { } - if ( $oldAutoCommit ) { - dbh->commit or die dbh->errstr; - } - } @@ -81,9 +91,16 @@ 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' => [], + 'reason_type' => [], + 'reason' => [], + 'cust_pkg_reason' => [], #need part_pkg before cust_credit... 'part_pkg' => [], @@ -100,6 +117,33 @@ sub upgrade_data { #populate part_pkg_taxclass for starters 'part_pkg_taxclass' => [], + #remove bad pending records + 'cust_pay_pending' => [], + + #replace invnum and pkgnum with billpkgnum + 'cust_bill_pkg_detail' => [], + + #usage_classes if we have none + 'usage_class' => [], + + #phone_type if we have none + 'phone_type' => [], + + #fixup access rights + 'access_right' => [], + + #change tax_rate column types + 'tax_rate' => [], + + #change recur_flat and enable_prorate + 'part_pkg_option' => [], + + #add weights to pkg_category + 'pkg_category' => [], + + #cdrbatch fixes + 'cdr' => [], + ; \%hash; @@ -114,9 +158,18 @@ sub upgrade_sqlradius { my @part_export = FS::part_export::sqlradius->all_sqlradius_withaccounting(); foreach my $part_export ( @part_export ) { - my $dbh = DBI->connect( map $part_export->option($_), - qw ( datasrc username password ) ); - + + my $errmsg = 'Error adding FreesideStatus to '. + $part_export->option('datasrc'). ': '; + + my $dbh = DBI->connect( + ( map $part_export->option($_), qw ( datasrc username password ) ), + { PrintError => 0, PrintWarn => 0 } + ) or do { + warn $errmsg.$DBI::errstr; + next; + }; + my $str2time = str2time_sql( $dbh->{Driver}->{Name} ); my $group = "UserName"; $group .= ",Realm" @@ -125,11 +178,32 @@ sub upgrade_sqlradius { my $sth_alter = $dbh->prepare( "ALTER TABLE radacct ADD COLUMN FreesideStatus varchar(32) NULL" ); - if ( $sth_alter && $sth_alter->execute ) { - my $sth_update = $dbh->prepare( - "UPDATE radacct SET FreesideStatus = 'done' WHERE FreesideStatus IS NULL" - ) or die $dbh->errstr; - $sth_update->execute or die $sth_update->errstr; + if ( $sth_alter ) { + if ( $sth_alter->execute ) { + my $sth_update = $dbh->prepare( + "UPDATE radacct SET FreesideStatus = 'done' WHERE FreesideStatus IS NULL" + ) or die $errmsg.$dbh->errstr; + $sth_update->execute or die $errmsg.$sth_update->errstr; + } else { + my $error = $sth_alter->errstr; + warn $errmsg.$error unless $error =~ /Duplicate column name/i; + } + } else { + my $error = $dbh->errstr; + warn $errmsg.$error; #unless $error =~ /exists/i; + } + + my $sth_index = $dbh->prepare( + "CREATE INDEX FreesideStatus ON radacct ( FreesideStatus )" + ); + if ( $sth_index ) { + unless ( $sth_index->execute ) { + my $error = $sth_index->errstr; + warn $errmsg.$error unless $error =~ /Duplicate key name/i; + } + } else { + my $error = $dbh->errstr; + warn $errmsg.$error; #unless $error =~ /exists/i; } my $sth = $dbh->prepare("SELECT UserName, @@ -142,24 +216,32 @@ sub upgrade_sqlradius { AND AcctStopTime != 0 GROUP BY $group ") - or die $dbh->errstr; - $sth->execute() or die $sth->errstr; + or die $errmsg.$dbh->errstr; + $sth->execute() or die $errmsg.$sth->errstr; while (my $row = $sth->fetchrow_arrayref ) { 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);