Merge lp:~percona-toolkit-dev/percona-toolkit/fix-bug-903379 into lp:percona-toolkit/2.1

[Brian Fraser]

[Brian Fraser (fraserbn)]

review: Approve

[Daniel Nichter (daniel-nichter)]

review: Approve

=== modified file 'bin/pt-archiver'
--- bin/pt-archiver	2012-05-24 17:25:20 +0000
+++ bin/pt-archiver	2012-05-28 14:46:19 +0000
@@ -3962,18 +3962,30 @@
    # Open the file and print the header to it. 
    if ( $archive_file ) { 
       my $need_hdr = $o->get('header') && !-f $archive_file; 
-      my $charset  = lc $o->get('charset'); 
-      if ( $charset ) { 
-          $archive_fh = IO::File->new($archive_file, ">>:$charset") 
-             or die "Cannot open $charset $archive_file: $OS_ERROR\n"; 
-      } 
-      else { 
-          $archive_fh = IO::File->new($archive_file, ">>") 
-             or die "Cannot open $archive_file: $OS_ERROR\n"; 
-      } 
+      my $charset  = $o->get('charset') || '';
+      if ($charset eq 'utf8') {
+         $charset = ":$charset";
+      }
+      elsif ($charset) {
+         eval { require Encode }
+            or (PTDEBUG &&
+               _d("Couldn't load Encode: ", $EVAL_ERROR,
+                  "Going to try using the charset ",
+                  "passed in without checking it."));
+         # No need to punish a user if they did their
+         # homework and passed in an official charset,
+         # rather than an alias.
+         $charset = ":encoding("
+                  . (defined &Encode::resolve_alias
+                     ? Encode::resolve_alias($charset) || $charset
+                     : $charset)
+                  . ")";
+      }
+      $archive_fh = IO::File->new($archive_file, ">>$charset") 
+         or die "Cannot open $charset $archive_file: $OS_ERROR\n"; 
       $archive_fh->autoflush(1) unless $o->get('buffer'); 
       if ( $need_hdr ) { 
-         print $archive_fh '', escape(\@sel_cols), "\n" 
+         print { $archive_fh } '', escape(\@sel_cols), "\n" 
             or die "Cannot write to $archive_file: $OS_ERROR\n"; 
       } 
    } 

=== modified file 't/pt-archiver/file.t'
--- t/pt-archiver/file.t	2011-07-12 22:56:55 +0000
+++ t/pt-archiver/file.t	2012-05-28 14:46:19 +0000
@@ -23,7 +23,7 @@
    plan skip_all => 'Cannot connect to sandbox master';
 }
 else {
-   plan tests => 5;
+   plan tests => 11;
 }
 
 my $output;
@@ -72,6 +72,47 @@
 `rm -f archive.test.table_1`;
 
 # #############################################################################
+# Bug #903379: --file & --charset could cause warnings and exceptions
+# #############################################################################
+
+sub test_charset {
+   my ($charset) = @_;
+   
+   $sb->load_file('master', 't/pt-archiver/samples/table1.sql');
+   local $@;
+   eval {
+      pt_archiver::main("-c", "b,c", qw(--where 1=1 --header),
+            "--source", "D=test,t=table_1,F=$cnf",
+            '--file', '/tmp/%Y-%m-%d-%D_%H:%i:%s.%t',
+            '--no-check-charset',
+            '--charset', $charset,
+      );
+   };
+
+   ok !$@, "--charset $charset works";
+}
+
+for my $charset (qw(latin1 iso-8859-1 utf8 UTF-8 )) {
+   test_charset($charset);
+}
+
+my $warning;
+local $SIG{__WARN__} = sub { $warning .= shift };
+my $out = output( sub {
+      $sb->load_file('master', 't/pt-archiver/samples/table1.sql');
+      pt_archiver::main("-c", "b,c", qw(--where 1=1 --header),
+            "--source", "D=test,t=table_1,F=$cnf",
+            '--file', '/tmp/%Y-%m-%d-%D_%H:%i:%s.%t',
+            '--no-check-charset',
+            '--charset', "some_charset_that_doesn't_exist",
+      );
+   },
+);
+
+like($out, qr/\QCannot open :encoding(some_chars/, "..but an unknown charset fails");
+like($warning, qr/Cannot find encoding/, "..and throws a useful warning");
+
+# #############################################################################
 # Done.
 # #############################################################################
 $sb->wipe_clean($dbh);