aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations/join_dependency.rb
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2013-10-08 11:26:29 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2013-10-08 11:26:29 -0700
commit84499eb4bd2e5fe686199c122194b72040411d04 (patch)
treea39c5739cb4b08314c73326892d5a53df7c1dac4 /activerecord/lib/active_record/associations/join_dependency.rb
parentbf8628df0a8422d54350b3e66f5f56b43576f350 (diff)
downloadrails-84499eb4bd2e5fe686199c122194b72040411d04.tar.gz
rails-84499eb4bd2e5fe686199c122194b72040411d04.tar.bz2
rails-84499eb4bd2e5fe686199c122194b72040411d04.zip
decouple JoinAssociation from JoinDependency
Diffstat (limited to 'activerecord/lib/active_record/associations/join_dependency.rb')
-rw-r--r--activerecord/lib/active_record/associations/join_dependency.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/join_dependency.rb b/activerecord/lib/active_record/associations/join_dependency.rb
index b3bc75e08b..89812a3826 100644
--- a/activerecord/lib/active_record/associations/join_dependency.rb
+++ b/activerecord/lib/active_record/associations/join_dependency.rb
@@ -176,7 +176,7 @@ module ActiveRecord
raise EagerLoadPolymorphicError.new(reflection)
end
- JoinAssociation.new(reflection, self, parent, join_type)
+ JoinAssociation.new(reflection, join_parts.length, parent, join_type, alias_tracker)
end
def construct(parent, associations, join_parts, row, rs)