X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FResultSet.pm;h=31bc5b447f059aedbd17724f1ac96300cceb0688;hb=dc7bcc465e3c824e46290fc802739b1e29892512;hp=e0e1686da4ff95a9261ccfd8e76e221f7f7da2c6;hpb=9778825002ff852ea42a4d1670c4c5e9e24befa6;p=dbsrgits%2FDBIx-Class-Historic.git diff --git a/lib/DBIx/Class/ResultSet.pm b/lib/DBIx/Class/ResultSet.pm index e0e1686..31bc5b4 100644 --- a/lib/DBIx/Class/ResultSet.pm +++ b/lib/DBIx/Class/ResultSet.pm @@ -1796,7 +1796,10 @@ sub populate { } else { my ($first, @rest) = @$data; - my @names = grep {!ref $first->{$_}} keys %$first; + my @names = grep { + (not ref $first->{$_}) || (ref $first->{$_} eq 'SCALAR') + } keys %$first; + my @rels = grep { $self->result_source->has_relationship($_) } keys %$first; my @pks = $self->result_source->primary_columns;