aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
diff options
context:
space:
mode:
authorMikhail Dieterle <MikDiet@gmail.com>2013-08-20 14:21:23 +0300
committerMikhail Dieterle <MikDiet@gmail.com>2013-08-27 15:47:21 +0300
commitc2e084ac486a715fb04d49e4c2c33f62b07535dd (patch)
treeff922f187a50e105b419d2e5d3415a826a301ee0 /activerecord/lib/active_record
parentaf3a69a783ea810d0045a6106f6c59573984f2ff (diff)
downloadrails-c2e084ac486a715fb04d49e4c2c33f62b07535dd.tar.gz
rails-c2e084ac486a715fb04d49e4c2c33f62b07535dd.tar.bz2
rails-c2e084ac486a715fb04d49e4c2c33f62b07535dd.zip
check class hierarchy with is_a? in PredicateBuilder.expand
add changelog entry for #11945
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r--activerecord/lib/active_record/relation/predicate_builder.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/relation/predicate_builder.rb b/activerecord/lib/active_record/relation/predicate_builder.rb
index 8948f2bba5..c60cd27a83 100644
--- a/activerecord/lib/active_record/relation/predicate_builder.rb
+++ b/activerecord/lib/active_record/relation/predicate_builder.rb
@@ -55,7 +55,7 @@ module ActiveRecord
#
# For polymorphic relationships, find the foreign key and type:
# PriceEstimate.where(estimate_of: treasure)
- if klass && value.class < Base && reflection = klass.reflect_on_association(column.to_sym)
+ if klass && value.is_a?(Base) && reflection = klass.reflect_on_association(column.to_sym)
if reflection.polymorphic?
queries << build(table[reflection.foreign_type], value.class.base_class)
end