diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-08-27 07:51:30 -0700 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-08-27 07:51:30 -0700 |
commit | a10e2f17cac3aec0ae309a501fab3384e8bfe99c (patch) | |
tree | cf28d0b34d11c1b116d1bb43c78371ef0753ecd6 /activerecord/lib | |
parent | 182f1d13aaaf716f873e385482d0092d126a531d (diff) | |
parent | c2e084ac486a715fb04d49e4c2c33f62b07535dd (diff) | |
download | rails-a10e2f17cac3aec0ae309a501fab3384e8bfe99c.tar.gz rails-a10e2f17cac3aec0ae309a501fab3384e8bfe99c.tar.bz2 rails-a10e2f17cac3aec0ae309a501fab3384e8bfe99c.zip |
Merge pull request #11945 from Mik-die/polymorphic-decorator
check class hierarchy with is_a? in PredicateBuilder.expand
Diffstat (limited to 'activerecord/lib')
-rw-r--r-- | activerecord/lib/active_record/relation/predicate_builder.rb | 2 |
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 |