X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FCDBICompat%2FAccessorMapping.pm;h=c09140f49fba81ded7341249849f500c975d6539;hb=7da0602386cfd7c10aa24cfa053b32bdcb27c081;hp=c012586ddbe7647ae3104fa10dc36d5c03e260b2;hpb=c0e7b4e55952cd193b6f1866d0c27ece182397eb;p=dbsrgits%2FDBIx-Class.git

diff --git a/lib/DBIx/Class/CDBICompat/AccessorMapping.pm b/lib/DBIx/Class/CDBICompat/AccessorMapping.pm
index c012586..c09140f 100644
--- a/lib/DBIx/Class/CDBICompat/AccessorMapping.pm
+++ b/lib/DBIx/Class/CDBICompat/AccessorMapping.pm
@@ -1,45 +1,67 @@
 package # hide from PAUSE Indexer
-    DBIx::Class::CDBICompat::AccessorMapping;
+  DBIx::Class::CDBICompat::AccessorMapping;
 
 use strict;
 use warnings;
 
 sub mk_group_accessors {
-  my ($class, $group, @cols) = @_;
-  unless ($class->can('accessor_name') || $class->can('mutator_name')) {
-    return $class->next::method($group => @cols);
-  }
-  foreach my $col (@cols) {
-    my $ro_meth = ($class->can('accessor_name')
-                    ? $class->accessor_name($col)
-                    : $col);
-    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->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 ]);
+    my ($class, $group, @cols) = @_;
+
+    foreach my $col (@cols) {
+        my($accessor, $col) = ref $col ? @$col : (undef, $col);
+
+        my($ro_meth, $wo_meth);
+        if( defined $accessor ) {
+            $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 ]);
+          }
     }
-  }
 }
 
-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};
+
+sub accessor_name_for {
+    my ($class, $column) = @_;
+    if ($class->can('accessor_name')) { 
+        return $class->accessor_name($column) 
     }
-    if ($class->can('mutator_name')) {
-      my $mut = $class->mutator_name($col);
-      $attrs->{$col} = delete $attrs->{$mut} if exists $attrs->{$mut};
+
+    return $column;
+}
+
+sub mutator_name_for {
+    my ($class, $column) = @_;
+    if ($class->can('mutator_name')) { 
+        return $class->mutator_name($column) 
+    }
+
+    return $column;
+}
+
+
+sub new {
+    my ($class, $attrs, @rest) = @_;
+    $class->throw_exception( "create needs a hashref" ) unless ref $attrs eq 'HASH';
+    foreach my $col ($class->columns) {
+        my $acc = $class->accessor_name_for($col);
+        $attrs->{$col} = delete $attrs->{$acc} if exists $attrs->{$acc};
+
+        my $mut = $class->mutator_name_for($col);
+        $attrs->{$col} = delete $attrs->{$mut} if exists $attrs->{$mut};
     }
-  }
-  return $class->next::method($attrs, @rest);
+    return $class->next::method($attrs, @rest);
 }
 
 1;