diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2019-01-15 16:49:15 -0500 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2019-01-17 16:08:33 -0500 |
| commit | 6c745b0c5152a4437163a67707e02f4464493983 (patch) | |
| tree | 05e5a734a3a866fd6d2b39a271ea15c1fb258093 /activerecord | |
| parent | 5f3ed8784383fb4eb0f9959f31a9c28a991b7553 (diff) | |
| download | rails-6c745b0c5152a4437163a67707e02f4464493983.tar.gz rails-6c745b0c5152a4437163a67707e02f4464493983.tar.bz2 rails-6c745b0c5152a4437163a67707e02f4464493983.zip | |
Remove deprecated `#set_state` from the transaction object
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/CHANGELOG.md | 4 | ||||
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/transaction.rb | 18 | ||||
| -rw-r--r-- | activerecord/test/cases/transactions_test.rb | 11 |
3 files changed, 4 insertions, 29 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index d49ffa9d88..4084be9ef1 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -1,3 +1,7 @@ +* Remove deprecated `#set_state` from the transaction object. + + *Rafael Mendonça França* + * Remove deprecated `#supports_statement_cache?` from the database adapters. *Rafael Mendonça França* diff --git a/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb b/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb index 718910b090..112f376d0a 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/transaction.rb @@ -40,24 +40,6 @@ module ActiveRecord committed? || rolledback? end - def set_state(state) - ActiveSupport::Deprecation.warn(<<-MSG.squish) - The set_state method is deprecated and will be removed in - Rails 6.0. Please use rollback! or commit! to set transaction - state directly. - MSG - case state - when :rolledback - rollback! - when :committed - commit! - when nil - nullify! - else - raise ArgumentError, "Invalid transaction state: #{state}" - end - end - def rollback! @children.each { |c| c.rollback! } @state = :rolledback diff --git a/activerecord/test/cases/transactions_test.rb b/activerecord/test/cases/transactions_test.rb index 45c93ca949..1009dd0f99 100644 --- a/activerecord/test/cases/transactions_test.rb +++ b/activerecord/test/cases/transactions_test.rb @@ -884,17 +884,6 @@ class TransactionTest < ActiveRecord::TestCase assert_predicate transaction.state, :committed? end - def test_set_state_method_is_deprecated - connection = Topic.connection - transaction = ActiveRecord::ConnectionAdapters::TransactionManager.new(connection).begin_transaction - - transaction.commit - - assert_deprecated do - transaction.state.set_state(:rolledback) - end - end - def test_mark_transaction_state_as_committed connection = Topic.connection transaction = ActiveRecord::ConnectionAdapters::TransactionManager.new(connection).begin_transaction |