aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations/has_one_association.rb
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-11-06 20:39:34 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-11-06 20:39:34 +0000
commit49c801b71d425543ae88e171b969b3316f022c2a (patch)
treea7a4fd2f16414b091fdb4c7c4335e300f15414f7 /activerecord/lib/active_record/associations/has_one_association.rb
parent89ec75edc9a4d9064c0e644c5be0949f5119967c (diff)
downloadrails-49c801b71d425543ae88e171b969b3316f022c2a.tar.gz
rails-49c801b71d425543ae88e171b969b3316f022c2a.tar.bz2
rails-49c801b71d425543ae88e171b969b3316f022c2a.zip
Added :include as an option for association declarations [DHH]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2898 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/associations/has_one_association.rb')
-rw-r--r--activerecord/lib/active_record/associations/has_one_association.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/has_one_association.rb b/activerecord/lib/active_record/associations/has_one_association.rb
index 18f84ee98f..edd9e53c19 100644
--- a/activerecord/lib/active_record/associations/has_one_association.rb
+++ b/activerecord/lib/active_record/associations/has_one_association.rb
@@ -57,7 +57,7 @@ module ActiveRecord
private
def find_target
- @association_class.find(:first, :conditions => @finder_sql, :order => @options[:order])
+ @association_class.find(:first, :conditions => @finder_sql, :order => @options[:order], :include => @options[:include])
end
def target_obsolete?