my $data = upgrade_data(%opt);
+ my $oldAutoCommit = $FS::UID::AutoCommit;
+ local $FS::UID::AutoCommit = 0;
+ local $FS::UID::AutoCommit = 0;
+
foreach my $table ( keys %$data ) {
my $class = "FS::$table";
my $start = time;
- my $oldAutoCommit = $FS::UID::AutoCommit;
- local $FS::UID::AutoCommit = 0;
- $FS::UID::AutoCommit = 0;
-
$class->_upgrade_data(%opt);
if ( $oldAutoCommit ) {
+ warn " committing\n";
dbh->commit or die dbh->errstr;
}
#cdrbatch fixes
'cdr' => [],
+ #otaker->usernum
+ 'cust_attachment' => [],
+ #'cust_credit' => [],
+ #'cust_main' => [],
+ 'cust_main_note' => [],
+ #'cust_pay' => [],
+ 'cust_pay_void' => [],
+ 'cust_pkg' => [],
+ #'cust_pkg_reason' => [],
+ 'cust_pkg_discount' => [],
+ 'cust_refund' => [],
+ 'banned_pay' => [],
+
+ #default namespace
+ 'payment_gateway' => [],
+
+ #migrate to templates
+ 'msg_template' => [],
+
;
\%hash;
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"
$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;
if ( $sth_index ) {
unless ( $sth_index->execute ) {
my $error = $sth_index->errstr;
- warn $errmsg.$error unless $error =~ /Duplicate key name/i;
+ warn $errmsg.$error
+ unless $error =~ /Duplicate key name/i #mysql
+ || $error =~ /already exists/i; #Pg
}
} else {
my $error = $dbh->errstr;
- warn $errmsg.$error; #unless $error =~ /exists/i;
+ warn $errmsg.$error. ' (preparing statement)';#unless $error =~ /exists/i;
}
+ my $times = ($dbh->{Driver}->{Name} =~ /^mysql/)
+ ? ' AcctStartTime != 0 AND AcctStopTime != 0 '
+ : ' AcctStartTime IS NOT NULL AND AcctStopTime IS NOT NULL ';
+
my $sth = $dbh->prepare("SELECT UserName,
Realm,
$str2time max(AcctStartTime)),
$str2time max(AcctStopTime))
FROM radacct
WHERE FreesideStatus = 'done'
- AND AcctStartTime != 0
- AND AcctStopTime != 0
+ AND $times
GROUP BY $group
")
or die $errmsg.$dbh->errstr;