X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FResultClass%2FHashRefInflator.pm;h=6d019ad83cc5441811d9d2b888858e81fb5eac84;hb=9e34d55419481925691c7177d43ba48ec02b02eb;hp=9bbf65bd8878548f4048288f78ca58defe2863b0;hpb=a5b293612996cda25ce7e7bf1a5a5a23249c7b01;p=dbsrgits%2FDBIx-Class-Historic.git

diff --git a/lib/DBIx/Class/ResultClass/HashRefInflator.pm b/lib/DBIx/Class/ResultClass/HashRefInflator.pm
index 9bbf65b..6d019ad 100644
--- a/lib/DBIx/Class/ResultClass/HashRefInflator.pm
+++ b/lib/DBIx/Class/ResultClass/HashRefInflator.pm
@@ -5,18 +5,14 @@ use warnings;
 
 =head1 NAME
 
-DBIx::Class::ResultClass::HashRefInflator
+DBIx::Class::ResultClass::HashRefInflator - Get raw hashrefs from a resultset
 
 =head1 SYNOPSIS
 
  use DBIx::Class::ResultClass::HashRefInflator;
 
  my $rs = $schema->resultset('CD');
-
  $rs->result_class('DBIx::Class::ResultClass::HashRefInflator');
-    or
- $rs->result_class(DBIx::Class::ResultClass::HashRefInflator->new (%args));
-
  while (my $hashref = $rs->next) {
     ...
  }
@@ -29,24 +25,6 @@ from a massive resultset, while skipping the creation of fancy row objects.
 Specifying this class as a C<result_class> for a resultset will change C<< $rs->next >>
 to return a plain data hash-ref (or a list of such hash-refs if C<< $rs->all >> is used).
 
-There are two ways of using this class:
-
-=over
-
-=item *
-
-Supply an instance of DBIx::Class::ResultClass::HashRefInflator to
-C<< $rs->result_class >>. See L</ARGUMENTS> for a list of valid
-arguments to new().
-
-=item *
-
-Another way is to simply supply the class name as a string to
-C<< $rs->result_class >>. Equivalent to passing
-DBIx::Class::ResultClass::HashRefInflator->new().
-
-=back
-
 There are two ways of applying this class to a resultset:
 
 =over
@@ -95,99 +73,34 @@ $mk_hash = sub {
 
         # if there is at least one defined column consider the resultset 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
         for (values %$hash) {
-            return $hash if defined $_;
-        }
-
-        return undef;
-    }
-};
-
-# This is the inflator
-my $inflate_hash;
-$inflate_hash = sub {
-    my ($hri_instance, $schema, $rc, $data) = @_;
-
-    foreach my $column (keys %{$data}) {
-
-        if (ref $data->{$column} eq 'HASH') {
-            $inflate_hash->($hri_instance, $schema, $schema->source ($rc)->related_class ($column), $data->{$column});
-        } 
-        elsif (ref $data->{$column} eq 'ARRAY') {
-            foreach my $rel (@{$data->{$column}}) {
-                $inflate_hash->($hri_instance, $schema, $schema->source ($rc)->related_class ($column), $rel);
+            if (ref $_ eq 'ARRAY') {
+              return $hash if @$_;
             }
-        }
-        else {
-            # "null is null is null"
-            next if not defined $data->{$column};
-
-            # cache the inflator coderef
-            unless (exists $hri_instance->{_inflator_cache}{$rc}{$column}) {
-                $hri_instance->{_inflator_cache}{$rc}{$column} = exists $schema->source ($rc)->_relationships->{$column}
-                    ? undef     # currently no way to inflate a column sharing a name with a rel 
-                    : $rc->column_info($column)->{_inflate_info}{inflate}
-                ;
-            }
-
-            if ($hri_instance->{_inflator_cache}{$rc}{$column}) {
-                $data->{$column} = $hri_instance->{_inflator_cache}{$rc}{$column}->($data->{$column});
+            elsif (defined $_) {
+              return $hash;
             }
         }
+
+        return undef;
     }
 };
 
-
 =head1 METHODS
 
-=head2 new
-
- $class->new( %args );
- $class->new({ %args });
-
-Creates a new DBIx::Class::ResultClass::HashRefInflator object. Takes the following
-arguments:
-
-=over
-
-=item inflate_columns
-
-Sometimes you still want all your data to be inflated to the corresponding 
-objects according to the rules you defined in your table classes (e.g. you
-want all dates in the resulting hash to be replaced with the equivalent 
-DateTime objects). Supplying C<< inflate_columns => 1 >> to the constructor will
-interrogate the processed columns and apply any inflation methods declared 
-via L<DBIx::Class::InflateColumn/inflate_column> to the contents of the 
-resulting hash-ref.
-
-=back
-
-=cut
-
-sub new {
-    my $self = shift;
-    my $args = { (ref $_[0] eq 'HASH') ? %{$_[0]} : @_ };
-    return bless ($args, $self)
-}
-
 =head2 inflate_result
 
 Inflates the result and prefetched data into a hash-ref (invoked by L<DBIx::Class::ResultSet>)
 
 =cut
 
-
+##################################################################################
+# inflate_result is invoked as:
+# HRI->inflate_result ($resultsource_instance, $main_data_hashref, $prefetch_data_hashref)
 sub inflate_result {
-    my ($self, $source, $me, $prefetch) = @_;
-
-    my $hashref = $mk_hash->($me, $prefetch);
-
-    # if $self is an instance and inflate_columns is set
-    if ( (ref $self) and $self->{inflate_columns} ) {
-        $inflate_hash->($self, $source->schema, $source->result_class, $hashref);
-    }
-
-    return $hashref;
+    return $mk_hash->($_[2], $_[3]);
 }
 
 
@@ -212,9 +125,9 @@ relations to be inflated when the master C<$artist> row is inflated.
 
 =item *
 
-When using C<inflate_columns>, the inflation method lookups are cached in the
-HashRefInflator object for additional speed. If you modify column inflators at run
-time, make sure to grab a new instance of this class to avoid cached surprises.
+Column value inflation, e.g., using modules like
+L<DBIx::Class::InflateColumn::DateTime>, is not performed.
+The returned hash contains the raw database values.
 
 =back