diff options
Diffstat (limited to 'activerecord/lib/active_record/associations/join_dependency')
| -rw-r--r-- | activerecord/lib/active_record/associations/join_dependency/join_association.rb | 7 |
1 files changed, 2 insertions, 5 deletions
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 303ee3682f..09dbb96736 100644 --- a/activerecord/lib/active_record/associations/join_dependency/join_association.rb +++ b/activerecord/lib/active_record/associations/join_dependency/join_association.rb @@ -67,12 +67,9 @@ module ActiveRecord left.merge right end - if rel + if rel && !rel.arel.constraints.empty? bind_values.concat rel.bind_values - - if !rel.arel.constraints.empty? - constraint = constraint.and rel.arel.constraints - end + constraint = constraint.and rel.arel.constraints end joins << table.create_join(table, table.create_on(constraint), join_type) |