aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
diff options
context:
space:
mode:
authorMichael Koziarski <michael@koziarski.com>2008-02-18 00:14:54 +0000
committerMichael Koziarski <michael@koziarski.com>2008-02-18 00:14:54 +0000
commitf2546164d6eb9302d1ff5d36939d128b8f96feb1 (patch)
treee7f4d7f718686da00e6062d50997e58975c6cf0a /activerecord/lib/active_record
parent23e58a0552b4febd9372ee4642b0da886d92fd7a (diff)
downloadrails-f2546164d6eb9302d1ff5d36939d128b8f96feb1.tar.gz
rails-f2546164d6eb9302d1ff5d36939d128b8f96feb1.tar.bz2
rails-f2546164d6eb9302d1ff5d36939d128b8f96feb1.zip
Make dynamic finders respect the :include on HasManyThrough associations. Closes #10998. [cpytel]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8890 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r--activerecord/lib/active_record/associations/has_many_through_association.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/associations/has_many_through_association.rb b/activerecord/lib/active_record/associations/has_many_through_association.rb
index 94842f424d..281db8fe06 100644
--- a/activerecord/lib/active_record/associations/has_many_through_association.rb
+++ b/activerecord/lib/active_record/associations/has_many_through_association.rb
@@ -236,6 +236,7 @@ module ActiveRecord
:find => { :from => construct_from,
:conditions => construct_conditions,
:joins => construct_joins,
+ :include => @reflection.options[:include],
:select => construct_select,
:order => @reflection.options[:order],
:limit => @reflection.options[:limit] } }