From 6fde3b8dd2f30657b3178ea8ec256fe0cdb10c60 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Fri, 9 Nov 2012 14:11:41 +0100 Subject: [PATCH] Bug 8915: Followup FIX QA issues Before this patch: * misc/maintenance/fix_mysql_constraints.pl FAIL pod FAIL *** ERROR: unterminated B<...> in file misc/maintenance/fix_mysql_constraints.pl forbidden patterns OK valid OK critic FAIL "require" statement with library name as string at line 25, column 12. Use a bareword instead. + I add a die on the open statement --- misc/maintenance/fix_mysql_constraints.pl | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/misc/maintenance/fix_mysql_constraints.pl b/misc/maintenance/fix_mysql_constraints.pl index be29b80..a593c2a 100755 --- a/misc/maintenance/fix_mysql_constraints.pl +++ b/misc/maintenance/fix_mysql_constraints.pl @@ -22,7 +22,8 @@ BEGIN { # find Koha's Perl modules # test carefully before changing this use FindBin; - eval { require "$FindBin::Bin/../kohalib.pl" }; + my $lib = "$FindBin::Bin/../kohalib.pl"; + eval { require $lib }; } use Getopt::Long; @@ -61,11 +62,8 @@ sub fix_mysql_constraints { AND CONSTRAINT_TYPE != 'PRIMARY KEY' ")}; my $base_dir = C4::Context->config('intranetdir'); - open my $fh, "<", "$base_dir/installer/data/mysql/kohastructure.sql"; - unless ($fh) { - say "Unable to open kohastructure.sql file"; - exit; - } + open my $fh, "<", "$base_dir/installer/data/mysql/kohastructure.sql" + or die "Unable to open kohastructure.sql file"; my $table_name; my $engine_altered; @@ -159,7 +157,7 @@ Prints this help Alter tables effectively, otherwise just display the ALTER TABLE directives. -=item B<--alterengine +=item B<--alterengine> Prior to add missing constraints, alter table engine to InnoDB. -- 1.7.10.4