[Bast-commits] r8521 - DBIx-Class/0.08/branches/chaining_fixes/lib/DBIx/Class

[frew at dev.catalyst.perl.org]

Author: frew
Date: 2010-02-03 05:14:44 +0000 (Wed, 03 Feb 2010)
New Revision: 8521

Modified:
   DBIx-Class/0.08/branches/chaining_fixes/lib/DBIx/Class/ResultSet.pm
Log:
change deletion/overriding to fix t/76

Modified: DBIx-Class/0.08/branches/chaining_fixes/lib/DBIx/Class/ResultSet.pm
===================================================================
--- DBIx-Class/0.08/branches/chaining_fixes/lib/DBIx/Class/ResultSet.pm	2010-02-03 04:19:59 UTC (rev 8520)
+++ DBIx-Class/0.08/branches/chaining_fixes/lib/DBIx/Class/ResultSet.pm	2010-02-03 05:14:44 UTC (rev 8521)
@@ -299,10 +299,14 @@
     $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 = (@_
     ? (
         (@_ == 1 || ref $_[0] eq "HASH")