From: Marcus Ramberg Date: Wed, 2 Aug 2006 08:29:49 +0000 (+0000) Subject: change to use utf8::decode/encode X-Git-Tag: v0.07002~55 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=8236f0dc975f51ed07e7d901e4534878cb6a6b15;p=dbsrgits%2FDBIx-Class.git change to use utf8::decode/encode --- diff --git a/lib/DBIx/Class/UTF8Columns.pm b/lib/DBIx/Class/UTF8Columns.pm index c04c073..bcd45cb 100644 --- a/lib/DBIx/Class/UTF8Columns.pm +++ b/lib/DBIx/Class/UTF8Columns.pm @@ -3,7 +3,7 @@ use strict; use warnings; use base qw/DBIx::Class/; -use Encode; +use utf8; __PACKAGE__->mk_classdata( '_utf8_columns' ); @@ -60,8 +60,8 @@ sub get_column { my $cols = $self->_utf8_columns; if ( $cols and defined $value and $cols->{$column} ) { - Encode::_utf8_on($value) unless Encode::is_utf8($value); - } + utf8::decode($value) unless utf8::is_utf8($value); + } $value; } @@ -75,7 +75,7 @@ sub get_columns { my %data = $self->next::method(@_); foreach my $col (grep { defined $data{$_} } keys %{ $self->_utf8_columns || {} }) { - Encode::_utf8_on($data{$col}) unless Encode::is_utf8($data{$col}); + utf8::decode($data{$col}) unless utf8::is_utf8($data{$col}); } %data; @@ -90,7 +90,7 @@ sub store_column { my $cols = $self->_utf8_columns; if ( $cols and defined $value and $cols->{$column} ) { - Encode::_utf8_off($value) if Encode::is_utf8($value); + utf8::encode($value) if utf8::is_utf8($value); } $self->next::method( $column, $value ); diff --git a/t/85utf8.t b/t/85utf8.t index 9a621db..a18814d 100644 --- a/t/85utf8.t +++ b/t/85utf8.t @@ -7,8 +7,8 @@ use DBICTest; my $schema = DBICTest->init_schema(); -eval 'use Encode ; 1' - or plan skip_all => 'Install Encode run this test'; +eval 'use utf8; 1' + or plan skip_all => 'Need utf8 run this test'; plan tests => 3; @@ -16,13 +16,13 @@ DBICTest::Schema::CD->load_components('UTF8Columns'); DBICTest::Schema::CD->utf8_columns('title'); Class::C3->reinitialize(); -my $cd = $schema->resultset('CD')->create( { artist => 1, title => 'uni', year => 'foo' } ); -ok( Encode::is_utf8( $cd->title ), 'got title with utf8 flag' ); -ok( !Encode::is_utf8( $cd->year ), 'got year without utf8 flag' ); +my $cd = $schema->resultset('CD')->create( { artist => 1, title => 'øni', year => 'foo' } ); +ok( utf8::is_utf8( $cd->title ), 'got title with utf8 flag' ); +ok( !utf8::is_utf8( $cd->year ), 'got year without utf8 flag' ); my $utf8_char = 'uniuni'; -Encode::_utf8_on($utf8_char); +utf8::decode($utf8_char); $cd->title($utf8_char); -ok( !Encode::is_utf8( $cd->{_column_data}{title} ), +ok( !utf8::is_utf8( $cd->{_column_data}{title} ), 'store utf8-less chars' );