aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2015-03-02 09:00:42 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2015-03-02 09:17:03 -0800
commitec51c3fedd16b561d096dcc1a6705fdc02ab7666 (patch)
tree3b1cb55a5d49aec5bbc89f412a3eb541f1aabe8b /activerecord/lib/active_record/connection_adapters/abstract/transaction.rb
parent7be50103d518927db347d5b86dafc6f182765323 (diff)
downloadrails-ec51c3fedd16b561d096dcc1a6705fdc02ab7666.tar.gz
rails-ec51c3fedd16b561d096dcc1a6705fdc02ab7666.tar.bz2
rails-ec51c3fedd16b561d096dcc1a6705fdc02ab7666.zip
ask the txn for it's state, not a state object
this way we don't have to mutate a state object, we can just change the state of the txn
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract/transaction.rb')
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract/transaction.rb8
1 files changed, 8 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb b/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb
index c74f4e8fa5..a51dda5483 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb
@@ -59,6 +59,14 @@ module ActiveRecord
@state.set_state(:rolledback)
end
+ def rolledback?
+ @state.rolledback?
+ end
+
+ def finalized?
+ @state.finalized?
+ end
+
def rollback_records
ite = records.uniq
while record = ite.shift