From 5ff99f63e32212071cc1e71749f93e943f005005 Mon Sep 17 00:00:00 2001 From: Kenza Zaki Date: Tue, 23 Jul 2013 15:27:23 +0200 Subject: [PATCH] Bug 10629: remove inappropriate uses of $sth->finish() in C4::Branch Test plan : Check if the regression tests still works prove t/db_dependent/Branch.t t/db_dependent/Branch.t .. 1/36 Using a hash as a reference is deprecated at t/db_dependent/Branch.t line 207. t/db_dependent/Branch.t .. ok All tests successful. Files=1, Tests=36, 0 wallclock secs ( 0.03 usr 0.01 sys + 0.12 cusr 0.00 csys = 0.16 CPU) Result: PASS Signed-off-by: Chris Cormack From the man page finsh() 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: Kyle M Hall Signed-off-by: Galen Charlton (cherry picked from commit 4287fd9d1c3ae16a0496b6261de44642bc92ab9c) Signed-off-by: Tomas Cohen Arazi --- C4/Branch.pm | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/C4/Branch.pm b/C4/Branch.pm index d52e0e8157..b4c0678bee 100644 --- a/C4/Branch.pm +++ b/C4/Branch.pm @@ -186,7 +186,6 @@ sub GetBranchName { $sth = $dbh->prepare("Select branchname from branches where branchcode=?"); $sth->execute($branchcode); my $branchname = $sth->fetchrow_array; - $sth->finish; return ($branchname); } @@ -282,7 +281,6 @@ sub ModBranch { "insert into branchrelations (branchcode, categorycode) values(?, ?)" ); $sth->execute( $branchcode, $cat ); - $sth->finish; } foreach my $cat (@removecats) { my $sth = @@ -290,7 +288,6 @@ sub ModBranch { "delete from branchrelations where branchcode=? and categorycode=?" ); $sth->execute( $branchcode, $cat ); - $sth->finish; } } @@ -426,7 +423,6 @@ sub GetBranchesInCategory { while (my $branch = $sth->fetchrow) { push @branches, $branch; } - $sth->finish(); return( \@branches ); } @@ -471,11 +467,9 @@ sub GetBranchInfo { while ( my ($cat) = $nsth->fetchrow_array ) { push( @cats, $cat ); } - $nsth->finish; $data->{'categories'} = \@cats; push( @results, $data ); } - $sth->finish; return \@results; } @@ -490,7 +484,6 @@ sub DelBranch { my $dbh = C4::Context->dbh; my $sth = $dbh->prepare("delete from branches where branchcode = ?"); $sth->execute($branchcode); - $sth->finish; } =head2 ModBranchCategoryInfo @@ -507,13 +500,11 @@ sub ModBranchCategoryInfo { # we are doing an insert my $sth = $dbh->prepare("INSERT INTO branchcategories (categorycode,categoryname,codedescription,categorytype,show_in_pulldown) VALUES (?,?,?,?,?)"); $sth->execute(uc( $data->{'categorycode'} ),$data->{'categoryname'}, $data->{'codedescription'},$data->{'categorytype'},$data->{'show_in_pulldown'} ); - $sth->finish(); } else { # modifying my $sth = $dbh->prepare("UPDATE branchcategories SET categoryname=?,codedescription=?,categorytype=?,show_in_pulldown=? WHERE categorycode=?"); $sth->execute($data->{'categoryname'}, $data->{'codedescription'},$data->{'categorytype'},$data->{'show_in_pulldown'},uc( $data->{'categorycode'} ) ); - $sth->finish(); } } @@ -550,7 +541,6 @@ sub DelBranchCategory { my $dbh = C4::Context->dbh; my $sth = $dbh->prepare("delete from branchcategories where categorycode = ?"); $sth->execute($categorycode); - $sth->finish; } =head2 CheckBranchCategorycode -- 2.39.5