X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FRelationship%2FManyToMany.pm;h=ea004e347ed4fe3c00f9e352e6c1d5d516c39baa;hb=78060df8cb43cafd81304f386d7111510a4b8f9d;hp=387fc0b4f1622b4853bc3067f6fb4d0f3c1ffde8;hpb=75d079145a507a0e5ff89b2676d383f4fd1a5511;p=dbsrgits%2FDBIx-Class-Historic.git diff --git a/lib/DBIx/Class/Relationship/ManyToMany.pm b/lib/DBIx/Class/Relationship/ManyToMany.pm index 387fc0b..ea004e3 100644 --- a/lib/DBIx/Class/Relationship/ManyToMany.pm +++ b/lib/DBIx/Class/Relationship/ManyToMany.pm @@ -9,11 +9,72 @@ sub many_to_many { { no strict 'refs'; no warnings 'redefine'; + + my $add_meth = "add_to_${meth}"; + my $remove_meth = "remove_from_${meth}"; + my $set_meth = "set_${meth}"; + *{"${class}::${meth}"} = sub { my $self = shift; my $attrs = @_ > 1 && ref $_[$#_] eq 'HASH' ? pop(@_) : {}; - $self->search_related($rel)->search_related($f_rel, @_ > 0 ? @_ : undef, { %{$rel_attrs||{}}, %$attrs }); + my @args = ($f_rel, @_ > 0 ? @_ : undef, { %{$rel_attrs||{}}, %$attrs }); + $self->search_related($rel)->search_related( + $f_rel, @_ > 0 ? @_ : undef, { %{$rel_attrs||{}}, %$attrs } + ); + }; + + *{"${class}::${add_meth}"} = sub { + my $self = shift; + @_ > 0 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->create($_[0]); + } else { + $obj = $_[0]; + } + } else { + $obj = $f_rel_rs->create({@_}); + } + + my $link_vals = @_ > 1 && ref $_[$#_] eq 'HASH' ? pop(@_) : {}; + my $link = $self->search_related($rel)->new_result({}); + $link->set_from_related($f_rel, $obj); + $link->set_columns($link_vals); + $link->insert(); }; + + *{"${class}::${set_meth}"} = sub { + my $self = shift; + @_ > 0 or $self->throw_exception( + "{$set_meth} needs a list of objects or hashrefs" + ); + $self->search_related($rel, {})->delete; + $self->$add_meth(shift) while (defined $_[0]); + }; + + *{"${class}::${remove_meth}"} = sub { + my $self = shift; + @_ > 0 && ref $_[0] ne 'HASH' + or $self->throw_exception("${remove_meth} needs an object"); + my $obj = shift; + my $rel_source = $self->search_related($rel)->result_source; + my $cond = $rel_source->relationship_info($f_rel)->{cond}; + my $link_cond = $rel_source->resolve_condition( + $cond, $obj, $f_rel + ); + $self->search_related($rel, $link_cond)->delete; + }; + } }