X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FResultSource%2FRowParser.pm;fp=lib%2FDBIx%2FClass%2FResultSource%2FRowParser.pm;h=fa69299f8dd22565ba5b2e5009a0b92b198a4089;hb=5b3090637dc0ea8949627267561820b43ff8e1cb;hp=e3f63585646c10d059a38b1ac0b5479d6db20047;hpb=a6ef93cbf8182ed257e5a5e877835694a23b4e74;p=dbsrgits%2FDBIx-Class.git

diff --git a/lib/DBIx/Class/ResultSource/RowParser.pm b/lib/DBIx/Class/ResultSource/RowParser.pm
index e3f6358..fa69299 100644
--- a/lib/DBIx/Class/ResultSource/RowParser.pm
+++ b/lib/DBIx/Class/ResultSource/RowParser.pm
@@ -93,7 +93,9 @@ sub _resolve_prefetch {
 # any sort of adjustment/rewrite should be relatively easy (fsvo relatively)
 #
 sub _mk_row_parser {
-  my ($self, $args) = @_;
+  # $args and $attrs are seperated to delineate what is core collapser stuff and
+  # what is dbic $rs specific
+  my ($self, $args, $attrs) = @_;
 
   die "HRI without pruning makes zero sense"
   if ( $args->{hri_style} && ! $args->{prune_null_branches} );
@@ -120,7 +122,7 @@ sub _mk_row_parser {
         # (it is now trivial as the attrs specify where things go out of sync
         # needs MOAR tests)
         as => { map
-          { ref $args->{selection}[$common{val_index}{$_}] ? () : ( $_ => $common{val_index}{$_} ) }
+          { ref $attrs->{select}[$common{val_index}{$_}] ? () : ( $_ => $common{val_index}{$_} ) }
           keys %{$common{val_index}}
         },
         premultiplied => $args->{premultiplied},