X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FCDBICompat%2FAccessorMapping.pm;h=c012586ddbe7647ae3104fa10dc36d5c03e260b2;hb=deb6ee7f4059e0df6bc0fe633aea550ed57928b2;hp=2489d3ffa6b568f7060b2eaa45a8f9996e496f6d;hpb=103647d504eeadac7d179057e9f4d5eda0cd7c1b;p=dbsrgits%2FDBIx-Class.git diff --git a/lib/DBIx/Class/CDBICompat/AccessorMapping.pm b/lib/DBIx/Class/CDBICompat/AccessorMapping.pm index 2489d3f..c012586 100644 --- a/lib/DBIx/Class/CDBICompat/AccessorMapping.pm +++ b/lib/DBIx/Class/CDBICompat/AccessorMapping.pm @@ -1,14 +1,13 @@ -package DBIx::Class::CDBICompat::AccessorMapping; +package # hide from PAUSE Indexer + DBIx::Class::CDBICompat::AccessorMapping; use strict; use warnings; -use NEXT; - sub mk_group_accessors { my ($class, $group, @cols) = @_; unless ($class->can('accessor_name') || $class->can('mutator_name')) { - return $class->NEXT::ACTUAL::mk_group_accessors($group => @cols); + return $class->next::method($group => @cols); } foreach my $col (@cols) { my $ro_meth = ($class->can('accessor_name') @@ -19,7 +18,7 @@ sub mk_group_accessors { : $col); #warn "$col $ro_meth $wo_meth"; if ($ro_meth eq $wo_meth) { - $class->NEXT::ACTUAL::mk_group_accessors($group => [ $ro_meth => $col ]); + $class->next::method($group => [ $ro_meth => $col ]); } else { $class->mk_group_ro_accessors($group => [ $ro_meth => $col ]); $class->mk_group_wo_accessors($group => [ $wo_meth => $col ]); @@ -27,23 +26,20 @@ sub mk_group_accessors { } } -sub create { +sub new { my ($class, $attrs, @rest) = @_; - $class->throw( "create needs a hashref" ) unless ref $attrs eq 'HASH'; - $attrs = { %$attrs }; - my %att; + $class->throw_exception( "create needs a hashref" ) unless ref $attrs eq 'HASH'; foreach my $col ($class->columns) { if ($class->can('accessor_name')) { my $acc = $class->accessor_name($col); -#warn "$col $acc"; - $att{$col} = delete $attrs->{$acc} if exists $attrs->{$acc}; + $attrs->{$col} = delete $attrs->{$acc} if exists $attrs->{$acc}; } if ($class->can('mutator_name')) { my $mut = $class->mutator_name($col); - $att{$col} = delete $attrs->{$mut} if exists $attrs->{$mut}; + $attrs->{$col} = delete $attrs->{$mut} if exists $attrs->{$mut}; } } - return $class->NEXT::ACTUAL::create({ %$attrs, %att }, @rest); + return $class->next::method($attrs, @rest); } 1;