Remove deprecated transaction_joinable=

in favor of `begin_transaction` with `:joinable` option.
rails · Jul 3, 2013 · 9105c59 · 9105c59
1 parent b235011
commit 9105c59
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 15 deletions.
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
@@ -1,3 +1,8 @@
+*   Remove deprecated `transaction_joinable=` in favor of `begin_transaction`
+    with `:joinable` option.
+
+    *Arun Agrawal*
+
 *   Remove deprecated `decrement_open_transactions`.
 
     *Arun Agrawal*

diff --git a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
@@ -387,12 +387,6 @@ def open_transactions
         @transaction.number
       end
 
-      def transaction_joinable=(joinable)
-        message = "#transaction_joinable= is deprecated. Please pass the :joinable option to #begin_transaction instead."
-        ActiveSupport::Deprecation.warn message
-        @transaction.joinable = joinable
-      end
-
       def create_savepoint
       end
 

diff --git a/activerecord/test/cases/transactions_test.rb b/activerecord/test/cases/transactions_test.rb
@@ -593,14 +593,5 @@ def test_transaction_isolation__read_committed
 
       assert_equal original_salary, Developer.find(1).salary
     end
-
-    test "#transaction_joinable= is deprecated" do
-      Developer.transaction do
-        conn = Developer.connection
-        assert conn.current_transaction.joinable?
-        assert_deprecated { conn.transaction_joinable = false }
-        assert !conn.current_transaction.joinable?
-      end
-    end
   end
 end