diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2013-10-14 17:43:15 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2013-10-14 17:43:15 -0700 |
| commit | 6a2b43dccdef817d263c9e578866f151d62fe59c (patch) | |
| tree | 6bd996e719c47b23c2a51a8e47d6a5e7706a101c /activerecord | |
| parent | 71250a5ae575277379cc4fabf62baf60583ee0b9 (diff) | |
| download | rails-6a2b43dccdef817d263c9e578866f151d62fe59c.tar.gz rails-6a2b43dccdef817d263c9e578866f151d62fe59c.tar.bz2 rails-6a2b43dccdef817d263c9e578866f151d62fe59c.zip | |
rm JoinHelper from JoinAssociation
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/associations/join_dependency/join_association.rb | 4 |
1 files changed, 1 insertions, 3 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 c6b45198ce..13e3cf8012 100644 --- a/activerecord/lib/active_record/associations/join_dependency/join_association.rb +++ b/activerecord/lib/active_record/associations/join_dependency/join_association.rb @@ -4,8 +4,6 @@ module ActiveRecord module Associations class JoinDependency # :nodoc: class JoinAssociation < JoinPart # :nodoc: - include JoinHelper - # The reflection of the association represented attr_reader :reflection @@ -83,7 +81,7 @@ module ActiveRecord constraint = constraint.and rel.arel.constraints end - joins << join(table, constraint) + joins << table.create_join(table, table.create_on(constraint), join_type) # The current table in this iteration becomes the foreign table in the next foreign_table, foreign_klass = table, klass |