From da8de9114b41618322dde17c35b891ade46751fe Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Sun, 1 Feb 2015 13:52:50 -0800 Subject: 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. --- .../lib/active_record/connection_adapters/abstract/transaction.rb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'activerecord/lib/active_record/connection_adapters/abstract/transaction.rb') 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 -- cgit v1.2.3