From: Peter Rabbitson Date: Wed, 24 Jun 2009 09:08:02 +0000 (+0000) Subject: Properly name the relinfo variable X-Git-Tag: v0.08108~65 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=164efde326393118b39eed56843d41b45b0cad83;p=dbsrgits%2FDBIx-Class.git Properly name the relinfo variable --- diff --git a/lib/DBIx/Class/Relationship/Base.pm b/lib/DBIx/Class/Relationship/Base.pm index 8c2e4fd..8f02598 100644 --- a/lib/DBIx/Class/Relationship/Base.pm +++ b/lib/DBIx/Class/Relationship/Base.pm @@ -176,13 +176,13 @@ sub related_resultset { $self->throw_exception("Can't call *_related as class methods") unless ref $self; my $rel = shift; - my $rel_obj = $self->relationship_info($rel); + my $rel_info = $self->relationship_info($rel); $self->throw_exception( "No such relationship ${rel}" ) - unless $rel_obj; + unless $rel_info; return $self->{related_resultsets}{$rel} ||= do { my $attrs = (@_ > 1 && ref $_[$#_] eq 'HASH' ? pop(@_) : {}); - $attrs = { %{$rel_obj->{attrs} || {}}, %$attrs }; + $attrs = { %{$rel_info->{attrs} || {}}, %$attrs }; $self->throw_exception( "Invalid query: @_" ) if (@_ > 1 && (@_ % 2 == 1)); @@ -190,7 +190,7 @@ sub related_resultset { my $source = $self->result_source; my $cond = $source->_resolve_condition( - $rel_obj->{cond}, $rel, $self + $rel_info->{cond}, $rel, $self ); if ($cond eq $DBIx::Class::ResultSource::UNRESOLVABLE_CONDITION) { my $reverse = $source->reverse_relationship_info($rel); @@ -390,22 +390,22 @@ set them in the storage. sub set_from_related { my ($self, $rel, $f_obj) = @_; - my $rel_obj = $self->relationship_info($rel); - $self->throw_exception( "No such relationship ${rel}" ) unless $rel_obj; - my $cond = $rel_obj->{cond}; + my $rel_info = $self->relationship_info($rel); + $self->throw_exception( "No such relationship ${rel}" ) unless $rel_info; + my $cond = $rel_info->{cond}; $self->throw_exception( "set_from_related can only handle a hash condition; the ". "condition for $rel is of type ". (ref $cond ? ref $cond : 'plain scalar') ) unless ref $cond eq 'HASH'; if (defined $f_obj) { - my $f_class = $rel_obj->{class}; + my $f_class = $rel_info->{class}; $self->throw_exception( "Object $f_obj isn't a ".$f_class ) unless Scalar::Util::blessed($f_obj) and $f_obj->isa($f_class); } $self->set_columns( $self->result_source->_resolve_condition( - $rel_obj->{cond}, $f_obj, $rel)); + $rel_info->{cond}, $f_obj, $rel)); return 1; }