$rel_attrs->{alias} ||= $f_rel;
+
my $rs_meth_name = join '::', $class, $rs_meth;
*$rs_meth_name = subname $rs_meth_name, sub {
- my $self = shift;
- my $attrs = @_ > 1 && ref $_[$#_] eq 'HASH' ? pop(@_) : {};
- my $rs = $self->search_related($rel)->search_related(
- $f_rel, @_ > 0 ? @_ : undef, { %{$rel_attrs||{}}, %$attrs }
- );
- return $rs;
+
+ # this little horror is there replicating a deprecation from
+ # within search_rs() itself
+ shift->search_related_rs($rel)
+ ->search_related_rs(
+ $f_rel,
+ undef,
+ ( @_ > 1 and ref $_[-1] eq 'HASH' )
+ ? { %$rel_attrs, %{ pop @_ } }
+ : $rel_attrs
+ )->search_rs(@_)
+ ;
+
};
+
my $meth_name = join '::', $class, $meth;
*$meth_name = subname $meth_name, sub {
+
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 $rs = shift->$rs_meth( @_ );
+
+ 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(
- "${add_meth} needs an object or hashref"
+
+ ( @_ >= 2 and @_ <= 3 ) or $_[0]->throw_exception(
+ "'$add_meth' expects an object or hashref to link to, and an optional hashref of link data"
);
- 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({@_});
+
+ $_[0]->throw_exception(
+ "The optional link data supplied to '$add_meth' is not a hashref (it was previously ignored)"
+ ) if $_[2] and ref $_[2] ne 'HASH';
+
+ my( $self, $far_obj ) = @_;
+
+ my $guard;
+
+ # the API needs is always expected to return the far object, possibly
+ # creating it in the process
+ if( not defined blessed $far_obj ) {
+
+ $guard = $self->result_source->schema->storage->txn_scope_guard;
+
+ # reify the hash into an actual object
+ $far_obj = $self->result_source
+ ->related_source( $rel )
+ ->related_source( $f_rel )
+ ->resultset
+ ->search_rs( undef, $rel_attrs )
+ ->find_or_create( $far_obj );
}
- 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,
+ $_[2] || {},
+ );
+
+ $link->set_from_related( $f_rel, $far_obj );
+
$link->insert();
- return $obj;
+
+ $guard->commit if $guard;
+
+ $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;
+
+ # there will only be a single delete() op, unless we have what to set to
+ $guard = $self->result_source->schema->storage->txn_scope_guard
+ if @$set_to;
+
# 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;
- }
+ $self->search_related(
+ $rel,
+ ( $rel_attrs->{where}
+ ? ( $rel_attrs->{where}, { join => $f_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 if $guard;
};
+
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;
+ $_[0]->throw_exception("'$remove_meth' expects an object")
+ unless defined blessed $_[1];
- $self->search_related($rel, $link_cond)->delete;
+ $_[0]->search_related_rs( $rel )
+ ->search_rs( $_[1]->ident_condition( $f_rel ), { join => $f_rel } )
+ ->delete;
};
}
projects / dbsrgits/DBIx-Class.git / blobdiff