From: David Kamholz <dkamholz@cpan.org>
Date: Tue, 11 Jul 2006 18:02:28 +0000 (+0000)
Subject: change _parent_from to from
X-Git-Tag: v0.07002~75^2~24
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=ca7a501fca48e9972619d6365252f75d74b4e4ed;p=dbsrgits%2FDBIx-Class.git

change _parent_from to from
---

diff --git a/lib/DBIx/Class/ResultSet.pm b/lib/DBIx/Class/ResultSet.pm
index 992f6c0..9b40f03 100644
--- a/lib/DBIx/Class/ResultSet.pm
+++ b/lib/DBIx/Class/ResultSet.pm
@@ -1432,7 +1432,7 @@ sub related_resultset {
         alias => $alias,
         where => $self->{cond},
         seen_join => $seen,
-        _parent_from => $from,
+        from => $from,
     });
   };
 }
@@ -1442,7 +1442,7 @@ sub _resolve_from {
   my $source = $self->result_source;
   my $attrs = $self->{attrs};
   
-  my $from = $attrs->{_parent_from}
+  my $from = $attrs->{from}
     || [ { $attrs->{alias} => $source->from } ];
     
   my $seen = { %{$attrs->{seen_join}||{}} };
@@ -1494,8 +1494,7 @@ sub _resolved_attrs {
     push(@{$attrs->{as}}, @$adds);
   }
 
-  $attrs->{from} ||= delete $attrs->{_parent_from}
-    || [ { 'me' => $source->from } ];
+  $attrs->{from} ||= [ { 'me' => $source->from } ];
 
   if (exists $attrs->{join} || exists $attrs->{prefetch}) {
     my $join = delete $attrs->{join} || {};