diff options
| author | Yves Senn <yves.senn@gmail.com> | 2013-07-14 12:22:52 -0700 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2013-07-14 12:22:52 -0700 |
| commit | 5979bc9e11d68e11458a27037edffaa368990f27 (patch) | |
| tree | 73c8dbcb36eac84fe94195dc786b275b9db45454 /activerecord/lib/active_record/relation/query_methods.rb | |
| parent | 648afea0e4addcaaf6da31cba78b94d7681706a4 (diff) | |
| parent | e2d82508148fc4e3d507f70ed236414a75c58672 (diff) | |
| download | rails-5979bc9e11d68e11458a27037edffaa368990f27.tar.gz rails-5979bc9e11d68e11458a27037edffaa368990f27.tar.bz2 rails-5979bc9e11d68e11458a27037edffaa368990f27.zip | |
Merge pull request #11439 from ernie/only-scan-strings-for-nodes
Blacklist->whitelist for reference scans in order!
Diffstat (limited to 'activerecord/lib/active_record/relation/query_methods.rb')
| -rw-r--r-- | activerecord/lib/active_record/relation/query_methods.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb index 1327cc3c34..a27b6abe2e 100644 --- a/activerecord/lib/active_record/relation/query_methods.rb +++ b/activerecord/lib/active_record/relation/query_methods.rb @@ -280,7 +280,7 @@ module ActiveRecord args.flatten! validate_order_args args - references = args.reject { |arg| Arel::Node === arg } + references = args.grep(String) references.map! { |arg| arg =~ /^([a-zA-Z]\w*)\.(\w+)/ && $1 }.compact! references!(references) if references.any? |