From 3b56392a6f99577c69c5636f52be7c51ddbbec73 Mon Sep 17 00:00:00 2001 From: Kenza Zaki Date: Mon, 5 Aug 2013 11:50:40 +0200 Subject: [PATCH] Bug 10682: remove inappropriate uses of finish() from C4::Reserves This patch gets rid of finish. From the man page finish() Indicate that no more data will be fetched from this statement handle before it is either executed again or destroyed. You almost certainly do not need to call this method. Adding calls to "finish" after loop that fetches all rows is a common mistake, don't do it, it can mask genuine problems like uncaught fetch errors. Signed-off-by: Bernardo Gonzalez Kriegel Comment: Similar to other patches from the same author I run prove t/db_dependent/Reserves.t without errors don't know if more tests are needed. No koha-qa errors Signed-off-by: Chris Cormack Signed-off-by: Galen Charlton --- C4/Reserves.pm | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/C4/Reserves.pm b/C4/Reserves.pm index bba4933922..8fe78db093 100644 --- a/C4/Reserves.pm +++ b/C4/Reserves.pm @@ -625,7 +625,6 @@ sub GetReserveFee { my $sth = $dbh->prepare($query); $sth->execute($borrowernumber); my $data = $sth->fetchrow_hashref; - $sth->finish(); my $fee = $data->{'reservefee'}; my $cntitems = @- > $bibitems; @@ -666,7 +665,6 @@ sub GetReserveFee { } } } - $sth1->finish; my $cntitemsfound = @biblioitems; my $issues = 0; my $x = 0; @@ -1011,7 +1009,6 @@ sub CancelReserve { "; my $sth = $dbh->prepare($query); $sth->execute( $reserve_id ); - $sth->finish; $query = " INSERT INTO old_reserves @@ -1094,7 +1091,6 @@ sub ModReserve { "; my $sth = $dbh->prepare($query); $sth->execute( $reserve_id ); - $sth->finish; $query = " INSERT INTO old_reserves SELECT * @@ -1118,7 +1114,6 @@ sub ModReserve { "; my $sth = $dbh->prepare($query); $sth->execute( $rank, $branchcode, $itemnumber, $reserve_id ); - $sth->finish; if ( defined( $suspend_until ) ) { if ( $suspend_until ) { @@ -1164,7 +1159,6 @@ sub ModReserveFill { my $sth = $dbh->prepare($query); $sth->execute( $biblionumber, $borrowernumber, $resdate ); ($priority) = $sth->fetchrow_array; - $sth->finish; # update the database... $query = "UPDATE reserves @@ -1176,7 +1170,6 @@ sub ModReserveFill { "; $sth = $dbh->prepare($query); $sth->execute( $biblionumber, $resdate, $borrowernumber ); - $sth->finish; # move to old_reserves $query = "INSERT INTO old_reserves @@ -1518,7 +1511,6 @@ sub ToggleLowestPriority { my $sth = $dbh->prepare( "UPDATE reserves SET lowestPriority = NOT lowestPriority WHERE reserve_id = ?"); $sth->execute( $reserve_id ); - $sth->finish; _FixPriority( $reserve_id, '999999' ); } @@ -1553,7 +1545,6 @@ sub ToggleSuspend { push( @params, $reserve_id ); $sth->execute( @params ); - $sth->finish; } =head2 SuspendAll @@ -1609,7 +1600,6 @@ sub SuspendAll { $dbh = C4::Context->dbh; $sth = $dbh->prepare( $query ); $sth->execute( @query_params ); - $sth->finish; } @@ -1693,7 +1683,6 @@ sub _FixPriority { $j + 1, $priority[$j]->{'reserve_id'} ); - $sth->finish; } $sth = $dbh->prepare( "SELECT reserve_id FROM reserves WHERE lowestPriority = 1 ORDER BY priority" ); -- 2.11.4.GIT