X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FCDBICompat%2FAccessorMapping.pm;h=c012586ddbe7647ae3104fa10dc36d5c03e260b2;hb=88262f96056323dd426285bd45fbe385168cd0d3;hp=e5703c9e64e3ccd9acc0683ba8082ae052e9ab61;hpb=510ca9120ab2fea50a0852ee4ed6a13735ed7ebc;p=dbsrgits%2FDBIx-Class-Historic.git

diff --git a/lib/DBIx/Class/CDBICompat/AccessorMapping.pm b/lib/DBIx/Class/CDBICompat/AccessorMapping.pm
index e5703c9..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_column_accessors {
-  my ($class, @cols) = @_;
+sub mk_group_accessors {
+  my ($class, $group, @cols) = @_;
   unless ($class->can('accessor_name') || $class->can('mutator_name')) {
-    return $class->NEXT::_mk_column_accessors('column' => @cols);
+    return $class->next::method($group => @cols);
   }
   foreach my $col (@cols) {
     my $ro_meth = ($class->can('accessor_name')
@@ -17,13 +16,30 @@ sub _mk_column_accessors {
     my $wo_meth = ($class->can('mutator_name')
                     ? $class->mutator_name($col)
                     : $col);
+    #warn "$col $ro_meth $wo_meth";
     if ($ro_meth eq $wo_meth) {
-      $class->mk_group_accessors('column' => $col);
+      $class->next::method($group => [ $ro_meth => $col ]);
     } else {
-      $class->mk_group_ro_accessors('column' => $ro_meth);
-      $class->mk_group_wo_accessors('column' => $wo_meth);
+      $class->mk_group_ro_accessors($group => [ $ro_meth => $col ]);
+      $class->mk_group_wo_accessors($group => [ $wo_meth => $col ]);
+    }
+  }
+}
+
+sub new {
+  my ($class, $attrs, @rest) = @_;
+  $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);
+      $attrs->{$col} = delete $attrs->{$acc} if exists $attrs->{$acc};
+    }
+    if ($class->can('mutator_name')) {
+      my $mut = $class->mutator_name($col);
+      $attrs->{$col} = delete $attrs->{$mut} if exists $attrs->{$mut};
     }
   }
+  return $class->next::method($attrs, @rest);
 }
 
 1;