From d58d9f713cee7d27c4d3656ad852cb5a6713e13e Mon Sep 17 00:00:00 2001 From: Vipul A M Date: Mon, 25 Apr 2016 23:21:56 +0530 Subject: Move remaining current_savepoint_name to savepoints module --- .../lib/active_record/connection_adapters/abstract/savepoints.rb | 4 ++++ .../lib/active_record/connection_adapters/abstract_adapter.rb | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'activerecord/lib/active_record/connection_adapters') 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 86de8f1ca0..e17af3538c 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 -- cgit v1.2.3