From: Matt S Trout Date: Wed, 22 Feb 2006 13:25:23 +0000 (+0000) Subject: Class::C3 fixup for 0.11 X-Git-Tag: v0.06000~92 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=971c00850836f9d5d731d68fbc8d763e7656fa28;p=dbsrgits%2FDBIx-Class.git Class::C3 fixup for 0.11 --- diff --git a/Changes b/Changes index e7035fe..6386364 100644 --- a/Changes +++ b/Changes @@ -1,5 +1,8 @@ Revision history for DBIx::Class + - tweak to Componentised for Class::C3 0.11 + - fixes for auto-inc under MSSQL + 0.05006 2006-02-17 15:32:40 - storage fix for fork() and workaround for Apache::DBI - made update(\%hash) work on row as well as rs diff --git a/lib/DBIx/Class.pm b/lib/DBIx/Class.pm index 2514c87..56fe277 100644 --- a/lib/DBIx/Class.pm +++ b/lib/DBIx/Class.pm @@ -13,7 +13,7 @@ sub component_base_class { 'DBIx::Class' } # i.e. first release of 0.XX *must* be 0.XX000. This avoids fBSD ports # brain damage and presumably various other packaging systems too -$VERSION = '0.05006'; +$VERSION = '0.05007'; sub MODIFY_CODE_ATTRIBUTES { my ($class,$code,@attrs) = @_; diff --git a/lib/DBIx/Class/Componentised.pm b/lib/DBIx/Class/Componentised.pm index a642f85..d4a6641 100644 --- a/lib/DBIx/Class/Componentised.pm +++ b/lib/DBIx/Class/Componentised.pm @@ -15,7 +15,6 @@ sub inject_base { my $table = { Class::C3::_dump_MRO_table }; eval "package $target; import Class::C3;" unless exists $table->{$target}; - Class::C3::reinitialize() if defined $table->{$target}; } sub load_components { @@ -23,6 +22,7 @@ sub load_components { my $base = $class->component_base_class; my @comp = map { "${base}::$_" } grep { $_ !~ /^#/ } @_; $class->_load_components(@comp); + Class::C3::reinitialize(); } sub load_own_components {