X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FCDBICompat%2FAccessorMapping.pm;h=b7945b093ab2156727e9b691e6274b73d84a7352;hb=7fca91be5671c61be5c766bd93df741bc00d9c15;hp=8b15db4ad5b43ae15891d8db92376454f80c9d47;hpb=478e7094c198ab76839b88753ce540ca98fdb839;p=dbsrgits%2FDBIx-Class-Historic.git diff --git a/lib/DBIx/Class/CDBICompat/AccessorMapping.pm b/lib/DBIx/Class/CDBICompat/AccessorMapping.pm index 8b15db4..b7945b0 100644 --- a/lib/DBIx/Class/CDBICompat/AccessorMapping.pm +++ b/lib/DBIx/Class/CDBICompat/AccessorMapping.pm @@ -8,18 +8,27 @@ sub mk_group_accessors { my ($class, $group, @cols) = @_; foreach my $col (@cols) { - my $ro_meth = $class->accessor_name_for($col); - my $wo_meth = $class->mutator_name_for($col); + my($accessor, $col) = ref $col ? @$col : (undef, $col); + + my($ro_meth, $wo_meth); + if( defined $accessor and ($accessor ne $col)) { + $ro_meth = $wo_meth = $accessor; + } + else { + $ro_meth = $class->accessor_name_for($col); + $wo_meth = $class->mutator_name_for($col); + } # warn "class: $class / col: $col / ro: $ro_meth / wo: $wo_meth\n"; if ($ro_meth eq $wo_meth or # they're the same - $wo_meth eq $col) # or only the accessor is custom - { - $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 ]); - } + $wo_meth eq $col) # or only the accessor is custom + { + $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 ]); + } } }