projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
cd22a86
)
fix unnecessary warnings on upgrade of remote Pg RADIUS db, RT#9178
author
ivan
<ivan>
Wed, 28 Jul 2010 02:54:46 +0000
(
02:54
+0000)
committer
ivan
<ivan>
Wed, 28 Jul 2010 02:54:46 +0000
(
02:54
+0000)
FS/FS/Upgrade.pm
patch
|
blob
|
history
diff --git
a/FS/FS/Upgrade.pm
b/FS/FS/Upgrade.pm
index
b5c8ff1
..
72761b4
100644
(file)
--- a/
FS/FS/Upgrade.pm
+++ b/
FS/FS/Upgrade.pm
@@
-170,7
+170,8
@@
sub upgrade_sqlradius {
my $str2time = str2time_sql( $dbh->{Driver}->{Name} );
my $group = "UserName";
$group .= ",Realm"
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"
my $sth_alter = $dbh->prepare(
"ALTER TABLE radacct ADD COLUMN FreesideStatus varchar(32) NULL"
@@
-183,7
+184,10
@@
sub upgrade_sqlradius {
$sth_update->execute or die $errmsg.$sth_update->errstr;
} else {
my $error = $sth_alter->errstr;
$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;
}
} else {
my $error = $dbh->errstr;
@@
-197,8
+201,8
@@
sub upgrade_sqlradius {
unless ( $sth_index->execute ) {
my $error = $sth_index->errstr;
warn $errmsg.$error
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;
}
} else {
my $error = $dbh->errstr;