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}) {
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 (@_) {
} 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;
}
};