aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2015-02-01 13:52:50 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2015-02-01 13:55:16 -0800
commitda8de9114b41618322dde17c35b891ade46751fe (patch)
tree801589fbaa9f58626b13c20652af4691379f49ba /activerecord/lib/active_record/connection_adapters/abstract/transaction.rb
parente87ff501932eb1baecafcca64518e3763597163e (diff)
downloadrails-da8de9114b41618322dde17c35b891ade46751fe.tar.gz
rails-da8de9114b41618322dde17c35b891ade46751fe.tar.bz2
rails-da8de9114b41618322dde17c35b891ade46751fe.zip
push add to transaction logic down to the instance
the transaction object shouldn't know so much about active record objects, so let's push the conditionals in to the instance.
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract/transaction.rb')
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract/transaction.rb6
1 files changed, 1 insertions, 5 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb b/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb
index 1252a33d7d..1eb30956d4 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb
@@ -55,11 +55,7 @@ module ActiveRecord
end
def add_record(record)
- if record.has_transactional_callbacks?
- records << record
- else
- record.set_transaction_state(@state)
- end
+ records << record
end
def rollback