This commit was manufactured by cvs2svn to create tag 'freeside_2_1_1'.

[freeside.git] / FS / FS / Cron / bill.pm

diff --git a/FS/FS/Cron/bill.pm b/FS/FS/Cron/bill.pm
index 7388733..5de2ee3 100644 (file)
--- 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 driver_name );
+use FS::UID qw(dbh);
 use FS::Record qw( qsearch qsearchs );
 use FS::queue;
 use FS::cust_main;
@@ -56,20 +56,14 @@ sub bill {
 
   my $cursor_dbh = dbh->clone;
 
-  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;
-  }
+  $cursor_dbh->do(
+    "DECLARE cron_bill_cursor CURSOR FOR ".
+    "  SELECT custnum FROM cust_main WHERE ". bill_where( %opt )
+  ) or die $cursor_dbh->errstr;
 
   while ( 1 ) {
 
-    my $sql = (driver_name =~ /^mysql/)
-      ? $select
-      : 'FETCH 100 FROM cron_bill_cursor';
-
-    my $sth = $cursor_dbh->prepare($sql);
+    my $sth = $cursor_dbh->prepare('FETCH 100 FROM cron_bill_cursor'); #mysql?
 
     $sth->execute or die $sth->errstr;
 
@@ -126,8 +120,6 @@ sub bill {
 
     }
 
-    last if driver_name =~ /^mysql/;
-
   }
 
   $cursor_dbh->commit or die $cursor_dbh->errstr;