aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2018-06-20 21:44:16 +0900
committerRyuta Kamizono <kamipo@gmail.com>2018-06-20 21:44:16 +0900
commit15367a2c674bf19eeefa12ccb64391bdd50d883d (patch)
treeb3610919695ca82bb829b923c7670f4863f34f68
parentc4b58af36f30e7924c8247511519f384a426ae93 (diff)
downloadrails-15367a2c674bf19eeefa12ccb64391bdd50d883d.tar.gz
rails-15367a2c674bf19eeefa12ccb64391bdd50d883d.tar.bz2
rails-15367a2c674bf19eeefa12ccb64391bdd50d883d.zip
Remove useless `aliases` argument from `JoinDependency#construct`
Since `aliases` is a part of `JoinDependency` and already cached at 1a723c65bbe91ad969b67416233d20eff6d2a46a.
-rw-r--r--activerecord/lib/active_record/associations/join_dependency.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/activerecord/lib/active_record/associations/join_dependency.rb b/activerecord/lib/active_record/associations/join_dependency.rb
index c79ea598a0..77792017aa 100644
--- a/activerecord/lib/active_record/associations/join_dependency.rb
+++ b/activerecord/lib/active_record/associations/join_dependency.rb
@@ -116,7 +116,7 @@ module ActiveRecord
result_set.each { |row_hash|
parent_key = primary_key ? row_hash[primary_key] : row_hash
parent = parents[parent_key] ||= join_root.instantiate(row_hash, column_aliases, &block)
- construct(parent, join_root, row_hash, seen, model_cache, aliases)
+ construct(parent, join_root, row_hash, seen, model_cache)
}
end
@@ -204,7 +204,7 @@ module ActiveRecord
end
end
- def construct(ar_parent, parent, row, seen, model_cache, aliases)
+ def construct(ar_parent, parent, row, seen, model_cache)
return if ar_parent.nil?
parent.children.each do |node|
@@ -213,7 +213,7 @@ module ActiveRecord
other.loaded!
elsif ar_parent.association_cached?(node.reflection.name)
model = ar_parent.association(node.reflection.name).target
- construct(model, node, row, seen, model_cache, aliases)
+ construct(model, node, row, seen, model_cache)
next
end
@@ -228,7 +228,7 @@ module ActiveRecord
model = seen[ar_parent.object_id][node.base_klass][id]
if model
- construct(model, node, row, seen, model_cache, aliases)
+ construct(model, node, row, seen, model_cache)
else
model = construct_model(ar_parent, node, row, model_cache, id, aliases)
@@ -238,7 +238,7 @@ module ActiveRecord
end
seen[ar_parent.object_id][node.base_klass][id] = model
- construct(model, node, row, seen, model_cache, aliases)
+ construct(model, node, row, seen, model_cache)
end
end
end