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

[frew at dev.catalyst.perl.org]

Author: frew
Date: 2010-02-02 18:39:33 +0000 (Tue, 02 Feb 2010)
New Revision: 8509

Modified:
   DBIx-Class/0.08/branches/chaining_fixes/lib/DBIx/Class/ResultSet.pm
Log:
delete +stuff if stuff exists

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-02 14:15:44 UTC (rev 8508)
+++ DBIx-Class/0.08/branches/chaining_fixes/lib/DBIx/Class/ResultSet.pm	2010-02-02 18:39:33 UTC (rev 8509)
@@ -299,6 +299,10 @@
     $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});
+  }
+
   my $cond = (@_
     ? (
         (@_ == 1 || ref $_[0] eq "HASH")