diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-09-11 18:53:52 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-09-11 18:53:52 -0300 |
| commit | 1fa76a2f3de5276001afe5d6815136680f7a87de (patch) | |
| tree | 64d8b7647daa94a131211432961d811f1cdd3f2c /activerecord/lib/active_record/associations | |
| parent | 75af032c2502db2eea53c72e1cd8069dc094b920 (diff) | |
| parent | a94e2db05ccd0d4ae7681d26b4ce929184cffefc (diff) | |
| download | rails-1fa76a2f3de5276001afe5d6815136680f7a87de.tar.gz rails-1fa76a2f3de5276001afe5d6815136680f7a87de.tar.bz2 rails-1fa76a2f3de5276001afe5d6815136680f7a87de.zip | |
Merge pull request #12135 from dylanahsmith/avoid_empty_transaction
Avoid empty transaction from setting has_one association on new record.
Conflicts:
activerecord/CHANGELOG.md
Diffstat (limited to 'activerecord/lib/active_record/associations')
| -rw-r--r-- | activerecord/lib/active_record/associations/has_one_association.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/has_one_association.rb b/activerecord/lib/active_record/associations/has_one_association.rb index 3ab1ea1ff4..0008600418 100644 --- a/activerecord/lib/active_record/associations/has_one_association.rb +++ b/activerecord/lib/active_record/associations/has_one_association.rb @@ -27,6 +27,8 @@ module ActiveRecord 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 +36,7 @@ module ActiveRecord 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}." |