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 );
$FS::svc_domain::whois_hack = 1;
@ISA = qw( Exporter );
-@EXPORT_OK = qw( upgrade upgrade_sqlradius );
+@EXPORT_OK = qw( upgrade_schema upgrade_config upgrade upgrade_sqlradius );
+
+$DEBUG = 1;
=head1 NAME
=over 4
-=item
+=item upgrade_config
+
+=cut
+
+#config upgrades
+sub upgrade_config {
+ my %opt = @_;
+
+ my $conf = new FS::Conf;
+
+ $conf->touch('payment_receipt')
+ if $conf->exists('payment_receipt_email')
+ || $conf->config('payment_receipt_msgnum');
+
+}
+
+=item upgrade
=cut
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 ) {
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";
}
- if ( $oldAutoCommit ) {
- dbh->commit or die dbh->errstr;
- }
-
}
+=item upgrade_data
+
+=cut
sub upgrade_data {
my %opt = @_;
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...
#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' => [],
+
+ #default namespace
+ 'payment_gateway' => [],
+
+ #migrate to templates
+ 'msg_template' => [],
+
+ #return unprovisioned numbers to availability
+ 'phone_avail' => [],
+
+ #insert scripcondition
+ 'TicketSystem' => [],
+
+ ;
+
+ \%hash;
+
+}
+
+=item upgrade_schema
+
+=cut
+
+sub upgrade_schema {
+ my %opt = @_;
+
+ my $data = upgrade_schema_data(%opt);
+
+ my $oldAutoCommit = $FS::UID::AutoCommit;
+ local $FS::UID::AutoCommit = 0;
+ local $FS::UID::AutoCommit = 0;
+
+ foreach my $table ( keys %$data ) {
+
+ my $class = "FS::$table";
+ eval "use $class;";
+ die $@ if $@;
+
+ if ( $class->can('_upgrade_schema') ) {
+ warn "Upgrading $table schema...\n";
+
+ my $start = time;
+
+ $class->_upgrade_schema(%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 schema upgrade of $table,".
+ " but FS::$table has no _upgrade_schema method\n";
+ }
+
+ }
+
+}
+
+=item upgrade_schema_data
+
+=cut
+
+sub upgrade_schema_data {
+ my %opt = @_;
+
+ tie my %hash, 'Tie::IxHash',
+
+ #fix classnum character(1)
+ 'cust_bill_pkg_detail' => [],
+
;
\%hash;
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"
$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;
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;
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);
projects / freeside.git / blobdiff