From: Peter Rabbitson Date: Wed, 29 Apr 2009 13:41:37 +0000 (+0000) Subject: Fixes to massive breakage introduced by 5948 ribasushi-- X-Git-Tag: v0.08102~6 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=97d61088b16ce8d2ffcbb4a2433509d65f7f7449;p=dbsrgits%2FDBIx-Class.git Fixes to massive breakage introduced by 5948 ribasushi-- --- diff --git a/Makefile.PL b/Makefile.PL index f39e34b..dd0c078 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -60,8 +60,9 @@ my %force_requires_if_author = ( 'DBIx::ContextualFetch' => 0, 'Class::DBI::Plugin::DeepAbstractSearch' => 0, 'Class::Trigger' => 0, - 'Time::Piece' => 0, + 'Time::Piece::MySQL' => 0, 'Clone' => 0, + 'Date::Simple' => 0, # t/52cycle.t 'Test::Memory::Cycle' => 0, diff --git a/t/cdbi/01-columns.t b/t/cdbi/01-columns.t index 4166226..61c7b90 100644 --- a/t/cdbi/01-columns.t +++ b/t/cdbi/01-columns.t @@ -1,6 +1,7 @@ use strict; use Test::More; +use lib 't/cdbi/testlib'; BEGIN { eval "use DBIx::Class::CDBICompat;"; @@ -13,7 +14,7 @@ BEGIN { #----------------------------------------------------------------------- package State; -use base 'DBIx::Class::Test::SQLite'; +use base 'DBIC::Test::SQLite'; State->table('State'); State->columns(Essential => qw/Abbreviation Name/); @@ -39,7 +40,7 @@ sub Snowfall { 1 } package City; -use base 'DBIx::Class::Test::SQLite'; +use base 'DBIC::Test::SQLite'; City->table('City'); City->columns(All => qw/Name State Population/); @@ -56,7 +57,7 @@ City->columns(All => qw/Name State Population/); #------------------------------------------------------------------------- package CD; -use base 'DBIx::Class::Test::SQLite'; +use base 'DBIC::Test::SQLite'; CD->table('CD'); CD->columns('All' => qw/artist title length/); diff --git a/t/cdbi/columns_dont_override_custom_accessors.t b/t/cdbi/columns_dont_override_custom_accessors.t index f9bd027..6ec7fe1 100644 --- a/t/cdbi/columns_dont_override_custom_accessors.t +++ b/t/cdbi/columns_dont_override_custom_accessors.t @@ -1,5 +1,6 @@ use strict; use Test::More; +use lib 't/cdbi/testlib'; BEGIN { eval "use DBIx::Class::CDBICompat;"; @@ -10,7 +11,7 @@ BEGIN { { package Thing; - use base 'DBIx::Class::Test::SQLite'; + use base 'DBIC::Test::SQLite'; Thing->columns(TEMP => qw[foo bar]); Thing->columns(All => qw[thing_id yarrow flower]); diff --git a/t/cdbi/copy.t b/t/cdbi/copy.t index 25eb255..a6e60ba 100644 --- a/t/cdbi/copy.t +++ b/t/cdbi/copy.t @@ -15,7 +15,7 @@ INIT { package # hide from PAUSE MyFilm; - use base 'DBIx::Class::Test::SQLite'; + use base 'DBIC::Test::SQLite'; use strict; __PACKAGE__->set_table('Movies'); diff --git a/t/cdbi/multi_column_set.t b/t/cdbi/multi_column_set.t index 4311456..d6a9484 100644 --- a/t/cdbi/multi_column_set.t +++ b/t/cdbi/multi_column_set.t @@ -1,5 +1,6 @@ use strict; use Test::More; +use lib 't/cdbi/testlib'; BEGIN { eval "use DBIx::Class::CDBICompat;"; @@ -10,7 +11,7 @@ BEGIN { { package Thing; - use base 'DBIx::Class::Test::SQLite'; + use base 'DBIC::Test::SQLite'; Thing->columns(TEMP => qw[foo bar baz]); Thing->columns(All => qw[some real stuff]); diff --git a/t/cdbi/set_to_undef.t b/t/cdbi/set_to_undef.t index 83cf1a2..47b0a35 100644 --- a/t/cdbi/set_to_undef.t +++ b/t/cdbi/set_to_undef.t @@ -1,5 +1,6 @@ use strict; use Test::More; +use lib 't/cdbi/testlib'; BEGIN { eval "use DBIx::Class::CDBICompat;"; @@ -19,7 +20,7 @@ local $SIG{__WARN__} = sub { { package Thing; - use base 'DBIx::Class::Test::SQLite'; + use base 'DBIC::Test::SQLite'; Thing->columns(All => qw[thing_id this that date]); } diff --git a/t/cdbi/set_vs_DateTime.t b/t/cdbi/set_vs_DateTime.t index 7dd17ce..45ce621 100644 --- a/t/cdbi/set_vs_DateTime.t +++ b/t/cdbi/set_vs_DateTime.t @@ -1,6 +1,7 @@ use strict; use Test::More; use Test::Exception; +use lib 't/cdbi/testlib'; BEGIN { eval "use DBIx::Class::CDBICompat;"; @@ -13,7 +14,7 @@ BEGIN { { package Thing; - use base 'DBIx::Class::Test::SQLite'; + use base 'DBIC::Test::SQLite'; Thing->columns(All => qw[thing_id this that date]); } diff --git a/t/cdbi/testlib/Actor.pm b/t/cdbi/testlib/Actor.pm index 4e27abe..2944390 100644 --- a/t/cdbi/testlib/Actor.pm +++ b/t/cdbi/testlib/Actor.pm @@ -4,7 +4,7 @@ package # hide from PAUSE use strict; use warnings; -use base 'DBIx::Class::Test::SQLite'; +use base 'DBIC::Test::SQLite'; __PACKAGE__->set_table('Actor'); diff --git a/t/cdbi/testlib/ActorAlias.pm b/t/cdbi/testlib/ActorAlias.pm index ba38551..9e4ebe4 100644 --- a/t/cdbi/testlib/ActorAlias.pm +++ b/t/cdbi/testlib/ActorAlias.pm @@ -4,7 +4,7 @@ package # hide from PAUSE use strict; use warnings; -use base 'DBIx::Class::Test::SQLite'; +use base 'DBIC::Test::SQLite'; __PACKAGE__->set_table( 'ActorAlias' ); diff --git a/t/cdbi/testlib/Blurb.pm b/t/cdbi/testlib/Blurb.pm index a112f47..7c6dfdb 100644 --- a/t/cdbi/testlib/Blurb.pm +++ b/t/cdbi/testlib/Blurb.pm @@ -2,7 +2,7 @@ package # hide from PAUSE Blurb; use strict; -use base 'DBIx::Class::Test::SQLite'; +use base 'DBIC::Test::SQLite'; __PACKAGE__->set_table('Blurbs'); __PACKAGE__->columns('Primary', 'Title'); diff --git a/t/cdbi/testlib/CDBase.pm b/t/cdbi/testlib/CDBase.pm index 22c6262..4367ef0 100644 --- a/t/cdbi/testlib/CDBase.pm +++ b/t/cdbi/testlib/CDBase.pm @@ -2,6 +2,6 @@ package # hide from PAUSE CDBase; use strict; -use base qw(DBIx::Class::Test::SQLite); +use base qw(DBIC::Test::SQLite); 1; diff --git a/t/lib/Test/SQLite.pm b/t/cdbi/testlib/DBIC/Test/SQLite.pm similarity index 98% rename from t/lib/Test/SQLite.pm rename to t/cdbi/testlib/DBIC/Test/SQLite.pm index 449cb2b..3b17953 100644 --- a/t/lib/Test/SQLite.pm +++ b/t/cdbi/testlib/DBIC/Test/SQLite.pm @@ -1,5 +1,5 @@ package # hide from PAUSE - DBIx::Class::Test::SQLite; + DBIC::Test::SQLite; =head1 NAME diff --git a/t/cdbi/testlib/Director.pm b/t/cdbi/testlib/Director.pm index af0a453..a9dd199 100644 --- a/t/cdbi/testlib/Director.pm +++ b/t/cdbi/testlib/Director.pm @@ -2,7 +2,7 @@ package # hide from PAUSE Director; use strict; -use base 'DBIx::Class::Test::SQLite'; +use base 'DBIC::Test::SQLite'; __PACKAGE__->set_table('Directors'); __PACKAGE__->columns('All' => qw/ Name Birthday IsInsane /); diff --git a/t/cdbi/testlib/Film.pm b/t/cdbi/testlib/Film.pm index 6521a59..b1f50ac 100644 --- a/t/cdbi/testlib/Film.pm +++ b/t/cdbi/testlib/Film.pm @@ -1,7 +1,7 @@ package # hide from PAUSE Film; -use base 'DBIx::Class::Test::SQLite'; +use base 'DBIC::Test::SQLite'; use strict; __PACKAGE__->set_table('Movies'); diff --git a/t/cdbi/testlib/Lazy.pm b/t/cdbi/testlib/Lazy.pm index 2b2137e..5835de2 100644 --- a/t/cdbi/testlib/Lazy.pm +++ b/t/cdbi/testlib/Lazy.pm @@ -1,7 +1,7 @@ package # hide from PAUSE Lazy; -use base 'DBIx::Class::Test::SQLite'; +use base 'DBIC::Test::SQLite'; use strict; __PACKAGE__->set_table("Lazy"); diff --git a/t/cdbi/testlib/Order.pm b/t/cdbi/testlib/Order.pm index 703005d..fa1f296 100644 --- a/t/cdbi/testlib/Order.pm +++ b/t/cdbi/testlib/Order.pm @@ -2,7 +2,7 @@ package # hide from PAUSE Order; use strict; -use base 'DBIx::Class::Test::SQLite'; +use base 'DBIC::Test::SQLite'; __PACKAGE__->set_table('orders'); __PACKAGE__->table_alias('orders'); diff --git a/t/cdbi/testlib/OtherThing.pm b/t/cdbi/testlib/OtherThing.pm index 08c31ba..59fb818 100644 --- a/t/cdbi/testlib/OtherThing.pm +++ b/t/cdbi/testlib/OtherThing.pm @@ -1,5 +1,5 @@ package OtherThing; -use base 'DBIx::Class::Test::SQLite'; +use base 'DBIC::Test::SQLite'; OtherThing->set_table("other_thing"); OtherThing->columns(All => qw(id)); diff --git a/t/cdbi/testlib/Thing.pm b/t/cdbi/testlib/Thing.pm index d71e22a..4080b66 100644 --- a/t/cdbi/testlib/Thing.pm +++ b/t/cdbi/testlib/Thing.pm @@ -1,5 +1,5 @@ package Thing; -use base 'DBIx::Class::Test::SQLite'; +use base 'DBIC::Test::SQLite'; Thing->set_table("thing"); Thing->columns(All => qw(id that_thing));