From: Matt S Trout Date: Fri, 11 May 2007 02:56:11 +0000 (+0000) Subject: post-merge fixups X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=63cab14709baf8dd679bfb150e04f3a6cfcc548c;p=dbsrgits%2FDBIx-Class-Historic.git post-merge fixups --- diff --git a/lib/DBIx/Class/ResultSet.pm b/lib/DBIx/Class/ResultSet.pm index ed0f1c7..39ca196 100644 --- a/lib/DBIx/Class/ResultSet.pm +++ b/lib/DBIx/Class/ResultSet.pm @@ -98,8 +98,8 @@ sub new { $attrs->{alias} ||= 'me'; my $self = { - result_source => $source, - result_class => $attrs->{result_class} || $source->result_class, + _source_handle => $source, + result_class => $attrs->{result_class} || $source->resolve->result_class, cond => $attrs->{where}, count => undef, pager => undef, @@ -826,8 +826,6 @@ sub _collapse_result { } ); - # THIS BIT STILL NEEDS TO DO THE COLLAPSE - my $alias = $self->{attrs}{alias}; my $info = [];