From 15367a2c674bf19eeefa12ccb64391bdd50d883d Mon Sep 17 00:00:00 2001
From: Ryuta Kamizono <kamipo@gmail.com>
Date: Wed, 20 Jun 2018 21:44:16 +0900
Subject: [PATCH] Remove useless `aliases` argument from
 `JoinDependency#construct`

Since `aliases` is a part of `JoinDependency` and already cached at
1a723c65bbe91ad969b67416233d20eff6d2a46a.
---
 .../lib/active_record/associations/join_dependency.rb  | 10 +++++-----
 1 file 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