Installer break utf8 for DBD::mysql
authorHenri-Damien LAURENT <henridamien.laurent@biblibre.com>
Thu, 23 Jul 2009 11:20:07 +0000 (13:20 +0200)
committerGalen Charlton <gmcharlt@gmail.com>
Sat, 1 Aug 2009 12:30:21 +0000 (08:30 -0400)
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
C4/Installer.pm

index caeb2ff..2e1fe1a 100644 (file)
@@ -79,6 +79,8 @@ sub new {
                                   $self->{'user'}, $self->{'password'});
     $self->{'language'} = undef;
     $self->{'marcflavour'} = undef;
+       $self->{'dbh'}->do('set NAMES "utf8"');
+    $self->{'dbh'}->{'mysql_enable_utf8'}=1; 
 
     bless $self, $class;
     return $self;
@@ -557,7 +559,7 @@ sub load_sql {
             . ( $self->{user}     ? " -u $self->{user} "     : "" )
             . ( $self->{password} ? " -p'$self->{password}'"   : "" )
             . " $self->{dbname} ";
-        $error = qx($strcmd <$filename 2>&1 1>/dev/null);
+        $error = qx($strcmd --default-character-set=utf8 <$filename 2>&1 1>/dev/null);
     } elsif ( $self->{dbms} eq 'Pg' ) {
         $strcmd = "psql "
             . ( $self->{hostname} ? " -h $self->{hostname} " : "" )