From 0564aaacfd4101fa839e0c943073a166b5f85460 Mon Sep 17 00:00:00 2001 From: Kenza Zaki Date: Tue, 23 Jul 2013 15:27:23 +0200 Subject: [PATCH] Inappropriate uses of $sth->finish() in C4::Branch.pm 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 http://bugs.koha-community.org/show_bug.cgi?id=10629 --- C4/Branch.pm | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/C4/Branch.pm b/C4/Branch.pm index 8b76771..c1e3587 100644 --- a/C4/Branch.pm +++ b/C4/Branch.pm @@ -182,7 +182,6 @@ sub GetBranchName { $sth = $dbh->prepare("Select branchname from branches where branchcode=?"); $sth->execute($branchcode); my $branchname = $sth->fetchrow_array; - $sth->finish; return ($branchname); } @@ -278,7 +277,6 @@ sub ModBranch { "insert into branchrelations (branchcode, categorycode) values(?, ?)" ); $sth->execute( $branchcode, $cat ); - $sth->finish; } foreach my $cat (@removecats) { my $sth = @@ -286,7 +284,6 @@ sub ModBranch { "delete from branchrelations where branchcode=? and categorycode=?" ); $sth->execute( $branchcode, $cat ); - $sth->finish; } } @@ -422,7 +419,6 @@ sub GetBranchesInCategory { while (my $branch = $sth->fetchrow) { push @branches, $branch; } - $sth->finish(); return( \@branches ); } @@ -467,11 +463,9 @@ sub GetBranchInfo { while ( my ($cat) = $nsth->fetchrow_array ) { push( @cats, $cat ); } - $nsth->finish; $data->{'categories'} = \@cats; push( @results, $data ); } - $sth->finish; return \@results; } @@ -486,7 +480,6 @@ sub DelBranch { my $dbh = C4::Context->dbh; my $sth = $dbh->prepare("delete from branches where branchcode = ?"); $sth->execute($branchcode); - $sth->finish; } =head2 ModBranchCategoryInfo @@ -503,13 +496,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(); } } @@ -546,7 +537,6 @@ sub DelBranchCategory { my $dbh = C4::Context->dbh; my $sth = $dbh->prepare("delete from branchcategories where categorycode = ?"); $sth->execute($categorycode); - $sth->finish; } =head2 CheckBranchCategorycode -- 1.7.9.5