From: Alexander Hartmaier Date: Wed, 14 Dec 2011 10:15:44 +0000 (+0100) Subject: refactored HashRefInflators internals X-Git-Tag: v0.08197~136 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=7f7f54cd3c38aa2fe9a3687daa3ad296b6abe7e4;p=dbsrgits%2FDBIx-Class.git refactored HashRefInflators internals --- diff --git a/lib/DBIx/Class/ResultClass/HashRefInflator.pm b/lib/DBIx/Class/ResultClass/HashRefInflator.pm index a8861bd..ab7fbc7 100644 --- a/lib/DBIx/Class/ResultClass/HashRefInflator.pm +++ b/lib/DBIx/Class/ResultClass/HashRefInflator.pm @@ -64,38 +64,39 @@ recommended. # Arguments: ($me, $prefetch, $is_root) from inflate_result() below my $mk_hash; $mk_hash = sub { - if (ref $_[0] eq 'ARRAY') { # multi relationship - return [ map { $mk_hash->(@$_) || () } (@_) ]; - } - else { - my $hash = { - # the main hash could be an undef if we are processing a skipped-over join - $_[0] ? %{$_[0]} : (), - - # the second arg is a hash of arrays for each prefetched relation - map - { $_ => $mk_hash->( @{$_[1]->{$_}} ) } - ( $_[1] ? (keys %{$_[1]}) : () ) - }; - - # if there is at least one defined column *OR* we are at the root of - # the resultset - consider the result real (and not an emtpy has_many - # rel containing one empty hashref) - # an empty arrayref is an empty multi-sub-prefetch - don't consider - # those either - return $hash if $_[2]; - - for (values %$hash) { - if (ref $_ eq 'ARRAY') { - return $hash if @$_; - } - elsif (defined $_) { - return $hash; - } - } - - return undef; - } + + my $hash = { + # the main hash could be an undef if we are processing a skipped-over join + $_[0] ? %{$_[0]} : (), + + # the second arg is a hash of arrays for each prefetched relation + map { + ref $_[1]->{$_}[0] eq 'ARRAY' # multi rel or not? + ? ( $_ => [ map + { $mk_hash->(@$_) || () } + @{$_[1]->{$_}} + ] ) + : ( $_ => $mk_hash->( @{$_[1]->{$_}} ) ) + + } ( $_[1] ? ( keys %{$_[1]} ) : () ) + }; + + # if there is at least one defined column *OR* we are at the root of + # the resultset - consider the result real (and not an emtpy has_many + # rel containing one empty hashref) + # an empty arrayref is an empty multi-sub-prefetch - don't consider + # those either + return $hash if $_[2]; + + for (values %$hash) { + return $hash if ( + defined $_ + and + (ref $_ ne 'ARRAY' or scalar @$_) + ); + } + + return undef; }; =head1 METHODS @@ -110,8 +111,7 @@ Inflates the result and prefetched data into a hash-ref (invoked by Linflate_result ($resultsource_instance, $main_data_hashref, $prefetch_data_hashref) sub inflate_result { - return $mk_hash->($_[2], $_[3], 'is_root'); - + return $mk_hash->($_[2], $_[3], 'is_root'); }