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 );
@ISA = qw( Exporter );
@EXPORT_OK = qw( upgrade upgrade_sqlradius );
+$DEBUG = 1;
+
=head1 NAME
FS::Upgrade - Database upgrade routines
die $@ if $@;
if ( $class->can('_upgrade_data') ) {
+ warn "Upgrading $table...\n";
$class->_upgrade_data(%opt);
} else {
warn "WARNING: asked for upgrade of $table,".
tie my %hash, 'Tie::IxHash',
+ #msgcat
+ 'msgcat' => [],
+
#reason type and reasons
'reason_type' => [],
'reason' => [],
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);