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-10 05:41:58 -0800 |
commit | e803f3a521d34cdefa1d248beba34e2a9060603d (patch) | |
tree | d6a2504deb525cf8f4cac8deca8cfa801b58e849 /activerecord/lib/active_record/associations/has_one_association.rb | |
parent | a002442fbce098ce5ae9597784ab2755bdad111a (diff) | |
parent | 3cb0f3feed7130225cc169c2b1476acf0b11e066 (diff) | |
download | rails-e803f3a521d34cdefa1d248beba34e2a9060603d.tar.gz rails-e803f3a521d34cdefa1d248beba34e2a9060603d.tar.bz2 rails-e803f3a521d34cdefa1d248beba34e2a9060603d.zip |
Merge pull request #8154 from bogdan/has_one_association_performance
Remove unwanted transaction when has one association is built
Diffstat (limited to 'activerecord/lib/active_record/associations/has_one_association.rb')
-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 06bead41de..ee816d2392 100644 --- a/activerecord/lib/active_record/associations/has_one_association.rb +++ b/activerecord/lib/active_record/associations/has_one_association.rb @@ -28,7 +28,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 @@ -90,6 +90,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 |