From e6f6fbc5c7bd12ac0c122cdfdfc448329919e603 Mon Sep 17 00:00:00 2001 From: Nick Kallen Date: Fri, 11 Apr 2008 13:48:18 -0700 Subject: refactored bind for order --- lib/active_relation/relations/order.rb | 3 ++- lib/active_relation/relations/relation.rb | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/active_relation/relations/order.rb b/lib/active_relation/relations/order.rb index bfd05f48b3..95b73c5e90 100644 --- a/lib/active_relation/relations/order.rb +++ b/lib/active_relation/relations/order.rb @@ -3,8 +3,9 @@ module ActiveRelation attr_reader :order def initialize(relation, *orders) - @order = orders.pop + order = orders.pop @relation = orders.empty?? relation : Order.new(relation, *orders) + @order = order.bind(@relation) end def ==(other) diff --git a/lib/active_relation/relations/relation.rb b/lib/active_relation/relations/relation.rb index f7e47c2e50..36c13bec51 100644 --- a/lib/active_relation/relations/relation.rb +++ b/lib/active_relation/relations/relation.rb @@ -50,7 +50,7 @@ module ActiveRelation end def order(*attributes) - Order.new(self, *attributes.collect {|a| a.bind(self)}) + Order.new(self, *attributes) end def rename(attribute, aliaz) -- cgit v1.2.3