Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Avoid empty transaction from setting has_one association on new record.

  • Loading branch information...
commit a94e2db05ccd0d4ae7681d26b4ce929184cffefc 1 parent 233c6d4
@dylanahsmith dylanahsmith authored
View
5 activerecord/CHANGELOG.md
@@ -1,3 +1,8 @@
+* Setting a has_one association on a new record no longer causes an empty
+ transaction.
+
+ *Dylan Thacker-Smith*
+
* Re-use `order` argument pre-processing for `reorder`.
*Paul Nikitochkin*
View
3  activerecord/lib/active_record/associations/has_one_association.rb
@@ -27,6 +27,7 @@ def replace(record, save = true)
return self.target if !(target || record)
if (target != record) || record.changed?
+ save &&= owner.persisted?
transaction_if(save) do
remove_target!(options[:dependent]) if target && !target.destroyed?
@@ -34,7 +35,7 @@ def replace(record, save = true)
set_owner_attributes(record)
set_inverse_instance(record)
- if owner.persisted? && save && !record.save
+ if save && !record.save
nullify_owner_attributes(record)
set_owner_attributes(target) if target
raise RecordNotSaved, "Failed to save the new associated #{reflection.name}."
View
2  activerecord/test/cases/associations/has_one_associations_test.rb
@@ -505,6 +505,8 @@ def test_has_one_transaction
assert_no_queries { company.account = nil }
account = Account.find(2)
assert_queries { company.account = account }
+
+ assert_no_queries { Firm.new.account = account }
end
def test_has_one_assignment_triggers_save_on_change
Please sign in to comment.
Something went wrong with that request. Please try again.