X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass.pm;h=9f55fc694cfda2eafbb883f8e432ec365b28e8c2;hb=a28009914a3e447af53737d503b1953160d146c9;hp=207c87340a1e05bf31747affd296e20370a9146d;hpb=d3b0e369ff75261ae5f806997a56650bc6c216c5;p=dbsrgits%2FDBIx-Class.git diff --git a/lib/DBIx/Class.pm b/lib/DBIx/Class.pm index 207c873..9f55fc6 100644 --- a/lib/DBIx/Class.pm +++ b/lib/DBIx/Class.pm @@ -4,30 +4,35 @@ use strict; use warnings; use vars qw($VERSION); -use base qw/DBIx::Class::Componentised Class::Data::Accessor/; +use base qw/DBIx::Class::Componentised Class::Accessor::Grouped/; + +sub mk_classdata { + my $self = shift; + $self->mk_group_accessors('inherited', $_[0]); + $self->set_inherited(@_) if @_ > 1; +} -sub mk_classdata { shift->mk_classaccessor(@_); } sub component_base_class { 'DBIx::Class' } # Always remember to do all digits for the version even if they're 0 # 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.07001'; +$VERSION = '0.08001'; sub MODIFY_CODE_ATTRIBUTES { - my ($class,$code,@attrs) = @_; - $class->mk_classdata('__attr_cache' => {}) - unless $class->can('__attr_cache'); - $class->__attr_cache->{$code} = [@attrs]; - return (); + my ($class,$code,@attrs) = @_; + $class->mk_classdata('__attr_cache' => {}) + unless $class->can('__attr_cache'); + $class->__attr_cache->{$code} = [@attrs]; + return (); } sub _attr_cache { - my $self = shift; - my $cache = $self->can('__attr_cache') ? $self->__attr_cache : {}; - my $rest = eval { $self->next::method }; - return $@ ? $cache : { %$cache, %$rest }; + my $self = shift; + my $cache = $self->can('__attr_cache') ? $self->__attr_cache : {}; + my $rest = eval { $self->next::method }; + return $@ ? $cache : { %$cache, %$rest }; } 1; @@ -180,6 +185,8 @@ andyg: Andy Grundman ank: Andres Kievsky +ash: Ash Berlin + blblack: Brandon L. Black bluefeet: Aran Deltac @@ -192,13 +199,17 @@ claco: Christopher H. Laco clkao: CL Kao +da5id: David Jack Olrik + dkubb: Dan Kubb +dnm: Justin Wheeler + draven: Marcus Ramberg dwc: Daniel Westermann-Clark -dyfrgi: Michael Leuchtenmurg +dyfrgi: Michael Leuchtenburg gphat: Cory G Watson @@ -206,10 +217,14 @@ jesper: Jesper Krogh jguenther: Justin Guenther +jshirley: J. Shirley + konobi: Scott McWhirter LTJake: Brian Cassidy +ned: Neil de Carteret + nigel: Nigel Metheringham ningu: David Kamholz @@ -234,8 +249,12 @@ Todd Lipcon typester: Daisuke Murase +victori: Victor Igumnov + wdh: Will Hawes +willert: Sebastian Willert + zamolxes: Bogdan Lucaciu =head1 LICENSE