Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

has_one associations with a nil target may be safely marshaled. Closes

…#6279.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5188 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit 1caa76304b6eef3d637d861585bda72ed367567f 1 parent e5a0a27
Jeremy Kemper jeremy authored
2  activerecord/CHANGELOG
View
@@ -1,5 +1,7 @@
*SVN*
+* has_one associations with a nil target may be safely marshaled. #6279 [norbauer, Jeremy Kemper]
+
* Duplicate the hash provided to AR::Base#to_xml to prevent unexpected side effects [Koz]
* Add a :namespace option to AR::Base#to_xml [Koz]
2  activerecord/lib/active_record/associations/association_proxy.rb
View
@@ -125,6 +125,8 @@ def method_missing(method, *args, &block)
end
def load_target
+ return nil unless defined?(@loaded)
+
if !loaded? and (!@owner.new_record? || foreign_key_present)
@target = find_target
end
17 activerecord/test/associations_test.rb
View
@@ -102,13 +102,26 @@ def test_has_one
end
def test_has_one_cache_nils
- assert_nil companies(:another_firm).account
- assert_queries(0) { companies(:another_firm).account }
+ firm = companies(:another_firm)
+ assert_queries(1) { assert_nil firm.account }
+ assert_queries(0) { assert_nil firm.account }
firms = Firm.find(:all, :include => :account)
assert_queries(0) { firms.each(&:account) }
end
+ def test_can_marshal_has_one_association_with_nil_target
+ firm = Firm.new
+ assert_nothing_raised do
+ assert_equal firm.attributes, Marshal.load(Marshal.dump(firm)).attributes
+ end
+
+ firm.account
+ assert_nothing_raised do
+ assert_equal firm.attributes, Marshal.load(Marshal.dump(firm)).attributes
+ end
+ end
+
def test_proxy_assignment
company = companies(:first_firm)
assert_nothing_raised { company.account = company.account }
Please sign in to comment.
Something went wrong with that request. Please try again.