X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FRelationship%2FBase.pm;h=b7e74eb580ff809e64af769ad33e716e2affdd7f;hb=367eaf50970dd3fd223ce5e1f0337703f2a6c70e;hp=5924db003906223daf02a9b9e0d3ccce36408cff;hpb=a580a22749565b3b07f583bc04412e6dc0c84ab2;p=dbsrgits%2FDBIx-Class.git diff --git a/lib/DBIx/Class/Relationship/Base.pm b/lib/DBIx/Class/Relationship/Base.pm index 5924db0..b7e74eb 100644 --- a/lib/DBIx/Class/Relationship/Base.pm +++ b/lib/DBIx/Class/Relationship/Base.pm @@ -586,7 +586,7 @@ sub related_resultset { if( defined $jfc ) { - $rel_rset = $rsrc->related_source($rel)->resultset->search( + $rel_rset = $rsrc->related_source($rel)->resultset->search_rs( $jfc, $rel_info->{attrs}, ); @@ -612,10 +612,10 @@ sub related_resultset { my $obj_table_alias = lc($rsrc->source_name) . '__row'; $obj_table_alias =~ s/\W+/_/g; - $rel_rset = $rsrc->resultset->search( + $rel_rset = $rsrc->resultset->search_rs( $self->ident_condition($obj_table_alias), { alias => $obj_table_alias }, - )->related_resultset('me')->search(undef, $rel_info->{attrs}) + )->related_resultset('me')->search_rs(undef, $rel_info->{attrs}) } else { @@ -630,7 +630,7 @@ sub related_resultset { : weaken( $attrs->{related_objects}{$_} = $self ) for keys %$reverse; - $rel_rset = $rsrc->related_source($rel)->resultset->search( + $rel_rset = $rsrc->related_source($rel)->resultset->search_rs( UNRESOLVABLE_CONDITION, # guards potential use of the $rs in the future $attrs, );