diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-11-10 05:41:58 -0800 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-11-12 14:48:02 -0200 |
| commit | 505bf59457558b8841013d147f13737e13e00ee7 (patch) | |
| tree | 82dbafc13ade291edbbf34dc0d20f984e57b054a /activerecord/lib/active_record | |
| parent | 0d27da5fbd5dc39ec23af51717640d641ff5e48f (diff) | |
| download | rails-505bf59457558b8841013d147f13737e13e00ee7.tar.gz rails-505bf59457558b8841013d147f13737e13e00ee7.tar.bz2 rails-505bf59457558b8841013d147f13737e13e00ee7.zip | |
Merge pull request #8154 from bogdan/has_one_association_performance
Remove unwanted transaction when has one association is built
Conflicts:
activerecord/CHANGELOG.md
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/associations/has_one_association.rb | 10 |
1 files changed, 9 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 501ebe7c5b..56f9013d61 100644 --- a/activerecord/lib/active_record/associations/has_one_association.rb +++ b/activerecord/lib/active_record/associations/has_one_association.rb @@ -11,7 +11,7 @@ module ActiveRecord # If target and record are nil, or target is equal to record, # we don't need to have transaction. if (target || record) && target != record - reflection.klass.transaction do + transaction_if(save) do remove_target!(options[:dependent]) if target && !target.destroyed? if record @@ -70,6 +70,14 @@ module ActiveRecord def nullify_owner_attributes(record) record[reflection.foreign_key] = nil end + + def transaction_if(value) + if value + reflection.klass.transaction { yield } + else + yield + end + end end end end |