my $meth_name = join '::', $class, $meth;
*$meth_name = subname $meth_name, sub {
- DBIx::Class::_ENV_::ASSERT_NO_INTERNAL_WANTARRAY and wantarray and my $sog = fail_on_internal_wantarray($_[0]);
+ DBIx::Class::_ENV_::ASSERT_NO_INTERNAL_WANTARRAY and my $sog = fail_on_internal_wantarray;
my $self = shift;
my $rs = $self->$rs_meth( @_ );
return (wantarray ? $rs->all : $rs);
my $add_meth_name = join '::', $class, $add_meth;
*$add_meth_name = subname $add_meth_name, sub {
my $self = shift;
- @_ > 0 or $self->throw_exception(
+ @_ or $self->throw_exception(
"${add_meth} needs an object or hashref"
);
- my $source = $self->result_source;
- my $schema = $source->schema;
- my $rel_source_name = $source->relationship_info($rel)->{source};
- my $rel_source = $schema->resultset($rel_source_name)->result_source;
- my $f_rel_source_name = $rel_source->relationship_info($f_rel)->{source};
- my $f_rel_rs = $schema->resultset($f_rel_source_name)->search({}, $rel_attrs||{});
-
- my $obj;
- if (ref $_[0]) {
- if (ref $_[0] eq 'HASH') {
- $obj = $f_rel_rs->find_or_create($_[0]);
- } else {
- $obj = $_[0];
- }
- } else {
- $obj = $f_rel_rs->find_or_create({@_});
- }
- my $link_vals = @_ > 1 && ref $_[$#_] eq 'HASH' ? pop(@_) : {};
- my $link = $self->search_related($rel)->new_result($link_vals);
- $link->set_from_related($f_rel, $obj);
+ my $link = $self->new_related( $rel,
+ ( @_ > 1 && ref $_[-1] eq 'HASH' )
+ ? pop
+ : {}
+ );
+
+ my $far_obj = defined blessed $_[0]
+ ? $_[0]
+ : $self->result_source
+ ->related_source( $rel )
+ ->related_source( $f_rel )
+ ->resultset->search_rs( {}, $rel_attrs||{} )
+ ->find_or_create( ref $_[0] eq 'HASH' ? $_[0] : {@_} )
+ ;
+
+ $link->set_from_related($f_rel, $far_obj);
+
$link->insert();
- return $obj;
+
+ return $far_obj;
};
my $set_meth_name = join '::', $class, $set_meth;
*$set_meth_name = subname $set_meth_name, sub {
+
my $self = shift;
- @_ > 0 or $self->throw_exception(
- "{$set_meth} needs a list of objects or hashrefs"
+
+ my $set_to = ( ref $_[0] eq 'ARRAY' )
+ ? ( shift @_ )
+ : do {
+ carp_unique(
+ "Calling '$set_meth' with a list of items to link to is deprecated, use an arrayref instead"
+ );
+
+ # gobble up everything from @_ into a new arrayref
+ [ splice @_ ]
+ }
+ ;
+
+ # make sure folks are not invoking a bizarre mix of deprecated and curent syntax
+ $self->throw_exception(
+ "'$set_meth' expects an arrayref of objects or hashrefs to link to, and an optional hashref of link data"
+ ) if (
+ @_ > 1
+ or
+ ( @_ and ref $_[0] ne 'HASH' )
);
- my @to_set = (ref($_[0]) eq 'ARRAY' ? @{ $_[0] } : @_);
+
+ my $guard = $self->result_source->schema->storage->txn_scope_guard;
+
# if there is a where clause in the attributes, ensure we only delete
# rows that are within the where restriction
+
if ($rel_attrs && $rel_attrs->{where}) {
$self->search_related( $rel, $rel_attrs->{where},{join => $f_rel})->delete;
} else {
$self->search_related( $rel, {} )->delete;
}
# add in the set rel objects
- $self->$add_meth($_, ref($_[1]) ? $_[1] : {}) for (@to_set);
+ $self->$add_meth(
+ $_,
+ @_, # at this point @_ is either empty or contains a lone link-data hash
+ ) for @$set_to;
+
+ $guard->commit;
};
my $remove_meth_name = join '::', $class, $remove_meth;
*$remove_meth_name = subname $remove_meth_name, sub {
my ($self, $obj) = @_;
+
$self->throw_exception("${remove_meth} needs an object")
unless blessed ($obj);
- my $rel_source = $self->search_related($rel)->result_source;
- my $cond = $rel_source->relationship_info($f_rel)->{cond};
- my ($link_cond, $crosstable) = $rel_source->_resolve_condition(
- $cond, $obj, $f_rel, $f_rel
- );
- $self->throw_exception(
- "Relationship '$rel' does not resolve to a join-free condition, "
- ."unable to use with the ManyToMany helper '$f_rel'"
- ) if $crosstable;
-
- $self->search_related($rel, $link_cond)->delete;
+ $self->search_related_rs($rel)->search_rs(
+ $obj->ident_condition( $f_rel ),
+ { join => $f_rel },
+ )->delete;
};
-
}
}