Isolation levels not being reset on error. Fixes #469. Thanks @anthony

Author: metaskills

CHANGELOG.md

@@ -1,3 +1,10 @@
+## v4.2.12
+
+#### Fixed
+
+* Isolation levels not being reset on error. Fixes #469. Thanks @anthony
+
+
 ## v4.2.11
 
 #### Fixed

VERSION

@@ -1 +1 @@
-4.2.11
+4.2.12

lib/active_record/connection_adapters/sqlserver/database_statements.rb

@@ -58,7 +58,6 @@ def begin_isolated_db_transaction(isolation)
 
         def set_transaction_isolation_level(isolation_level)
           do_execute "SET TRANSACTION ISOLATION LEVEL #{isolation_level}"
-          begin_db_transaction
         end
 
         def commit_db_transaction

lib/active_record/connection_adapters/sqlserver/transaction.rb

@@ -36,6 +36,11 @@ def commit
         reset_starting_isolation_level
       end
 
+      def rollback
+        super
+        reset_starting_isolation_level
+      end
+
       private
 
       def reset_starting_isolation_level

test/cases/transaction_test_sqlserver.rb

@@ -32,20 +32,24 @@ class TransactionTestSQLServer < ActiveRecord::TestCase
   end
 
   it 'can use an isolation level and reverts back to starting isolation level' do
-    begin
-      in_level = nil
-      begin_level = connection.user_options_isolation_level
-      begin_level.must_match %r{read committed}i
-      Ship.transaction(isolation: :serializable) do
-        Ship.create! name: 'Black Pearl'
-        in_level = connection.user_options_isolation_level
-      end
-      after_level = connection.user_options_isolation_level
-      in_level.must_match %r{serializable}i
-      after_level.must_match %r{read committed}i
-    ensure
-      connection.set_transaction_isolation_level 'READ COMMITTED'
+    in_level = nil
+    begin_level = connection.user_options_isolation_level
+    begin_level.must_match %r{read committed}i
+    Ship.transaction(isolation: :serializable) do
+      Ship.create! name: 'Black Pearl'
+      in_level = connection.user_options_isolation_level
     end
+    after_level = connection.user_options_isolation_level
+    in_level.must_match %r{serializable}i
+    after_level.must_match %r{read committed}i
+  end
+
+  it 'can use an isolation level and reverts back to starting isolation level under exceptions' do
+    connection.user_options_isolation_level.must_match %r{read committed}i
+    lambda {
+      Ship.transaction(isolation: :serializable) { Ship.create! }
+    }.must_raise(ActiveRecord::RecordInvalid)
+    connection.user_options_isolation_level.must_match %r{read committed}i
   end