diff options
author | Jamis Buck <jamis@37signals.com> | 2005-06-10 13:54:58 +0000 |
---|---|---|
committer | Jamis Buck <jamis@37signals.com> | 2005-06-10 13:54:58 +0000 |
commit | 7f9ffb2ebf1a0230368f54a6372cb7196c90177e (patch) | |
tree | 6cfa7b09101c91f9d30a656c1796d77b12efe507 /activerecord/lib | |
parent | f6ec9e3d66a8f5acd5eb79e3d1f77a2d1e1b5d31 (diff) | |
download | rails-7f9ffb2ebf1a0230368f54a6372cb7196c90177e.tar.gz rails-7f9ffb2ebf1a0230368f54a6372cb7196c90177e.tar.bz2 rails-7f9ffb2ebf1a0230368f54a6372cb7196c90177e.zip |
Eager loading of dependent has_one associations won't delete the association #1212. Also, starting to refactor the tests to make them speedier, with optional support for transactional fixtures.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1398 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib')
-rwxr-xr-x | activerecord/lib/active_record/associations.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index 001572a2c5..93960f87e4 100755 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -719,7 +719,7 @@ module ActiveRecord next unless row[primary_key_table[reflection.table_name]] record.send( - "#{reflection.name}=", + "set_#{reflection.name}_target", reflection.klass.send(:instantiate, extract_record(schema_abbreviations, reflection.table_name, row)) ) end |