X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FRelationship%2FManyToMany.pm;h=1e6b93b87830944807f6a90740671b9d5ee3136b;hb=aefa6508d3b034fb36d1a919c5be0aa363c52328;hp=8818a69471277eee7c05a7e5e0192dcd386791db;hpb=4b3ab474aa3b3e4ccae0843d58e8eaec29a4198d;p=dbsrgits%2FDBIx-Class-Historic.git

diff --git a/lib/DBIx/Class/Relationship/ManyToMany.pm b/lib/DBIx/Class/Relationship/ManyToMany.pm
index 8818a69..1e6b93b 100644
--- a/lib/DBIx/Class/Relationship/ManyToMany.pm
+++ b/lib/DBIx/Class/Relationship/ManyToMany.pm
@@ -6,35 +6,93 @@ use warnings;
 
 sub many_to_many {
   my ($class, $meth, $rel, $f_rel, $rel_attrs) = @_;
+
+  $class->throw_exception(
+    "missing relation in many-to-many"
+  ) unless $rel;
+
+  $class->throw_exception(
+    "missing foreign relation in many-to-many"
+  ) unless $f_rel;
+
   {
     no strict 'refs';
     no warnings 'redefine';
 
-    *{"${class}::${meth}"} = sub {
+    my $add_meth = "add_to_${meth}";
+    my $remove_meth = "remove_from_${meth}";
+    my $set_meth = "set_${meth}";
+    my $rs_meth = "${meth}_rs";
+
+    $rel_attrs->{alias} ||= $f_rel;
+
+    *{"${class}::${meth}_rs"} = 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 });
+      my $rs = $self->search_related($rel)->search_related(
+        $f_rel, @_ > 0 ? @_ : undef, { %{$rel_attrs||{}}, %$attrs }
+      );
+	  return $rs;
     };
 
-    *{"${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}::${meth}"} = sub {
+		my $self = shift;
+		my $rs = $self->$rs_meth( @_ );
+  		return (wantarray ? $rs->all : $rs);
+	};
+
+    *{"${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_vals);
+      $link->set_from_related($f_rel, $obj);
+      $link->insert();
+	  return $obj;
+    };
+
+    *{"${class}::${set_meth}"} = sub {
+      my $self = shift;
+      @_ > 0 or $self->throw_exception(
+        "{$set_meth} needs a list of objects or hashrefs"
+      );
+      my @to_set = (ref($_[0]) eq 'ARRAY' ? @{ $_[0] } : @_);
+      $self->search_related($rel, {})->delete;
+      $self->$add_meth($_) for (@to_set);
     };
 
-    *{"${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;
     };
 
   }