} elsif (exists $self->{_relationship_data}{$rel}) {
return $self->{_relationship_data}{$rel};
} else {
- my $cond = $self->result_source->resolve_condition(
+ my $cond = $self->result_source->_resolve_condition(
$rel_info->{cond}, $rel, $self
);
if ($rel_info->{attrs}->{undef_on_null_fk}){
- return if grep { not defined } values %$cond;
+ 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;
}
};