Merge branch 'master' into topic/constructor_rewrite

[dbsrgits/DBIx-Class.git] / lib / DBIx / Class / CDBICompat / AccessorMapping.pm

diff --git a/lib/DBIx/Class/CDBICompat/AccessorMapping.pm b/lib/DBIx/Class/CDBICompat/AccessorMapping.pm
index a8f03e6..1ea49e8 100644 (file)
--- a/lib/DBIx/Class/CDBICompat/AccessorMapping.pm
+++ b/lib/DBIx/Class/CDBICompat/AccessorMapping.pm
@@ -1,33 +1,42 @@
 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) = @_;
-
-  foreach my $col (@cols) {
-    my $ro_meth = $class->accessor_name_for($col);
-    my $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 ]);
+    my ($class, $group, @cols) = @_;
+
+    foreach my $col (@cols) {
+        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 ]);
+        }
     }
-  }
 }
 
 
 sub accessor_name_for {
     my ($class, $column) = @_;
-    if ($class->can('accessor_name')) { 
-        return $class->accessor_name($column) 
+    if ($class->can('accessor_name')) {
+        return $class->accessor_name($column)
     }
 
     return $column;
@@ -35,8 +44,8 @@ sub accessor_name_for {
 
 sub mutator_name_for {
     my ($class, $column) = @_;
-    if ($class->can('mutator_name')) { 
-        return $class->mutator_name($column) 
+    if ($class->can('mutator_name')) {
+        return $class->mutator_name($column)
     }
 
     return $column;
@@ -44,16 +53,16 @@ sub mutator_name_for {
 
 
 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);
+    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);
 }
 
 1;