diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2018-01-24 18:04:34 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-24 18:04:34 -0500 |
| commit | e981adef44b37078e7cba0b4df5ffd6cf2c3f47d (patch) | |
| tree | 6f02c47f670b414e97a11ec5382640d4e7bc9f58 /activerecord/lib/active_record/relation/merger.rb | |
| parent | a5e6f44ef63df707877d3cbcf72eccb5326ec021 (diff) | |
| parent | 6928950def1bea9d564778e734822d4f5b8bac61 (diff) | |
| download | rails-e981adef44b37078e7cba0b4df5ffd6cf2c3f47d.tar.gz rails-e981adef44b37078e7cba0b4df5ffd6cf2c3f47d.tar.bz2 rails-e981adef44b37078e7cba0b4df5ffd6cf2c3f47d.zip | |
Merge pull request #31784 from composerinteralia/relation-signature
Avoid passing unnecessary arguments to relation
Diffstat (limited to 'activerecord/lib/active_record/relation/merger.rb')
| -rw-r--r-- | activerecord/lib/active_record/relation/merger.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/relation/merger.rb b/activerecord/lib/active_record/relation/merger.rb index ebdd4144bb..25510d4a57 100644 --- a/activerecord/lib/active_record/relation/merger.rb +++ b/activerecord/lib/active_record/relation/merger.rb @@ -23,7 +23,11 @@ module ActiveRecord # build a relation to merge in rather than directly merging # the values. def other - other = Relation.create(relation.klass, relation.table, relation.predicate_builder) + other = Relation.create( + relation.klass, + table: relation.table, + predicate_builder: relation.predicate_builder + ) hash.each { |k, v| if k == :joins if Hash === v |