X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FRelationship%2FAccessor.pm;h=b77ce00f71bf1826f3638bed8052bffb2ea382b3;hb=096f421241;hp=2350b81b44d31a71a692e61e4b3aedab9ec704c0;hpb=4a07648ace2ace5b878c63aec52b7a30c1432b4d;p=dbsrgits%2FDBIx-Class.git

diff --git a/lib/DBIx/Class/Relationship/Accessor.pm b/lib/DBIx/Class/Relationship/Accessor.pm
index 2350b81..b77ce00 100644
--- a/lib/DBIx/Class/Relationship/Accessor.pm
+++ b/lib/DBIx/Class/Relationship/Accessor.pm
@@ -1,19 +1,18 @@
-package DBIx::Class::Relationship::Accessor;
+package # hide from PAUSE
+    DBIx::Class::Relationship::Accessor;
 
 use strict;
 use warnings;
 
-sub add_relationship {
-  my ($class, $rel, @rest) = @_;
-  my $ret = $class->NEXT::ACTUAL::add_relationship($rel => @rest);
-  my $rel_obj = $class->_relationships->{$rel};
-  if (my $acc_type = $rel_obj->{attrs}{accessor}) {
-    $class->_add_relationship_accessor($rel => $acc_type);
+sub register_relationship {
+  my ($class, $rel, $info) = @_;
+  if (my $acc_type = $info->{attrs}{accessor}) {
+    $class->add_relationship_accessor($rel => $acc_type);
   }
-  return $ret;
+  $class->next::method($rel => $info);
 }
 
-sub _add_relationship_accessor {
+sub add_relationship_accessor {
   my ($class, $rel, $acc_type) = @_;
   my %meth;
   if ($acc_type eq 'single') {
@@ -25,14 +24,15 @@ sub _add_relationship_accessor {
       } elsif (exists $self->{_relationship_data}{$rel}) {
         return $self->{_relationship_data}{$rel};
       } else {
-        return $self->{_relationship_data}{$rel}
-                 = $self->find_or_create_related($rel, {}, {});
+        my $val = $self->find_related($rel, {}, {});
+        return unless $val;
+        return $self->{_relationship_data}{$rel} = $val;
       }
     };
   } elsif ($acc_type eq 'filter') {
-    $class->throw("No such column $rel to filter")
-       unless exists $class->_columns->{$rel};
-    my $f_class = $class->_relationships->{$rel}{class};
+    $class->throw_exception("No such column $rel to filter")
+       unless $class->has_column($rel);
+    my $f_class = $class->relationship_info($rel)->{class};
     $class->inflate_column($rel,
       { inflate => sub {
           my ($val, $self) = @_;
@@ -40,7 +40,7 @@ sub _add_relationship_accessor {
         },
         deflate => sub {
           my ($val, $self) = @_;
-          $self->throw("$val isn't a $f_class") unless $val->isa($f_class);
+          $self->throw_exception("$val isn't a $f_class") unless $val->isa($f_class);
           return ($val->_ident_values)[0];
             # WARNING: probably breaks for multi-pri sometimes. FIXME
         }
@@ -48,9 +48,10 @@ sub _add_relationship_accessor {
     );
   } elsif ($acc_type eq 'multi') {
     $meth{$rel} = sub { shift->search_related($rel, @_) };
+    $meth{"${rel}_rs"} = sub { shift->search_related_rs($rel, @_) };
     $meth{"add_to_${rel}"} = sub { shift->create_related($rel, @_); };
   } else {
-    $class->throw("No such relationship accessor type $acc_type");
+    $class->throw_exception("No such relationship accessor type $acc_type");
   }
   {
     no strict 'refs';
@@ -61,4 +62,39 @@ sub _add_relationship_accessor {
   }
 }
 
+sub new {
+  my ($class, $attrs, @rest) = @_;
+  my ($related, $info);
+  foreach my $key (keys %{$attrs||{}}) {
+    next unless $info = $class->relationship_info($key);
+    $related->{$key} = delete $attrs->{$key}
+      if ref $attrs->{$key}
+         && $info->{attrs}{accessor}
+         && $info->{attrs}{accessor} eq 'single';
+  }
+  my $obj = $class->next::method($attrs, @rest);
+  if ($related) {
+    $obj->{_relationship_data} = $related;
+    foreach my $rel (keys %$related) {
+      $obj->set_from_related($rel, $related->{$rel});
+    }
+  }
+  return $obj;
+}
+
+sub update {
+  my ($obj, $attrs, @rest) = @_;
+  my $info;
+  foreach my $key (keys %{$attrs||{}}) {
+    next unless $info = $obj->relationship_info($key);
+    if (ref $attrs->{$key} && $info->{attrs}{accessor}
+        && $info->{attrs}{accessor} eq 'single') {
+      my $rel = delete $attrs->{$key};
+      $obj->set_from_related($key => $rel);
+      $obj->{_relationship_data}{$key} = $rel;
+    }
+  }
+  return $obj->next::method($attrs, @rest);
+}
+
 1;