summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--FS/FS/Upgrade.pm9
1 files changed, 6 insertions, 3 deletions
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;