aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/relation.rb
diff options
context:
space:
mode:
authorEmilio Tagua <miloops@gmail.com>2009-09-01 15:36:09 -0300
committerEmilio Tagua <miloops@gmail.com>2009-09-01 15:36:09 -0300
commitc01c21b31d590f7e8d12e3ae083fcdf0f0c6fd54 (patch)
tree01d91af9e871be42012621af2f51107c0333b924 /activerecord/lib/active_record/relation.rb
parent6b67df70ab1bc42d9a05571144cdf5614a7d4a6a (diff)
downloadrails-c01c21b31d590f7e8d12e3ae083fcdf0f0c6fd54.tar.gz
rails-c01c21b31d590f7e8d12e3ae083fcdf0f0c6fd54.tar.bz2
rails-c01c21b31d590f7e8d12e3ae083fcdf0f0c6fd54.zip
Added association preload to relation.
Diffstat (limited to 'activerecord/lib/active_record/relation.rb')
-rw-r--r--activerecord/lib/active_record/relation.rb8
1 files changed, 8 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb
index 4b53857d36..6abb2df8ff 100644
--- a/activerecord/lib/active_record/relation.rb
+++ b/activerecord/lib/active_record/relation.rb
@@ -6,6 +6,12 @@ module ActiveRecord
def initialize(klass, relation)
@klass, @relation = klass, relation
@readonly = false
+ @associations_to_preload = []
+ end
+
+ def preload(association)
+ @associations_to_preload << association
+ @associations_to_preload.flatten!
end
def readonly
@@ -16,6 +22,8 @@ module ActiveRecord
def to_a
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
records