From 6a9628524829d56caf6f4a8a7a9cc17e3b23024e Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Fri, 3 Mar 2017 09:56:45 -0800 Subject: Remove `node` parameter to `join_constraints` I don't think we actually need this parameter anymore. Nobody seems to be using it. --- activerecord/lib/active_record/associations/join_dependency.rb | 2 +- .../active_record/associations/join_dependency/join_association.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/activerecord/lib/active_record/associations/join_dependency.rb b/activerecord/lib/active_record/associations/join_dependency.rb index 87e0847ec1..8995b1e352 100644 --- a/activerecord/lib/active_record/associations/join_dependency.rb +++ b/activerecord/lib/active_record/associations/join_dependency.rb @@ -171,7 +171,7 @@ module ActiveRecord 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 index f5fcba1236..935777d485 100644 --- 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 @@ module ActiveRecord 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 @@ module ActiveRecord item else ActiveRecord::Relation.create(klass, table, predicate_builder) - .instance_exec(node, &item) + .instance_exec(&item) end end -- cgit v1.2.3