X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=FS%2FFS%2FUpgrade.pm;h=9618d5ca44d4d922c35fa26d1e748ff8ae3e1ef5;hb=455ec0f5eb1ea11cc81ca08f15ed8cbe37cd6aa5;hp=facd6d289271fe22a8087f19d1023e223f388dd8;hpb=1ce2d49c8b5af031066e8dbf4837cf220eb03269;p=freeside.git

diff --git a/FS/FS/Upgrade.pm b/FS/FS/Upgrade.pm
index facd6d289..9618d5ca4 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
@@ -51,6 +53,7 @@ sub upgrade {
     die $@ if $@;
 
     if ( $class->can('_upgrade_data') ) {
+      warn "Upgrading $table...\n";
       $class->_upgrade_data(%opt);
     } else {
       warn "WARNING: asked for upgrade of $table,".
@@ -110,6 +113,9 @@ sub upgrade_data {
     #usage_classes if we have none
     'usage_class' => [],
 
+    #fixup access rights
+    'access_right' => [],
+
   ;
 
   \%hash;
@@ -189,17 +195,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);