Merge pull request #28267 from rails/rm-node-from-constraints

Remove `node` parameter to `join_constraints`
rails · Mar 3, 2017 · 76be78c · 76be78c
2 parents fd8da71 + 6a96285
commit 76be78c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/activerecord/lib/active_record/associations/join_dependency.rb b/activerecord/lib/active_record/associations/join_dependency.rb
@@ -171,7 +171,7 @@ def make_constraints(parent, child, tables, join_type)
           chain         = child.reflection.chain
           foreign_table = parent.table
           foreign_klass = parent.base_klass
-          child.join_constraints(foreign_table, foreign_klass, child, join_type, tables, chain)
+          child.join_constraints(foreign_table, foreign_klass, join_type, tables, chain)
         end
 
         def make_outer_joins(parent, child)

diff --git a/activerecord/lib/active_record/associations/join_dependency/join_association.rb b/activerecord/lib/active_record/associations/join_dependency/join_association.rb
@@ -23,7 +23,7 @@ def match?(other)
 
         JoinInformation = Struct.new :joins, :binds
 
-        def join_constraints(foreign_table, foreign_klass, node, join_type, tables, chain)
+        def join_constraints(foreign_table, foreign_klass, join_type, tables, chain)
           joins         = []
           binds         = []
           tables        = tables.reverse
@@ -46,7 +46,7 @@ def join_constraints(foreign_table, foreign_klass, node, join_type, tables, chai
                 item
               else
                 ActiveRecord::Relation.create(klass, table, predicate_builder)
-                  .instance_exec(node, &item)
+                  .instance_exec(&item)
               end
             end