From: Moritz Onken <onken@netcubed.de>
Date: Fri, 31 Jul 2009 10:52:42 +0000 (+0000)
Subject: undo that attributes merge stuff
X-Git-Tag: v0.08109~56
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=cbdbd31188c7d4ed5c36314b2c6c3e5ce93ffef8;p=dbsrgits%2FDBIx-Class.git

undo that attributes merge stuff
---

diff --git a/lib/DBIx/Class/ResultSet.pm b/lib/DBIx/Class/ResultSet.pm
index 09bd12c..b7ba496 100644
--- a/lib/DBIx/Class/ResultSet.pm
+++ b/lib/DBIx/Class/ResultSet.pm
@@ -293,7 +293,7 @@ sub search_rs {
   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});
   }