fix unnecessary warnings on upgrade of remote Pg RADIUS db, RT#9178

[freeside.git] / FS / FS / Upgrade.pm

diff --git a/FS/FS/Upgrade.pm b/FS/FS/Upgrade.pm
index a11945f..34fc324 100644 (file)
--- a/FS/FS/Upgrade.pm
+++ b/FS/FS/Upgrade.pm
@@ -186,7 +186,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"
@@ -212,21 +213,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 =~ /relation "freesidestatus" 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;