aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorkennyj <kennyj@gmail.com>2012-06-07 12:55:39 +0900
committerkennyj <kennyj@gmail.com>2012-06-10 23:55:42 +0900
commitcd1be1acc68221fbdfab0d13211d40bdeae630dc (patch)
treea87fc3fafbe6f07a9221ff69f30812eaf58c5d49 /activerecord/lib
parent42259f69ae3fa2daacfb751dbc663adb14159e37 (diff)
downloadrails-cd1be1acc68221fbdfab0d13211d40bdeae630dc.tar.gz
rails-cd1be1acc68221fbdfab0d13211d40bdeae630dc.tar.bz2
rails-cd1be1acc68221fbdfab0d13211d40bdeae630dc.zip
Fix #6635. We should call Scoping methods, before calling Array methods.
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/active_record/relation/delegation.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/activerecord/lib/active_record/relation/delegation.rb b/activerecord/lib/active_record/relation/delegation.rb
index f5fdf437bf..64dda4f35a 100644
--- a/activerecord/lib/active_record/relation/delegation.rb
+++ b/activerecord/lib/active_record/relation/delegation.rb
@@ -32,12 +32,12 @@ module ActiveRecord
protected
def method_missing(method, *args, &block)
- if Array.method_defined?(method)
- ::ActiveRecord::Delegation.delegate method, :to => :to_a
- to_a.send(method, *args, &block)
- elsif @klass.respond_to?(method)
+ if @klass.respond_to?(method)
::ActiveRecord::Delegation.delegate_to_scoped_klass(method)
scoping { @klass.send(method, *args, &block) }
+ elsif Array.method_defined?(method)
+ ::ActiveRecord::Delegation.delegate method, :to => :to_a
+ to_a.send(method, *args, &block)
elsif arel.respond_to?(method)
::ActiveRecord::Delegation.delegate method, :to => :arel
arel.send(method, *args, &block)
@@ -46,4 +46,4 @@ module ActiveRecord
end
end
end
-end \ No newline at end of file
+end