X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FUTF8Columns.pm;h=f060f817cc43c3bd8e12da4f75717aa4415cbf28;hb=ed213e857791d1cfb0f1a0e32674e81358e19564;hp=71c1013d0b42633421434131f2dff654b38e4786;hpb=e063fe2c4297c3a23b6ca27a2e2eae92ccba9739;p=dbsrgits%2FDBIx-Class.git

diff --git a/lib/DBIx/Class/UTF8Columns.pm b/lib/DBIx/Class/UTF8Columns.pm
index 71c1013..f060f81 100644
--- a/lib/DBIx/Class/UTF8Columns.pm
+++ b/lib/DBIx/Class/UTF8Columns.pm
@@ -3,9 +3,18 @@ use strict;
 use warnings;
 use base qw/DBIx::Class/;
 
-use Encode;
+BEGIN {
+
+    # Perl 5.8.0 doesn't have utf8::is_utf8()
+    # Yes, 5.8.0 support for Unicode is suboptimal, but things like RHEL3 ship with it.
+    if ($] <= 5.008000) {
+        require Encode;
+    } else {
+        require utf8;
+    }
+}
 
-__PACKAGE__->mk_classdata( force_utf8_columns => [] );
+__PACKAGE__->mk_classdata( '_utf8_columns' );
 
 =head1 NAME
 
@@ -37,11 +46,15 @@ L<Template::Stash::ForceUTF8>, L<DBIx::Class::UUIDColumns>.
 
 sub utf8_columns {
     my $self = shift;
-    for (@_) {
-        $self->throw_exception("column $_ doesn't exist")
-            unless $self->has_column($_);
+    if (@_) {
+        foreach my $col (@_) {
+            $self->throw_exception("column $col doesn't exist")
+                unless $self->has_column($col);
+        }        
+        return $self->_utf8_columns({ map { $_ => 1 } @_ });
+    } else {
+        return $self->_utf8_columns;
     }
-    $self->force_utf8_columns( \@_ );
 }
 
 =head1 EXTENDED METHODS
@@ -54,8 +67,14 @@ sub get_column {
     my ( $self, $column ) = @_;
     my $value = $self->next::method($column);
 
-    if ( { map { $_ => 1 } @{ $self->force_utf8_columns } }->{$column} ) {
-        Encode::_utf8_on($value) unless Encode::is_utf8($value);
+    my $cols = $self->_utf8_columns;
+    if ( $cols and defined $value and $cols->{$column} ) {
+
+        if ($] <= 5.008000) {
+            Encode::_utf8_on($value) unless Encode::is_utf8($value);
+        } else {
+            utf8::decode($value) unless utf8::is_utf8($value);
+        }
     }
 
     $value;
@@ -69,8 +88,13 @@ sub get_columns {
     my $self = shift;
     my %data = $self->next::method(@_);
 
-    for (@{ $self->force_utf8_columns }) {
-        Encode::_utf8_on($data{$_}) if $data{$_} and !Encode::is_utf8($_);
+    foreach my $col (grep { defined $data{$_} } keys %{ $self->_utf8_columns || {} }) {
+
+        if ($] <= 5.008000) {
+            Encode::_utf8_on($data{$col}) unless Encode::is_utf8($data{$col});
+        } else {
+            utf8::decode($data{$col}) unless utf8::is_utf8($data{$col});
+        }
     }
 
     %data;
@@ -83,8 +107,14 @@ sub get_columns {
 sub store_column {
     my ( $self, $column, $value ) = @_;
 
-    if ( { map { $_ => 1 } @{ $self->force_utf8_columns } }->{$column} ) {
-        Encode::_utf8_off($value) if Encode::is_utf8($value);
+    my $cols = $self->_utf8_columns;
+    if ( $cols and defined $value and $cols->{$column} ) {
+
+        if ($] <= 5.008000) {
+            Encode::_utf8_off($value) if Encode::is_utf8($value);
+        } else {
+            utf8::encode($value) if utf8::is_utf8($value);
+        }
     }
 
     $self->next::method( $column, $value );