diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2013-10-03 11:14:19 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2013-10-03 11:14:19 -0700 |
| commit | 31c79e291f42b1d862df06c552fe002864aae705 (patch) | |
| tree | 52f4b4e25d370ad5b017259e4a2cb01f48c4c6b9 /activerecord/lib/active_record/relation | |
| parent | 83c4b0a7f977b75a9005ceb78d8a2a719392d904 (diff) | |
| parent | cf1904f65bffcf6833903d4a30770eddc5713486 (diff) | |
| download | rails-31c79e291f42b1d862df06c552fe002864aae705.tar.gz rails-31c79e291f42b1d862df06c552fe002864aae705.tar.bz2 rails-31c79e291f42b1d862df06c552fe002864aae705.zip | |
Merge pull request #12084 from Ben-M/3-2-stable
Fix STI scopes using benolee's suggestion. Fixes #11939
Diffstat (limited to 'activerecord/lib/active_record/relation')
| -rw-r--r-- | activerecord/lib/active_record/relation/spawn_methods.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/relation/spawn_methods.rb b/activerecord/lib/active_record/relation/spawn_methods.rb index b734fc5c51..93fa30eb38 100644 --- a/activerecord/lib/active_record/relation/spawn_methods.rb +++ b/activerecord/lib/active_record/relation/spawn_methods.rb @@ -151,7 +151,7 @@ module ActiveRecord values = other.joins_values return if values.blank? - if other.klass == relation.klass + if other.klass >= relation.klass relation.joins_values += values else joins_dependency, rest = values.partition do |join| |