diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2018-01-14 07:31:38 +0900 |
|---|---|---|
| committer | Ryuta Kamizono <kamipo@gmail.com> | 2018-01-14 07:31:38 +0900 |
| commit | 192e74fc6051d9aae181e27faa86b142e6d1a285 (patch) | |
| tree | 6d828e8c407d2bdb7057f4a3691017aac5ce7e48 /activerecord | |
| parent | e9c16536d462503abd37e0ce5c34032fc1e39fdb (diff) | |
| download | rails-192e74fc6051d9aae181e27faa86b142e6d1a285.tar.gz rails-192e74fc6051d9aae181e27faa86b142e6d1a285.tar.bz2 rails-192e74fc6051d9aae181e27faa86b142e6d1a285.zip | |
Don't need to pass `manager` to `convert_join_strings_to_ast`
Because `Relation` already have Arel `table`.
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/relation/query_methods.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb index 009624e194..29829cd8a0 100644 --- a/activerecord/lib/active_record/relation/query_methods.rb +++ b/activerecord/lib/active_record/relation/query_methods.rb @@ -1013,7 +1013,7 @@ module ActiveRecord join_nodes = buckets[:join_node].uniq string_joins = buckets[:string_join].map(&:strip).uniq - join_list = join_nodes + convert_join_strings_to_ast(manager, string_joins) + join_list = join_nodes + convert_join_strings_to_ast(string_joins) alias_tracker = alias_tracker(join_list, aliases) join_dependency = ActiveRecord::Associations::JoinDependency.new( @@ -1028,7 +1028,7 @@ module ActiveRecord alias_tracker.aliases end - def convert_join_strings_to_ast(table, joins) + def convert_join_strings_to_ast(joins) joins .flatten .reject(&:blank?) |