X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FUpgrade.pm;h=b7a1c661a8b2395af4b6c38277342ae068bc71f6;hb=96bcb3256650a35d57c2ac487e990b78a2f88a74;hp=aa77ce5ed71b6e8358a726fc4602e16eca1bb4b6;hpb=e1198f135f43ab607544790af6ad64320d1759cf;p=freeside.git

diff --git a/FS/FS/Upgrade.pm b/FS/FS/Upgrade.pm
index aa77ce5ed..b7a1c661a 100644
--- 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;
@@ -186,7 +189,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"
@@ -199,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;
@@ -213,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;