diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-06-10 08:45:28 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-06-10 15:30:25 -0300 |
| commit | 5dfb01e25b68b8d0b184c861405ba2789343302f (patch) | |
| tree | 0edf3ae3d05bad186b22f234fd89bae94c3c8662 /activerecord/lib/active_record/relation | |
| parent | 6cc941dedbc435efa65cce896e7c6bf5fa519e99 (diff) | |
| download | rails-5dfb01e25b68b8d0b184c861405ba2789343302f.tar.gz rails-5dfb01e25b68b8d0b184c861405ba2789343302f.tar.bz2 rails-5dfb01e25b68b8d0b184c861405ba2789343302f.zip | |
Merge pull request #6695 from kennyj/fix_6635
Fix #6635. We should call Scoping methods, before calling Array methods.
Diffstat (limited to 'activerecord/lib/active_record/relation')
| -rw-r--r-- | activerecord/lib/active_record/relation/delegation.rb | 10 |
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 |