Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove node parameter to join_constraints #28267

Merged
merged 1 commit into from
Mar 3, 2017
Merged

Remove node parameter to join_constraints #28267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion activerecord/lib/active_record/associations/join_dependency.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions activerecord/lib/active_record/associations/join_dependency/join_association.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down