diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-05-28 16:23:56 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-05-28 16:23:56 -0300 |
| commit | 37c7774504f29fcb99362a1983c1364c856e116e (patch) | |
| tree | ae80b9cd45d893ffab9ff6b65b94ec4365308256 | |
| parent | 83a437c21e1d858b109dc169788ea7ac6e708d30 (diff) | |
| parent | 709ce3d6a0e57ae956f70ca868ec437ecc9d63a3 (diff) | |
| download | rails-37c7774504f29fcb99362a1983c1364c856e116e.tar.gz rails-37c7774504f29fcb99362a1983c1364c856e116e.tar.bz2 rails-37c7774504f29fcb99362a1983c1364c856e116e.zip | |
Merge pull request #15392 from arthurnn/move_open_transactions
Keep closer to other methods that touch @transaction
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb | 4 | ||||
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract_adapter.rb | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb b/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb index bc47412405..7ff5001796 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb @@ -227,6 +227,10 @@ module ActiveRecord end end + def open_transactions + @transaction.number + end + def current_transaction #:nodoc: @transaction end diff --git a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb index 0dba0c7688..a8e0cb93a0 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb @@ -325,10 +325,6 @@ module ActiveRecord @connection end - def open_transactions - @transaction.number - end - def create_savepoint(name = nil) end |