Bugfixes, optimisations

[dbsrgits/DBIx-Class.git] / lib / DBIx / Class / Relationship / Accessor.pm

diff --git a/lib/DBIx/Class/Relationship/Accessor.pm b/lib/DBIx/Class/Relationship/Accessor.pm
index 2350b81..7e215d4 100644 (file)
--- a/lib/DBIx/Class/Relationship/Accessor.pm
+++ b/lib/DBIx/Class/Relationship/Accessor.pm
@@ -8,12 +8,12 @@ sub add_relationship {
   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);
+    $class->add_relationship_accessor($rel => $acc_type);
   }
   return $ret;
 }
 
-sub _add_relationship_accessor {
+sub add_relationship_accessor {
   my ($class, $rel, $acc_type) = @_;
   my %meth;
   if ($acc_type eq 'single') {
@@ -25,8 +25,9 @@ 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') {