X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FRelationship%2FManyToMany.pm;fp=lib%2FDBIx%2FClass%2FRelationship%2FManyToMany.pm;h=1cf6b0278c07a4b920fdfd734d7ff8c11a981af2;hb=e50536940adf2ebaef907a0c29ae37fbd5ce95b1;hp=c000a84bd30664b218390ebb5672e238a3403290;hpb=514b84f6b60b566d75d2ff2ddd08659c4cf7b427;p=dbsrgits%2FDBIx-Class.git

diff --git a/lib/DBIx/Class/Relationship/ManyToMany.pm b/lib/DBIx/Class/Relationship/ManyToMany.pm
index c000a84..1cf6b02 100644
--- a/lib/DBIx/Class/Relationship/ManyToMany.pm
+++ b/lib/DBIx/Class/Relationship/ManyToMany.pm
@@ -65,14 +65,14 @@ EOW
 
       # this little horror is there replicating a deprecation from
       # within search_rs() itself
-      shift->search_related_rs( q{%1$s} )
-            ->search_related_rs(
-              q{%2$s},
-              undef,
-              ( @_ > 1 and ref $_[-1] eq 'HASH' )
-                ? { %%$rel_attrs, %%{ pop @_ } }
-                : $rel_attrs
-            )->search_rs(@_)
+      shift->related_resultset( q{%1$s} )
+            ->related_resultset( q{%2$s} )
+             ->search_rs (
+               undef,
+               ( @_ > 1 and ref $_[-1] eq 'HASH' )
+                 ? { %%$rel_attrs, %%{ pop @_ } }
+                 : $rel_attrs
+             )->search_rs(@_)
       ;
 EOC
 
@@ -164,13 +164,13 @@ EOC
 
       # if there is a where clause in the attributes, ensure we only delete
       # rows that are within the where restriction
-      $self->search_related(
-        q{%3$s},
-        ( $rel_attrs->{where}
-          ? ( $rel_attrs->{where}, { join => q{%4$s} } )
-          : ()
-        )
-      )->delete;
+      $self->related_resultset( q{%3$s} )
+            ->search_rs(
+              ( $rel_attrs->{where}
+                ? ( $rel_attrs->{where}, { join => q{%4$s} } )
+                : ()
+              )
+            )->delete;
 
       # add in the set rel objects
       $self->%2$s(
@@ -187,7 +187,7 @@ EOC
       $_[0]->throw_exception("'%1$s' expects an object")
         unless defined Scalar::Util::blessed( $_[1] );
 
-      $_[0]->search_related_rs( q{%2$s} )
+      $_[0]->related_resultset( q{%2$s} )
             ->search_rs( $_[1]->ident_condition( q{%3$s} ), { join => q{%3$s} } )
              ->delete;
 EOC