From: Peter Rabbitson <ribasushi@cpan.org>
Date: Thu, 24 Mar 2016 14:35:51 +0000 (+0100)
Subject: Remove some old forgotten pieces of code in collapse resolver
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=27f3e97d85a38736e91d30f2b78195be898316d9;p=dbsrgits%2FDBIx-Class.git

Remove some old forgotten pieces of code in collapse resolver
---

diff --git a/lib/DBIx/Class/ResultSource/RowParser.pm b/lib/DBIx/Class/ResultSource/RowParser.pm
index 83be406..aaa02fb 100644
--- a/lib/DBIx/Class/ResultSource/RowParser.pm
+++ b/lib/DBIx/Class/ResultSource/RowParser.pm
@@ -225,7 +225,7 @@ sub _resolve_collapse {
   if ( ! $args->{_parent_info}{underdefined} and ! $args->{_parent_info}{rev_rel_is_optional} ) {
     for my $col ( values %{$args->{_parent_info}{rel_condition} || {}} ) {
       next if exists $my_cols->{$col};
-      $my_cols->{$col} = { via_collapse => $args->{_parent_info}{collapse_on_idcols} };
+      $my_cols->{$col} = {};
       $assumed_from_parent->{columns}{$col}++;
     }
   }
@@ -402,7 +402,6 @@ sub _resolve_collapse {
     @{ $collapse_map->{-identifying_columns} },
   )];
 
-  my @id_sets;
   for my $rel (sort keys %$relinfo) {
 
     $collapse_map->{$rel} = $relinfo->{$rel}{rsrc}->_resolve_collapse ({
diff --git a/t/resultset/rowparser_internals.t b/t/resultset/rowparser_internals.t
index 235e5d4..3f6c38a 100644
--- a/t/resultset/rowparser_internals.t
+++ b/t/resultset/rowparser_internals.t
@@ -9,14 +9,6 @@ use DBICTest;
 use B::Deparse;
 use DBIx::Class::_Util 'perlstring';
 
-# globally set for the rest of test
-# the rowparser maker does not order its hashes by default for the miniscule
-# speed gain. But it does not disable sorting either - for this test
-# everything will be ordered nicely, and the hash randomization of 5.18
-# will not trip up anything
-use Data::Dumper;
-$Data::Dumper::Sortkeys = 1;
-
 my $schema = DBICTest->init_schema(no_deploy => 1);
 my $infmap = [qw/
   single_track.cd.artist.name