[Bast-commits] r7159 - DBIx-Class/0.08/trunk/lib/DBIx/Class

[mo at dev.catalyst.perl.org]

Author: mo
Date: 2009-07-31 10:52:42 +0000 (Fri, 31 Jul 2009)
New Revision: 7159

Modified:
   DBIx-Class/0.08/trunk/lib/DBIx/Class/ResultSet.pm
Log:
undo that attributes merge stuff

Modified: DBIx-Class/0.08/trunk/lib/DBIx/Class/ResultSet.pm
===================================================================
--- DBIx-Class/0.08/trunk/lib/DBIx/Class/ResultSet.pm	2009-07-31 10:51:20 UTC (rev 7158)
+++ DBIx-Class/0.08/trunk/lib/DBIx/Class/ResultSet.pm	2009-07-31 10:52:42 UTC (rev 7159)
@@ -293,7 +293,7 @@
   my $new_attrs = { %{$our_attrs}, %{$attrs} };
 
   # merge new attrs into inherited
-  foreach my $key (qw/join order_by prefetch +select +as bind/) {
+  foreach my $key (qw/join prefetch +select +as bind/) {
     next unless exists $attrs->{$key};
     $new_attrs->{$key} = $self->_merge_attr($our_attrs->{$key}, $attrs->{$key});
   }