return $self->{_relationship_data}{%1$s};
}
else {
- my $rel_info = $self->result_source->relationship_info(%1$s);
- my $cond = $self->result_source->_resolve_condition(
- $rel_info->{cond}, %1$s, $self, %1$s
+ my $rsrc = $self->result_source;
+
+ my $relcond = $rsrc->_resolve_relationship_condition(
+ rel_name => %1$s,
+ foreign_alias => %1$s,
+ self_alias => 'me',
+ self_result_object => $self,
+ );
+
+ return undef if (
+ $relcond->{join_free_condition}
+ and
+ $relcond->{join_free_condition} ne DBIx::Class::_Util::UNRESOLVABLE_CONDITION
+ and
+ scalar grep { not defined $_ } values %%{ $relcond->{join_free_condition} || {} }
+ and
+ $rsrc->relationship_info(%1$s)->{attrs}{undef_on_null_fk}
);
- 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( %1$s => {} );
+
+ my $val = $self->related_resultset( %1$s )->single;
return $val unless $val; # $val instead of undef so that null-objects can go through
return $self->{_relationship_data}{%1$s} = $val;
}
elsif ($acc_type eq 'filter') {
$class->throw_exception("No such column '$rel' to filter")
- unless $class->has_column($rel);
+ unless $class->result_source_instance->has_column($rel);
- my $f_class = $class->relationship_info($rel)->{class};
+ my $f_class = $class->result_source_instance
+ ->relationship_info($rel)
+ ->{class};
$class->inflate_column($rel, {
inflate => sub {
my ($val, $self) = @_;
- return $self->find_or_new_related($rel, {}, {});
+ return $self->find_or_new_related($rel, {});
},
deflate => sub {
my ($val, $self) = @_;
}
elsif ($acc_type eq 'multi') {
- quote_sub "${class}::${rel}_rs", "shift->search_related_rs( $rel => \@_ )";
- quote_sub "${class}::add_to_${rel}", "shift->create_related( $rel => \@_ )";
+ quote_sub "${class}::${rel}_rs", sprintf( <<'EOC', perlstring $rel );
+ DBIx::Class::_ENV_::ASSERT_NO_INTERNAL_INDIRECT_CALLS and DBIx::Class::_Util::fail_on_internal_call;
+ shift->related_resultset(%s)->search_rs( @_ )
+EOC
+
+ quote_sub "${class}::add_to_${rel}", sprintf( <<'EOC', perlstring $rel );
+ DBIx::Class::_ENV_::ASSERT_NO_INTERNAL_INDIRECT_CALLS and DBIx::Class::_Util::fail_on_internal_call;
+ shift->create_related( %s => @_ );
+EOC
+
quote_sub "${class}::${rel}", sprintf( <<'EOC', perlstring $rel );
+ DBIx::Class::_ENV_::ASSERT_NO_INTERNAL_INDIRECT_CALLS and DBIx::Class::_Util::fail_on_internal_call;
DBIx::Class::_ENV_::ASSERT_NO_INTERNAL_WANTARRAY and my $sog = DBIx::Class::_Util::fail_on_internal_wantarray;
- shift->search_related( %s => @_ )
+ shift->related_resultset(%s)->search( @_ )
EOC
}
else {