fixed new many_to_many accessors and added tests and docs

[dbsrgits/DBIx-Class.git] / lib / DBIx / Class / Relationship / ManyToMany.pm

diff --git a/lib/DBIx/Class/Relationship/ManyToMany.pm b/lib/DBIx/Class/Relationship/ManyToMany.pm
index a88e1b0..8b29bf4 100644 (file)
--- a/lib/DBIx/Class/Relationship/ManyToMany.pm
+++ b/lib/DBIx/Class/Relationship/ManyToMany.pm
@@ -10,6 +10,9 @@ sub many_to_many {
     no strict 'refs';
     no warnings 'redefine';
 
+    my $remove_link_meth = "remove_from_$rel";
+    my $add_link_meth = "add_to_$rel";
+
     *{"${class}::${meth}"} = sub {
       my $self = shift;
       my $attrs = @_ > 1 && ref $_[$#_] eq 'HASH' ? pop(@_) : {};
@@ -19,24 +22,35 @@ sub many_to_many {
     };
 
     *{"${class}::add_to_${meth}"} = sub {
-      my( $self, $obj ) = @_;
-      my $vals = @_ > 2 && ref $_[$#_] eq 'HASH' ? pop(@_) : {};
-      return $self->search_related($rel)->create({
-        map { $_=>$self->get_column($_) } $self->primary_columns(),
-        map { $_=>$obj->get_column($_) } $obj->primary_columns(),
-        %$vals,
-      });
+      my $self = shift;
+      @_ > 0 or $self->throw_exception(
+        "$add_link_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);
+      my $obj = ref $_[0]
+        ? ( ref $_[0] eq 'HASH' ? $f_rel_rs->create($_[0]) : $_[0] )
+        : ( $f_rel_rs->create({@_}) );
+      my $link = $self->search_related($rel)->new_result({});
+      $link->set_from_related($f_rel, $obj);
+      $link->insert();
     };
 
     *{"${class}::remove_from_${meth}"} = sub {
-      my( $self, $obj ) = @_;
-      return $self->search_related(
-        $rel,
-        {
-            map { $_=>$self->get_column($_) } $self->primary_columns(),
-            map { $_=>$obj->get_column($_) } $obj->primary_columns(),
-        },
-      )->delete();
+      my $self = shift;
+      @_ > 0 && ref $_[0] ne 'HASH'
+        or $self->throw_exception("$remove_link_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;
     };
 
   }