X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FResultSetColumn.pm;h=e11f86849ab9365ce98cabfb788eeed4ed6beb15;hb=28326f85ed420cb42398d12d1d85839eb4cffa7d;hp=c19a7c0e7b20524b9f8acbc836044c1bb940ab74;hpb=0d5e6c6c1d33e60058dd1cd32b50a67cee5ad381;p=dbsrgits%2FDBIx-Class.git diff --git a/lib/DBIx/Class/ResultSetColumn.pm b/lib/DBIx/Class/ResultSetColumn.pm index c19a7c0..e11f868 100644 --- a/lib/DBIx/Class/ResultSetColumn.pm +++ b/lib/DBIx/Class/ResultSetColumn.pm @@ -83,11 +83,6 @@ sub new { $new_parent_rs ||= $rs->search_rs; my $new_attrs = $new_parent_rs->{attrs} ||= {}; - # FIXME - this should go away when the chaining branch is merged - # since what we do is actually chain to the original resultset, we need to throw - # away all selectors (otherwise they'll chain) - delete $new_attrs->{$_} for (qw/columns +columns select +select as +as cols include_columns/); - # prefetch causes additional columns to be fetched, but we can not just make a new # rs via the _resolved_attrs trick - we need to retain the separation between # +select/+as and select/as. At the same time we want to preserve any joins that the