From 49c801b71d425543ae88e171b969b3316f022c2a Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sun, 6 Nov 2005 20:39:34 +0000 Subject: 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 --- .../associations/has_many_association.rb | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) (limited to 'activerecord/lib/active_record/associations/has_many_association.rb') diff --git a/activerecord/lib/active_record/associations/has_many_association.rb b/activerecord/lib/active_record/associations/has_many_association.rb index 9ee06ffbcb..3027e26ce0 100644 --- a/activerecord/lib/active_record/associations/has_many_association.rb +++ b/activerecord/lib/active_record/associations/has_many_association.rb @@ -23,12 +23,12 @@ module ActiveRecord # DEPRECATED. def find_all(runtime_conditions = nil, orderings = nil, limit = nil, joins = nil) if @options[:finder_sql] - records = @association_class.find_by_sql(@finder_sql) + @association_class.find_by_sql(@finder_sql) else - sql = @finder_sql - sql += " AND (#{sanitize_sql(runtime_conditions)})" if runtime_conditions + conditions = @finder_sql + conditions += " AND (#{sanitize_sql(runtime_conditions)})" if runtime_conditions orderings ||= @options[:order] - records = @association_class.find_all(sql, orderings, limit, joins) + @association_class.find_all(conditions, orderings, limit, joins) end end @@ -105,7 +105,17 @@ module ActiveRecord end def find_target - find_all + if @options[:finder_sql] + @association_class.find_by_sql(@finder_sql) + else + @association_class.find(:all, + :conditions => @finder_sql, + :order => @options[:order], + :limit => @options[:limit], + :joins => @options[:joins], + :include => @options[:include] + ) + end end def count_records -- cgit v1.2.3