diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2013-10-10 10:11:18 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2013-10-10 10:11:18 -0700 |
| commit | e4ec9ce78d879fc20bae0c5c7886a3bdbfab096c (patch) | |
| tree | ef17a84d6203844d5e2b9af6196262ea231d787f /activerecord | |
| parent | 82d81bbfcb4d0d895e9ba059f33a3495879bc660 (diff) | |
| download | rails-e4ec9ce78d879fc20bae0c5c7886a3bdbfab096c.tar.gz rails-e4ec9ce78d879fc20bae0c5c7886a3bdbfab096c.tar.bz2 rails-e4ec9ce78d879fc20bae0c5c7886a3bdbfab096c.zip | |
stop splatting things back and forth
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/associations/join_dependency.rb | 2 | ||||
| -rw-r--r-- | activerecord/lib/active_record/relation/query_methods.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/associations/join_dependency.rb b/activerecord/lib/active_record/associations/join_dependency.rb index e2d4cf4378..fb5c7ff374 100644 --- a/activerecord/lib/active_record/associations/join_dependency.rb +++ b/activerecord/lib/active_record/associations/join_dependency.rb @@ -61,7 +61,7 @@ module ActiveRecord build tree, @join_root, Arel::InnerJoin end - def graft(*associations) + def graft(associations) associations.reject { |join_node| find_node join_node }.each { |join_node| diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb index e1efc6a189..776360fc55 100644 --- a/activerecord/lib/active_record/relation/query_methods.rb +++ b/activerecord/lib/active_record/relation/query_methods.rb @@ -950,7 +950,7 @@ module ActiveRecord join_list ) - join_dependency.graft(*stashed_association_joins) + join_dependency.graft(stashed_association_joins) joins = join_dependency.join_constraints |