[Bast-commits] r6886 - in DBIx-Class/0.08/branches: . extended_rels/lib/DBIx/Class

[mo at dev.catalyst.perl.org]

Author: mo
Date: 2009-06-30 17:14:12 +0000 (Tue, 30 Jun 2009)
New Revision: 6886

Added:
   DBIx-Class/0.08/branches/extended_rels/
Modified:
   DBIx-Class/0.08/branches/extended_rels/lib/DBIx/Class/ResultSet.pm
Log:


Copied: DBIx-Class/0.08/branches/extended_rels (from rev 6885, DBIx-Class/0.08/trunk)

Modified: DBIx-Class/0.08/branches/extended_rels/lib/DBIx/Class/ResultSet.pm
===================================================================
--- DBIx-Class/0.08/trunk/lib/DBIx/Class/ResultSet.pm	2009-06-30 15:39:58 UTC (rev 6885)
+++ DBIx-Class/0.08/branches/extended_rels/lib/DBIx/Class/ResultSet.pm	2009-06-30 17:14:12 UTC (rev 6886)
@@ -293,7 +293,7 @@
   my $new_attrs = { %{$our_attrs}, %{$attrs} };
 
   # merge new attrs into inherited
-  foreach my $key (qw/join prefetch +select +as bind/) {
+  foreach my $key (qw/join order_by prefetch +select +as bind/) {
     next unless exists $attrs->{$key};
     $new_attrs->{$key} = $self->_merge_attr($our_attrs->{$key}, $attrs->{$key});
   }