aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
diff options
context:
space:
mode:
authorJon Leighton <j@jonathanleighton.com>2012-09-14 19:06:02 +0100
committerJon Leighton <j@jonathanleighton.com>2012-09-15 00:00:50 +0100
commit280587588aba6ce13717cd6679e3f2b43d287443 (patch)
treea2f2593a46c7f704a56088be5fd2cd4ab7e90ded /activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
parenta6fbddb7be5095186e7d66aac0ef64e46b7284f9 (diff)
downloadrails-280587588aba6ce13717cd6679e3f2b43d287443.tar.gz
rails-280587588aba6ce13717cd6679e3f2b43d287443.tar.bz2
rails-280587588aba6ce13717cd6679e3f2b43d287443.zip
Move transaction joinability into the transaction object
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract_adapter.rb')
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract_adapter.rb7
1 files changed, 4 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
index 11c6e76b0d..fd086fd47d 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
@@ -247,15 +247,16 @@ module ActiveRecord
end
def increment_open_transactions
- ActiveSupport::Deprecation.warn "increment_open_transactions is deprecated and has no effect"
+ ActiveSupport::Deprecation.warn "#increment_open_transactions is deprecated and has no effect"
end
def decrement_open_transactions
- ActiveSupport::Deprecation.warn "decrement_open_transactions is deprecated and has no effect"
+ ActiveSupport::Deprecation.warn "#decrement_open_transactions is deprecated and has no effect"
end
def transaction_joinable=(joinable)
- @transaction_joinable = joinable
+ ActiveSupport::Deprecation.warn "#transaction_joinable= is deprecated. Please pass the :joinable option to #begin_transaction instead."
+ @transaction.joinable = joinable
end
def create_savepoint