diff options
author | ivan <ivan> | 2010-10-19 00:32:10 +0000 |
---|---|---|
committer | ivan <ivan> | 2010-10-19 00:32:10 +0000 |
commit | 633510de5405b966d160ab95ad396bc601764603 (patch) | |
tree | c6d8e1b7d99e71f0582ee20b1257249a752e9eab /FS/FS | |
parent | 15b5b2eb77ed560bbbd876aca94c92855b79ca88 (diff) |
fix daily billing under mysql, RT#10246
Diffstat (limited to 'FS/FS')
-rw-r--r-- | FS/FS/Cron/bill.pm | 20 | ||||
-rw-r--r-- | FS/FS/Cron/notify.pm | 4 |
2 files changed, 16 insertions, 8 deletions
diff --git a/FS/FS/Cron/bill.pm b/FS/FS/Cron/bill.pm index 5de2ee3..7388733 100644 --- a/FS/FS/Cron/bill.pm +++ b/FS/FS/Cron/bill.pm @@ -5,7 +5,7 @@ use vars qw( @ISA @EXPORT_OK ); use Exporter; use Date::Parse; use DBI 1.33; #The "clone" method was added in DBI 1.33. -use FS::UID qw(dbh); +use FS::UID qw( dbh driver_name ); use FS::Record qw( qsearch qsearchs ); use FS::queue; use FS::cust_main; @@ -56,14 +56,20 @@ sub bill { my $cursor_dbh = dbh->clone; - $cursor_dbh->do( - "DECLARE cron_bill_cursor CURSOR FOR ". - " SELECT custnum FROM cust_main WHERE ". bill_where( %opt ) - ) or die $cursor_dbh->errstr; + my $select = 'SELECT custnum FROM cust_main WHERE '. bill_where( %opt ); + + unless ( driver_name =~ /^mysql/ ) { + $cursor_dbh->do( "DECLARE cron_bill_cursor CURSOR FOR $select" ) + or die $cursor_dbh->errstr; + } while ( 1 ) { - my $sth = $cursor_dbh->prepare('FETCH 100 FROM cron_bill_cursor'); #mysql? + my $sql = (driver_name =~ /^mysql/) + ? $select + : 'FETCH 100 FROM cron_bill_cursor'; + + my $sth = $cursor_dbh->prepare($sql); $sth->execute or die $sth->errstr; @@ -120,6 +126,8 @@ sub bill { } + last if driver_name =~ /^mysql/; + } $cursor_dbh->commit or die $cursor_dbh->errstr; diff --git a/FS/FS/Cron/notify.pm b/FS/FS/Cron/notify.pm index dcc7b30..3d427b2 100644 --- a/FS/FS/Cron/notify.pm +++ b/FS/FS/Cron/notify.pm @@ -37,7 +37,7 @@ sub notify_flat_delay { and 0 < ( select count(*) from part_pkg_option where part_pkg.pkgpart = part_pkg_option.pkgpart and part_pkg_option.optionname = 'recur_notify' - and CAST( part_pkg_option.optionvalue AS INTEGER ) > 0 + and CAST( part_pkg_option.optionvalue AS $integer ) > 0 and 0 <= ( $time + CAST( part_pkg_option.optionvalue AS $integer ) * 86400 @@ -64,7 +64,7 @@ END 0 = ( select count(*) from cust_pkg_option where cust_pkg.pkgnum = cust_pkg_option.pkgnum and cust_pkg_option.optionname = 'impending_recur_notification_sent' - and CAST( cust_pkg_option.optionvalue AS INTEGER ) = 1 + and CAST( cust_pkg_option.optionvalue AS $integer ) = 1 ) END |