diff options
| author | Sean Griffin <sean@seantheprogrammer.com> | 2017-07-18 13:42:57 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-18 13:42:57 -0400 |
| commit | 36ff7b63ec083924a5b407cf3df7ae90e22183e2 (patch) | |
| tree | 8cbdbe138f13a0dc7c3666f036fda685c644d262 /activerecord/lib/active_record/relation/merger.rb | |
| parent | 425ba83c28214ca97c5d3600c16ad7a796cd33e6 (diff) | |
| parent | f47bac481949a69a519ea7d833e1a8d435332d52 (diff) | |
| download | rails-36ff7b63ec083924a5b407cf3df7ae90e22183e2.tar.gz rails-36ff7b63ec083924a5b407cf3df7ae90e22183e2.tar.bz2 rails-36ff7b63ec083924a5b407cf3df7ae90e22183e2.zip | |
Merge branch 'master' into fix_unscope_where_column_with_or
Diffstat (limited to 'activerecord/lib/active_record/relation/merger.rb')
| -rw-r--r-- | activerecord/lib/active_record/relation/merger.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/relation/merger.rb b/activerecord/lib/active_record/relation/merger.rb index 5dac00724a..6251f6fc33 100644 --- a/activerecord/lib/active_record/relation/merger.rb +++ b/activerecord/lib/active_record/relation/merger.rb @@ -119,9 +119,10 @@ module ActiveRecord end end - join_dependency = ActiveRecord::Associations::JoinDependency.new(other.klass, - joins_dependency, - []) + join_dependency = ActiveRecord::Associations::JoinDependency.new( + other.klass, other.table, joins_dependency, [] + ) + relation.joins! rest @relation = relation.joins join_dependency |