aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters
diff options
context:
space:
mode:
authorArthur Neves <arthurnn@gmail.com>2014-05-28 15:21:19 -0400
committerArthur Neves <arthurnn@gmail.com>2014-05-28 15:21:19 -0400
commit709ce3d6a0e57ae956f70ca868ec437ecc9d63a3 (patch)
tree92315b8d726227d91c8129d8d2aac3440260a35e /activerecord/lib/active_record/connection_adapters
parent092b92f1bdddc21d92c8e60d1eb112759beb790a (diff)
downloadrails-709ce3d6a0e57ae956f70ca868ec437ecc9d63a3.tar.gz
rails-709ce3d6a0e57ae956f70ca868ec437ecc9d63a3.tar.bz2
rails-709ce3d6a0e57ae956f70ca868ec437ecc9d63a3.zip
Keep closer to other methods that touch @transaction
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters')
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract/database_statements.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/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