From 5a8ba15626cfd213398b4f76f13def80690ba936 Mon Sep 17 00:00:00 2001 From: Mark Tompsett Date: Fri, 26 Jan 2018 14:12:26 +0000 Subject: [PATCH] Bug 20080: Followup: corrected unless/if logic Changed unless to if, because unless was the wrong logic. TEST PLAN --------- 1) Run the following commands on a kohadev box: cd ~/qa-test-tools git pull git checkout -b bug_20080 origin/master git bz apply 20080 cd ~/kohaclone git pull git checkout -b bug_20080 origin/master git bz apply 18336 2) Edit ~/kohaclone/installer/data/mysql/kohastructure.sql changing CHARSET and COLLATE on a table to just utf8, instead of the utf8mb variation it is. 3) Run the following commands: git add installer/data/mysql/kohastructure.sql git commit -- doesn't matter what the commit message is. 4) Run the following commands: kshell qa -v 2 -c 1 -- this should fail with a collation problem. 5) Edit ~/kohaclone/installer/data/mysql/kohastructure.sql changing CHARSET and COLLATE on a table back to the utf8mb variation it was. 6) Run the following commands: kshell qa -v 2 -c 2 -- this should pass Signed-off-by: Mark Tompsett --- QohA/File/Specific/Kohastructure.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/QohA/File/Specific/Kohastructure.pm b/QohA/File/Specific/Kohastructure.pm index f5495e9..86c06bf 100644 --- a/QohA/File/Specific/Kohastructure.pm +++ b/QohA/File/Specific/Kohastructure.pm @@ -27,7 +27,7 @@ sub check_charset_collate { { $current_table = $2; } - next unless $line =~ m|CHARSET=utf8mb4|; + next if $line =~ m|CHARSET=utf8mb4|; next if $line =~ m|utf8mb4_unicode_ci|; push @bad_charset_collate, $current_table; } -- 2.1.4