diff options
author | Emilio Tagua <miloops@gmail.com> | 2009-10-05 15:25:06 -0300 |
---|---|---|
committer | Emilio Tagua <miloops@gmail.com> | 2009-10-05 15:25:06 -0300 |
commit | 1daceeb838dccfd47547dedea67eb22e7c06c5a9 (patch) | |
tree | 506ad932a341befbbea1d4ea719d992ef22f3512 /activerecord/lib/active_record/relation.rb | |
parent | 9a71b6d29d013d8ee3f0d3f408d53e1cf3c9f799 (diff) | |
parent | 65f055a3ed790d41aeca8d4ca7f3771b05cf544f (diff) | |
download | rails-1daceeb838dccfd47547dedea67eb22e7c06c5a9.tar.gz rails-1daceeb838dccfd47547dedea67eb22e7c06c5a9.tar.bz2 rails-1daceeb838dccfd47547dedea67eb22e7c06c5a9.zip |
Merge branch 'associations_2'
Diffstat (limited to 'activerecord/lib/active_record/relation.rb')
-rw-r--r-- | activerecord/lib/active_record/relation.rb | 32 |
1 files changed, 29 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb index 4b53857d36..24fd29c7f3 100644 --- a/activerecord/lib/active_record/relation.rb +++ b/activerecord/lib/active_record/relation.rb @@ -6,6 +6,18 @@ module ActiveRecord def initialize(klass, relation) @klass, @relation = klass, relation @readonly = false + @associations_to_preload = [] + @eager_load_associations = [] + end + + def preload(association) + @associations_to_preload += association + self + end + + def eager_load(association) + @eager_load_associations += association + self end def readonly @@ -14,9 +26,23 @@ module ActiveRecord end def to_a - records = @klass.find_by_sql(@relation.to_sql) - - records.each { |record| record.readonly! } if @readonly + if @eager_load_associations.any? + records = catch :invalid_query do + @klass.send(:find_with_associations, { + :select => @relation.send(:select_clauses).join(', '), + :joins => @relation.joins(relation), + :group => @relation.send(:group_clauses).join(', '), + :order => @relation.send(:order_clauses).join(', '), + :conditions => @relation.send(:where_clauses).join("\n\tAND "), + :limit => @relation.taken + }, + ActiveRecord::Associations::ClassMethods::JoinDependency.new(@klass, @eager_load_associations, nil)) + end + else + records = @klass.find_by_sql(@relation.to_sql) + @klass.send(:preload_associations, records, @associations_to_preload) unless @associations_to_preload.empty? + records.each { |record| record.readonly! } if @readonly + end records end |