X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FResultSource.pm;h=e5fb3950455d2dcf7fc22506bc336d8477d4597e;hb=6c4f4d69a8ec24b5e76bef0eb9c0d837d8e694ab;hp=3e7486095342674b2e4ebd4a09a5759b743a75cd;hpb=13523f299f81871f7c33fb2e662fc2b5b009f9d2;p=dbsrgits%2FDBIx-Class.git

diff --git a/lib/DBIx/Class/ResultSource.pm b/lib/DBIx/Class/ResultSource.pm
index 3e74860..e5fb395 100644
--- a/lib/DBIx/Class/ResultSource.pm
+++ b/lib/DBIx/Class/ResultSource.pm
@@ -1568,11 +1568,13 @@ sub _resolve_condition {
       $self->throw_exception ('Unable to determine relationship name for condition resolution');
     }
 
-    return $cond->(ref $for ? $as : $for,
-                   ref $for ? 'me' : $as,
-                   $self,
-                   $rel,
-                   ref $for ? $for : undef);
+    return $cond->({
+      self_alias => ref $for ? $as : $for,
+      foreign_alias => ref $for ? $self->related_source($rel)->resultset->current_source_alias : $as,
+      self_resultsource => $self,
+      foreign_relname => $rel,
+      self_rowobj => ref $for ? $for : undef
+    });
 
   } elsif (ref $cond eq 'HASH') {
     my %ret;