Support for relationship attributes in many_to_many accessors.

[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 8818a69..ea004e3 100644 (file)
--- a/lib/DBIx/Class/Relationship/ManyToMany.pm
+++ b/lib/DBIx/Class/Relationship/ManyToMany.pm
@@ -10,31 +10,69 @@ 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}::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,
-      });
+    *{"${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_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();
+    *{"${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;
     };
 
   }