aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/core.rb
diff options
context:
space:
mode:
authorSean Griffin <sean@seantheprogrammer.com>2015-10-20 15:25:29 -0600
committerSean Griffin <sean@seantheprogrammer.com>2015-10-20 15:25:29 -0600
commit0a6c4019dfebb1c46d8c16c89238a05a6fdc9f1d (patch)
tree04b08b1a07a11f4db329c82cc2229b8decaafe23 /activerecord/lib/active_record/core.rb
parent7b92798d2fee012bf683c513fb3864a9143a6f71 (diff)
parentf798cbd2f36ed8a4b825667016d6975b812a5b9f (diff)
downloadrails-0a6c4019dfebb1c46d8c16c89238a05a6fdc9f1d.tar.gz
rails-0a6c4019dfebb1c46d8c16c89238a05a6fdc9f1d.tar.bz2
rails-0a6c4019dfebb1c46d8c16c89238a05a6fdc9f1d.zip
Merge pull request #20957 from akihiro17/find-by-issue
Fix find_by with association subquery issue
Diffstat (limited to 'activerecord/lib/active_record/core.rb')
-rw-r--r--activerecord/lib/active_record/core.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/core.rb b/activerecord/lib/active_record/core.rb
index db3e9d1d52..142b6e8599 100644
--- a/activerecord/lib/active_record/core.rb
+++ b/activerecord/lib/active_record/core.rb
@@ -177,7 +177,7 @@ module ActiveRecord
hash = args.first
return super if hash.values.any? { |v|
- v.nil? || Array === v || Hash === v
+ v.nil? || Array === v || Hash === v || Relation === v
}
# We can't cache Post.find_by(author: david) ...yet