more assorted kleenoops

[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 09fd212..efbd770 100644 (file)
--- a/lib/DBIx/Class/Relationship/ManyToMany.pm
+++ b/lib/DBIx/Class/Relationship/ManyToMany.pm
@@ -4,15 +4,15 @@ use strict;
 use warnings;
 
 sub many_to_many {
-  my ($class, $meth, $rel_class, $f_class) = @_;
-  
-  eval "require $f_class";
-  
+  my ($class, $meth, $rel, $f_rel, $rel_attrs) = @_;
   {
     no strict 'refs';
     no warnings 'redefine';
-    *{"${class}::${meth}"} =
-      sub { shift->search_related($rel_class)->search_related($f_class, @_); };
+    *{"${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 });
+    };
   }
 }