Changeset 4773
- Timestamp:
- 08/16/06 16:05:48 (2 years ago)
- Files:
-
- trunk/activerecord/CHANGELOG (modified) (1 diff)
- trunk/activerecord/lib/active_record/associations/association_proxy.rb (modified) (1 diff)
- trunk/activerecord/test/associations_test.rb (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/activerecord/CHANGELOG
r4770 r4773 1 1 *SVN* 2 3 * Fixed a bug which would cause .save to fail after trying to access a empty has_one association on a unsaved record. [Tobias Luetke] 2 4 3 5 * Nested classes are given table names prefixed by the singular form of the parent's table name. [Jeremy Kemper] trunk/activerecord/lib/active_record/associations/association_proxy.rb
r4721 r4773 120 120 private 121 121 def method_missing(method, *args, &block) 122 load_target 123 @target.send(method, *args, &block) 122 if load_target 123 @target.send(method, *args, &block) 124 end 124 125 end 125 126 126 127 def load_target 127 if !@owner.new_record? || foreign_key_present 128 begin 129 @target = find_target unless loaded? 130 rescue ActiveRecord::RecordNotFound 131 reset 132 end 128 if !loaded? and (!@owner.new_record? || foreign_key_present) 129 @target = find_target 133 130 end 134 131 135 loaded 136 target 132 @loaded = true 133 @target 134 rescue ActiveRecord::RecordNotFound 135 reset 137 136 end 138 137 trunk/activerecord/test/associations_test.rb
r4721 r4773 314 314 assert_queries(2) { firm.save! } 315 315 end 316 317 def test_save_still_works_after_accessing_nil_has_one 318 jp = Company.new :name => 'Jaded Pixel' 319 jp.dummy_account.nil? 320 321 assert_nothing_raised do 322 jp.save! 323 end 324 end 325 316 326 end 317 327
