From: Arthur Axel "fREW" Schmidt <frioux@gmail.com>
Date: Wed, 3 Feb 2010 05:14:44 +0000 (+0000)
Subject: change deletion/overriding to fix t/76
X-Git-Tag: v0.08119~20^2~14
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=b94c914f7f427b38b3df751db512739c6ffb33d4;p=dbsrgits%2FDBIx-Class.git

change deletion/overriding to fix t/76
---

diff --git a/lib/DBIx/Class/ResultSet.pm b/lib/DBIx/Class/ResultSet.pm
index c7841e8..13c6dae 100644
--- a/lib/DBIx/Class/ResultSet.pm
+++ b/lib/DBIx/Class/ResultSet.pm
@@ -299,8 +299,12 @@ sub search_rs {
     $new_attrs->{$key} = $self->_merge_attr($our_attrs->{$key}, $attrs->{$key});
   }
 
-  if (List::Util::first { exists $new_attrs->{$_} } qw{select as columns}) {
-     delete $new_attrs->{$_} for (qw{+select +as +columns});
+  if (List::Util::first { exists $new_attrs->{$_} } qw{select as}) {
+     delete $new_attrs->{$_} for (qw{+select +as});
+  }
+
+  if (exists $new_attrs->{columns}) {
+     delete $new_attrs->{'+columns'};
   }
 
   my $cond = (@_