diff options
author | Pratik Naik <pratiknaik@gmail.com> | 2008-04-05 16:25:48 +0000 |
---|---|---|
committer | Pratik Naik <pratiknaik@gmail.com> | 2008-04-05 16:25:48 +0000 |
commit | 15d88885eedbac1193361a9eea957a7f49e39c9e (patch) | |
tree | 9e035506df3e50f4bbffb10c29f33f73d47097ba /activerecord/lib/active_record/associations/association_collection.rb | |
parent | 77730f7c9dc2e28e7f3c84ce647b84eb470dd819 (diff) | |
download | rails-15d88885eedbac1193361a9eea957a7f49e39c9e.tar.gz rails-15d88885eedbac1193361a9eea957a7f49e39c9e.tar.bz2 rails-15d88885eedbac1193361a9eea957a7f49e39c9e.zip |
Ensure HABTM#create and HABTM#build do not load entire association. [Pratik]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9229 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/associations/association_collection.rb')
-rw-r--r-- | activerecord/lib/active_record/associations/association_collection.rb | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/associations/association_collection.rb b/activerecord/lib/active_record/associations/association_collection.rb index 141fdcab3d..ce1c8a262d 100644 --- a/activerecord/lib/active_record/associations/association_collection.rb +++ b/activerecord/lib/active_record/associations/association_collection.rb @@ -166,6 +166,25 @@ module ActiveRecord end protected + def load_target + if !@owner.new_record? || foreign_key_present + begin + if !loaded? + if @target.is_a?(Array) && @target.any? + @target = find_target + @target.find_all {|t| t.new_record? } + else + @target = find_target + end + end + rescue ActiveRecord::RecordNotFound + reset + end + end + + loaded if target + target + end + def method_missing(method, *args) if @target.respond_to?(method) || (!@reflection.klass.respond_to?(method) && Class.respond_to?(method)) if block_given? |