Permalink
Browse files

Fixed a bug which would cause .save to fail after trying to access a …

…empty has_one association on a unsaved record.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4773 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 14101c7 commit ae74e8e9feba99b84f5e431239dc6a2039ad5793 Tobias Lütke committed Aug 16, 2006
View
2 activerecord/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Fixed a bug which would cause .save to fail after trying to access a empty has_one association on a unsaved record. [Tobias Luetke]
+
* Nested classes are given table names prefixed by the singular form of the parent's table name. [Jeremy Kemper]
Example: Invoice::Lineitem is given table name invoice_lineitems
View
19 activerecord/lib/active_record/associations/association_proxy.rb
@@ -119,21 +119,20 @@ def merge_options_from_reflection!(options)
private
def method_missing(method, *args, &block)
- load_target
- @target.send(method, *args, &block)
+ if load_target
+ @target.send(method, *args, &block)
+ end
end
def load_target
- if !@owner.new_record? || foreign_key_present
- begin
- @target = find_target unless loaded?
- rescue ActiveRecord::RecordNotFound
- reset
- end
+ if !loaded? and (!@owner.new_record? || foreign_key_present)
+ @target = find_target
end
- loaded
- target
+ @loaded = true
+ @target
+ rescue ActiveRecord::RecordNotFound
+ reset
end
# Can be overwritten by associations that might have the foreign key available for an association without
View
10 activerecord/test/associations_test.rb
@@ -313,6 +313,16 @@ def test_not_resaved_when_unchanged
firm.account = Account.find(:first).clone
assert_queries(2) { firm.save! }
end
+
+ def test_save_still_works_after_accessing_nil_has_one
+ jp = Company.new :name => 'Jaded Pixel'
+ jp.dummy_account.nil?
+
+ assert_nothing_raised do
+ jp.save!
+ end
+ end
+
end

0 comments on commit ae74e8e

Please sign in to comment.