[Bast-commits] r8248 - in DBIx-Class/0.08/trunk: . lib/DBIx/Class t
ribasushi at dev.catalyst.perl.org
ribasushi at dev.catalyst.perl.org
Thu Jan 7 10:21:56 GMT 2010
Author: ribasushi
Date: 2010-01-07 10:21:55 +0000 (Thu, 07 Jan 2010)
New Revision: 8248
Modified:
DBIx-Class/0.08/trunk/Changes
DBIx-Class/0.08/trunk/Makefile.PL
DBIx-Class/0.08/trunk/lib/DBIx/Class/UTF8Columns.pm
DBIx-Class/0.08/trunk/t/51threads.t
DBIx-Class/0.08/trunk/t/51threadtxn.t
DBIx-Class/0.08/trunk/t/85utf8.t
Log:
5.8.1 is minimum required perl
Modified: DBIx-Class/0.08/trunk/Changes
===================================================================
--- DBIx-Class/0.08/trunk/Changes 2010-01-07 08:28:44 UTC (rev 8247)
+++ DBIx-Class/0.08/trunk/Changes 2010-01-07 10:21:55 UTC (rev 8248)
@@ -1,5 +1,6 @@
Revision history for DBIx::Class
+ - Perl 5.8.1 is now the minimum supported version
- might_have/has_one now warn if applied calling class's column
has is_nullable set to true.
- Fixed regression in deploy() with a {sources} table limit applied
Modified: DBIx-Class/0.08/trunk/Makefile.PL
===================================================================
--- DBIx-Class/0.08/trunk/Makefile.PL 2010-01-07 08:28:44 UTC (rev 8247)
+++ DBIx-Class/0.08/trunk/Makefile.PL 2010-01-07 10:21:55 UTC (rev 8248)
@@ -3,7 +3,7 @@
use warnings;
use POSIX ();
-use 5.006001; # delete this line if you want to send patches for earlier.
+use 5.008001;
# ****** DO NOT ADD OPTIONAL DEPENDENCIES. EVER. --mst ******
@@ -33,7 +33,7 @@
requires 'Class::Inspector' => '1.24';
requires 'Data::Page' => '2.00';
requires 'DBD::SQLite' => '1.25';
-requires 'DBI' => '1.605';
+requires 'DBI' => '1.609';
requires 'JSON::Any' => '1.18';
requires 'MRO::Compat' => '0.09';
requires 'Module::Find' => '0.06';
Modified: DBIx-Class/0.08/trunk/lib/DBIx/Class/UTF8Columns.pm
===================================================================
--- DBIx-Class/0.08/trunk/lib/DBIx/Class/UTF8Columns.pm 2010-01-07 08:28:44 UTC (rev 8247)
+++ DBIx-Class/0.08/trunk/lib/DBIx/Class/UTF8Columns.pm 2010-01-07 10:21:55 UTC (rev 8248)
@@ -2,18 +2,8 @@
use strict;
use warnings;
use base qw/DBIx::Class/;
+use utf8;
-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( '_utf8_columns' );
=head1 NAME
@@ -71,15 +61,10 @@
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);
- }
+ utf8::decode($value) unless utf8::is_utf8($value);
}
- $value;
+ return $value;
}
=head2 get_columns
@@ -91,15 +76,10 @@
my %data = $self->next::method(@_);
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});
- }
+ utf8::decode($data{$col}) unless utf8::is_utf8($data{$col});
}
- %data;
+ return %data;
}
=head2 store_column
@@ -111,12 +91,7 @@
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);
- }
+ utf8::encode($value) if utf8::is_utf8($value);
}
$self->next::method( $column, $value );
Modified: DBIx-Class/0.08/trunk/t/51threads.t
===================================================================
--- DBIx-Class/0.08/trunk/t/51threads.t 2010-01-07 08:28:44 UTC (rev 8247)
+++ DBIx-Class/0.08/trunk/t/51threads.t 2010-01-07 10:21:55 UTC (rev 8248)
@@ -8,7 +8,7 @@
BEGIN {
plan skip_all => 'Your perl does not support ithreads'
- if !$Config{useithreads} || $] < 5.008;
+ if !$Config{useithreads};
}
use threads;
Modified: DBIx-Class/0.08/trunk/t/51threadtxn.t
===================================================================
--- DBIx-Class/0.08/trunk/t/51threadtxn.t 2010-01-07 08:28:44 UTC (rev 8247)
+++ DBIx-Class/0.08/trunk/t/51threadtxn.t 2010-01-07 10:21:55 UTC (rev 8248)
@@ -8,7 +8,7 @@
BEGIN {
plan skip_all => 'Your perl does not support ithreads'
- if !$Config{useithreads} || $] < 5.008;
+ if !$Config{useithreads};
}
use threads;
Modified: DBIx-Class/0.08/trunk/t/85utf8.t
===================================================================
--- DBIx-Class/0.08/trunk/t/85utf8.t 2010-01-07 08:28:44 UTC (rev 8247)
+++ DBIx-Class/0.08/trunk/t/85utf8.t 2010-01-07 10:21:55 UTC (rev 8248)
@@ -1,23 +1,13 @@
use strict;
-use warnings;
+use warnings;
use Test::More;
use lib qw(t/lib);
use DBICTest;
+use utf8;
my $schema = DBICTest->init_schema();
-if ($] <= 5.008000) {
-
- eval 'use Encode; 1' or plan skip_all => 'Need Encode run this test';
-
-} else {
-
- eval 'use utf8; 1' or plan skip_all => 'Need utf8 run this test';
-}
-
-plan tests => 6;
-
DBICTest::Schema::CD->load_components('UTF8Columns');
DBICTest::Schema::CD->utf8_columns('title');
Class::C3->reinitialize();
@@ -26,12 +16,12 @@
my $utf8_char = 'uniuni';
-ok( _is_utf8( $cd->title ), 'got title with utf8 flag' );
-ok(! _is_utf8( $cd->year ), 'got year without utf8 flag' );
+ok( utf8::is_utf8( $cd->title ), 'got title with utf8 flag' );
+ok(! utf8::is_utf8( $cd->year ), 'got year without utf8 flag' );
-_force_utf8($utf8_char);
+utf8::decode($utf8_char);
$cd->title($utf8_char);
-ok(! _is_utf8( $cd->{_column_data}{title} ), 'store utf8-less chars' );
+ok(! utf8::is_utf8( $cd->{_column_data}{title} ), 'store utf8-less chars' );
my $v_utf8 = "\x{219}";
@@ -47,24 +37,7 @@
TODO: {
local $TODO = 'There is currently no way to propagate aliases to inflate_result()';
$cd = $schema->resultset('CD')->find ({ title => $v_utf8 }, { select => 'title', as => 'name' });
- ok (_is_utf8( $cd->get_column ('name') ), 'utf8 flag propagates via as');
+ ok (utf8::is_utf8( $cd->get_column ('name') ), 'utf8 flag propagates via as');
}
-
-sub _force_utf8 {
- if ($] <= 5.008000) {
- Encode::_utf8_on ($_[0]);
- }
- else {
- utf8::decode ($_[0]);
- }
-}
-
-sub _is_utf8 {
- if ($] <= 5.008000) {
- return Encode::is_utf8 (shift);
- }
- else {
- return utf8::is_utf8 (shift);
- }
-}
+done_testing;
More information about the Bast-commits
mailing list