-package DBIx::Class::Relationship::Accessor;
+package # hide from PAUSE
+ DBIx::Class::Relationship::Accessor;
use strict;
use warnings;
+use Sub::Name ();
+use Class::Inspector ();
-sub add_relationship {
- my ($class, $rel, @rest) = @_;
- 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);
+sub register_relationship {
+ my ($class, $rel, $info) = @_;
+ if (my $acc_type = $info->{attrs}{accessor}) {
+ $class->add_relationship_accessor($rel => $acc_type);
}
- return $ret;
+ $class->next::method($rel => $info);
}
-sub _add_relationship_accessor {
+sub add_relationship_accessor {
my ($class, $rel, $acc_type) = @_;
my %meth;
if ($acc_type eq 'single') {
+ 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 ($val) = $self->search_related($rel, {}, {});
+ my $cond = $self->result_source->resolve_condition(
+ $rel_info->{cond}, $rel, $self
+ );
+ if( exists $rel_info->{attrs}->{undef_on_null_fk}
+ && $rel_info->{attrs}->{undef_on_null_fk} ){
+ return if grep { not defined } values %$cond;
+ }
+ my $val = $self->find_related($rel, {}, {});
return unless $val;
return $self->{_relationship_data}{$rel} = $val;
}
};
} elsif ($acc_type eq 'filter') {
- $class->throw("No such column $rel to filter")
- unless exists $class->_columns->{$rel};
- my $f_class = $class->_relationships->{$rel}{class};
+ $class->throw_exception("No such column $rel to filter")
+ unless $class->has_column($rel);
+ my $f_class = $class->relationship_info($rel)->{class};
$class->inflate_column($rel,
{ inflate => sub {
my ($val, $self) = @_;
- return $self->find_or_create_related($rel, {}, {});
+ return $self->find_or_new_related($rel, {}, {});
},
deflate => sub {
my ($val, $self) = @_;
- $self->throw("$val isn't a $f_class") unless $val->isa($f_class);
+ $self->throw_exception("$val isn't a $f_class") unless $val->isa($f_class);
return ($val->_ident_values)[0];
# WARNING: probably breaks for multi-pri sometimes. FIXME
}
);
} elsif ($acc_type eq 'multi') {
$meth{$rel} = sub { shift->search_related($rel, @_) };
+ $meth{"${rel}_rs"} = sub { shift->search_related_rs($rel, @_) };
$meth{"add_to_${rel}"} = sub { shift->create_related($rel, @_); };
} else {
- $class->throw("No such relationship accessor type $acc_type");
+ $class->throw_exception("No such relationship accessor type $acc_type");
}
{
no strict 'refs';
no warnings 'redefine';
foreach my $meth (keys %meth) {
- *{"${class}::${meth}"} = $meth{$meth};
+ my $name = join '::', $class, $meth;
+ *$name = Sub::Name::subname($name, $meth{$meth});
}
}
}