aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2016-04-25 19:19:58 -0300
committerRafael França <rafaelmfranca@gmail.com>2016-04-25 19:19:58 -0300
commit4a4eedb240667c81667f6f73fab82ecee43376db (patch)
tree4f8e42ecc11c3cbaae4571cdb5a903f45b23f39a
parent831a277d4906f13ab79401fe049e86c63c5826cb (diff)
parentd58d9f713cee7d27c4d3656ad852cb5a6713e13e (diff)
downloadrails-4a4eedb240667c81667f6f73fab82ecee43376db.tar.gz
rails-4a4eedb240667c81667f6f73fab82ecee43376db.tar.bz2
rails-4a4eedb240667c81667f6f73fab82ecee43376db.zip
Merge pull request #24730 from vipulnsward/move-savepoints
Move remaining current_savepoint_name to savepoints module
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract/savepoints.rb4
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract_adapter.rb4
2 files changed, 4 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/savepoints.rb b/activerecord/lib/active_record/connection_adapters/abstract/savepoints.rb
index 67f81e9d10..3a06f75292 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/savepoints.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/savepoints.rb
@@ -1,6 +1,10 @@
module ActiveRecord
module ConnectionAdapters
module Savepoints
+ def current_savepoint_name
+ current_transaction.savepoint_name
+ end
+
def create_savepoint(name = current_savepoint_name)
execute("SAVEPOINT #{name}")
end
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
index 373c082f65..51ed2bf8f2 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
@@ -431,10 +431,6 @@ module ActiveRecord
end
private :can_perform_case_insensitive_comparison_for?
- def current_savepoint_name
- current_transaction.savepoint_name
- end
-
# Check the connection back in to the connection pool
def close
pool.checkin self