From 94360451eae2701fc04d6b132c44d9622bbe0cb5 Mon Sep 17 00:00:00 2001 From: Ryuta Kamizono Date: Wed, 20 Jun 2018 21:52:09 +0900 Subject: Remove all `aliases` passing from `JoinDependency` Follow up of 15367a2c674bf19eeefa12ccb64391bdd50d883d. --- activerecord/lib/active_record/associations/join_dependency.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'activerecord/lib/active_record/associations') diff --git a/activerecord/lib/active_record/associations/join_dependency.rb b/activerecord/lib/active_record/associations/join_dependency.rb index 77792017aa..0835d2cc9b 100644 --- a/activerecord/lib/active_record/associations/join_dependency.rb +++ b/activerecord/lib/active_record/associations/join_dependency.rb @@ -230,7 +230,7 @@ module ActiveRecord if model construct(model, node, row, seen, model_cache) else - model = construct_model(ar_parent, node, row, model_cache, id, aliases) + model = construct_model(ar_parent, node, row, model_cache, id) if node.reflection.scope && node.reflection.scope_for(node.base_klass.unscoped).readonly_value @@ -243,7 +243,7 @@ module ActiveRecord end end - def construct_model(record, node, row, model_cache, id, aliases) + def construct_model(record, node, row, model_cache, id) other = record.association(node.reflection.name) model = model_cache[node][id] ||= -- cgit v1.2.3