From: ivan <ivan>
Date: Wed, 28 Jul 2010 02:54:45 +0000 (+0000)
Subject: fix unnecessary warnings on upgrade of remote Pg RADIUS db, RT#9178
X-Git-Tag: root_of_svc_elec_features~11
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=2c4dd73f9bdcb53491be781bdc0da6e53f78ba49

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

diff --git a/FS/FS/Upgrade.pm b/FS/FS/Upgrade.pm
index 34fc3248c..ce8932262 100644
--- a/FS/FS/Upgrade.pm
+++ b/FS/FS/Upgrade.pm
@@ -200,7 +200,10 @@ sub upgrade_sqlradius {
         $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;
@@ -214,8 +217,8 @@ sub upgrade_sqlradius {
       unless ( $sth_index->execute ) {
         my $error = $sth_index->errstr;
         warn $errmsg.$error
-          unless $error =~ /Duplicate key name/i                        #mysql
-              || $error =~ /relation "freesidestatus" already exists/i; #Pg
+          unless $error =~ /Duplicate key name/i #mysql
+              || $error =~ /already exists/i;    #Pg
       }
     } else {
       my $error = $dbh->errstr;