X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FRelationship%2FAccessor.pm;h=eb03a3d73291143ebfcf26ad0b75e59950f4f64e;hb=8c4b6c50e873a2b5993d1bfe0f40763d994b7da4;hp=d9c24a45fede7b85e8e9cb2de40bf6ea2f6196b3;hpb=84a1c93f976a27eb0d89ccbfecd6beabeeeecb21;p=dbsrgits%2FDBIx-Class-Historic.git

diff --git a/lib/DBIx/Class/Relationship/Accessor.pm b/lib/DBIx/Class/Relationship/Accessor.pm
index d9c24a4..eb03a3d 100644
--- a/lib/DBIx/Class/Relationship/Accessor.pm
+++ b/lib/DBIx/Class/Relationship/Accessor.pm
@@ -6,6 +6,11 @@ use warnings;
 use Sub::Name ();
 use Class::Inspector ();
 
+our %_pod_inherit_config = 
+  (
+   class_map => { 'DBIx::Class::Relationship::Accessor' => 'DBIx::Class::Relationship' }
+  );
+
 sub register_relationship {
   my ($class, $rel, $info) = @_;
   if (my $acc_type = $info->{attrs}{accessor}) {
@@ -18,7 +23,7 @@ sub add_relationship_accessor {
   my ($class, $rel, $acc_type) = @_;
   my %meth;
   if ($acc_type eq 'single') {
-    my $rel_cond = $class->relationship_info($rel)->{cond};
+    my $rel_info = $class->relationship_info($rel);
     $meth{$rel} = sub {
       my $self = shift;
       if (@_) {
@@ -27,12 +32,16 @@ sub add_relationship_accessor {
       } elsif (exists $self->{_relationship_data}{$rel}) {
         return $self->{_relationship_data}{$rel};
       } else {
-        my $cond = $self->result_source->resolve_condition(
-          $rel_cond, $rel, $self
+        my $cond = $self->result_source->_resolve_condition(
+          $rel_info->{cond}, $rel, $self
         );
-        return if grep { not defined } values %$cond;
+        if ($rel_info->{attrs}->{undef_on_null_fk}){
+          return undef unless ref($cond) eq 'HASH';
+          return undef if grep { not defined $_ } values %$cond;
+        }
         my $val = $self->find_related($rel, {}, {});
-        return unless $val;
+        return $val unless $val;  # $val instead of undef so that null-objects can go through
+
         return $self->{_relationship_data}{$rel} = $val;
       }
     };