aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2018-06-20 21:28:00 +0900
committerRyuta Kamizono <kamipo@gmail.com>2018-06-20 21:28:00 +0900
commitc4b58af36f30e7924c8247511519f384a426ae93 (patch)
tree5a4f35790c2a6f9469567bdf34a694da93a5307c
parent716f2e09c23e48716460027b78d2133bce0cdf3e (diff)
downloadrails-c4b58af36f30e7924c8247511519f384a426ae93.tar.gz
rails-c4b58af36f30e7924c8247511519f384a426ae93.tar.bz2
rails-c4b58af36f30e7924c8247511519f384a426ae93.zip
Remove unused `rs` argument from `JoinDependency#construct`
It was no longer used since d7ddaa530fd1b94e22d745cbaf2e8a5a34ee9734.
-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 3b0b2ea050..c79ea598a0 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, result_set, seen, model_cache, aliases)
+ construct(parent, join_root, row_hash, seen, model_cache, aliases)
}
end
@@ -204,7 +204,7 @@ module ActiveRecord
end
end
- def construct(ar_parent, parent, row, rs, seen, model_cache, aliases)
+ def construct(ar_parent, parent, row, seen, model_cache, aliases)
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, rs, seen, model_cache, aliases)
+ construct(model, node, row, seen, model_cache, aliases)
next
end
@@ -228,7 +228,7 @@ module ActiveRecord
model = seen[ar_parent.object_id][node.base_klass][id]
if model
- construct(model, node, row, rs, seen, model_cache, aliases)
+ construct(model, node, row, seen, model_cache, aliases)
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, rs, seen, model_cache, aliases)
+ construct(model, node, row, seen, model_cache, aliases)
end
end
end