error message in decline templates, RT#9507

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

diff --git a/FS/FS/Upgrade.pm b/FS/FS/Upgrade.pm
index 34fc324..b7a1c66 100644 (file)
--- a/FS/FS/Upgrade.pm
+++ b/FS/FS/Upgrade.pm
@@ -157,6 +157,9 @@ sub upgrade_data {
     #default namespace
     'payment_gateway' => [],
 
+    #migrate to templates
+    'msg_template' => [],
+
   ;
 
   \%hash;
@@ -200,7 +203,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 +220,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;