From 9a661e660bc39099c61e23fe26ec2d2b7f21fce9 Mon Sep 17 00:00:00 2001 From: Daniel Luz Date: Mon, 1 Dec 2008 02:03:18 -0200 Subject: [PATCH] Don't modify the elements in the scoped_methods stack in find_last Instead, temporarily reverse the current scope's order. --- activerecord/lib/active_record/base.rb | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index 9e45143..825a192 100755 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -1466,11 +1466,18 @@ module ActiveRecord #:nodoc: end if scoped?(:find, :order) - scoped_order = reverse_sql_order(scope(:find, :order)) - scoped_methods.select { |s| s[:find].update(:order => scoped_order) } + scope = scope(:find) + old_scoped_order = scope[:order] + scope[:order] = reverse_sql_order(old_scoped_order) + else + scope = nil end - find_initial(options.merge({ :order => order })) + begin + find_initial(options.merge({ :order => order })) + ensure + scope[:order] = old_scoped_order if scope + end end def reverse_sql_order(order_query) -- 1.6.0.4