X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass.pm;h=be108a45fb16e5ab448acb357efb800ecadbae59;hb=a0bd8a8ca1267d90516d5969e3a2f0072d5e3f1c;hp=9336d27a587b71cf860ce6538f462901fe7a2cb8;hpb=83ab85eaf574f3ffe429f74d595095162cf1cdaa;p=dbsrgits%2FDBIx-Class.git diff --git a/lib/DBIx/Class.pm b/lib/DBIx/Class.pm index 9336d27..be108a4 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.06999_02'; +$VERSION = '0.07999_06'; 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,47 +185,61 @@ andyg: Andy Grundman ank: Andres Kievsky -blblack: Brandon Black +ash: Ash Berlin + +blblack: Brandon L. Black bluefeet: Aran Deltac -LTJake: Brian Cassidy +captainL: Luke Saunders + +castaway: Jess Robinson claco: Christopher H. Laco clkao: CL Kao -typester: Daisuke Murase +da5id: David Jack Olrik dkubb: Dan Kubb -Numa: Dan Sully +dnm: Justin Wheeler + +draven: Marcus Ramberg dwc: Daniel Westermann-Clark -ningu: David Kamholz +dyfrgi: Michael Leuchtenburg + +gphat: Cory G Watson jesper: Jesper Krogh -castaway: Jess Robinson +jguenther: Justin Guenther -quicksilver: Jules Bean +jshirley: J. Shirley -jguenther: Justin Guenther +konobi: Scott McWhirter -captainL: Luke Saunders +LTJake: Brian Cassidy -draven: Marcus Ramberg +ned: Neil de Carteret nigel: Nigel Metheringham +ningu: David Kamholz + +Numa: Dan Sully + paulm: Paul Makepeace +penguin: K J Cheetham + phaylon: Robert Sedlacek -sc_: Just Another Perl Hacker +quicksilver: Jules Bean -konobi: Scott McWhirter +sc_: Just Another Perl Hacker scotty: Scotty Allen @@ -228,13 +247,18 @@ sszabo: Stephan Szabo Todd Lipcon +typester: Daisuke Murase + +victori: Victor Igumnov + wdh: Will Hawes -gphat: Cory G Watson +willert: Sebastian Willert + +zamolxes: Bogdan Lucaciu =head1 LICENSE You may distribute this code under the same terms as Perl itself. =cut -