aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2017-03-03 11:09:57 -0800
committerGitHub <noreply@github.com>2017-03-03 11:09:57 -0800
commit76be78c59cd75eaafb31719745b43df4743fd33d (patch)
treeb799ff073cbb44b80771209106ae071044031b9c
parentfd8da7111835f5c2c136216504330ff01b9eafae (diff)
parent6a9628524829d56caf6f4a8a7a9cc17e3b23024e (diff)
downloadrails-76be78c59cd75eaafb31719745b43df4743fd33d.tar.gz
rails-76be78c59cd75eaafb31719745b43df4743fd33d.tar.bz2
rails-76be78c59cd75eaafb31719745b43df4743fd33d.zip
Merge pull request #28267 from rails/rm-node-from-constraints
Remove `node` parameter to `join_constraints`
-rw-r--r--activerecord/lib/active_record/associations/join_dependency.rb2
-rw-r--r--activerecord/lib/active_record/associations/join_dependency/join_association.rb4
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