activerecord-sqlserver-adapter 4.2.11 → 4.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5645093f45bc28adecc3cc3a38fdb886f6683a9c
-  data.tar.gz: bddd84dff29484133c22f905f3c75439a68cbbe5
+  metadata.gz: 54c5914ff2792205172ac4e9f99f9f43cef3476c
+  data.tar.gz: 126e1fc2846d80fef6c1818ead2c3f4c125cfe3e
 SHA512:
-  metadata.gz: e2e9df466a158a7a1d35860e6c32c75b4e9f46774122b7cfcf8f43c1d9f770cb1a723cedf92f30ec9d06ec39501be10a018bbd0f6ffcff1257160127de7fa3f3
-  data.tar.gz: d24d8c79658031f51266734f5648af3cf5dc3e47911a245774f2a9dd32aecfbb25407703758ef707140507af7ab632dac93ccf193f9c30dd3c74543b5b6ef025
+  metadata.gz: 6dada71646dfbad6c3664eadbc4d8d29d09575b20833c1d7809d506d26e91dde269dacc3cafd21748c9683b30a1bdd1e8e72fa6880480c2f7101fa19f9d64cab
+  data.tar.gz: 2a7764404a937e063993ebfe641949841b06cc9d2bbebf69c8deb61c8c7427ec1527a7fa2a171a28d91316abf62626539112e67b7230c83f99b8678f4100a83f

data/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

data/VERSION

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

data/appveyor.yml

@@ -2,7 +2,7 @@ init:
   - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
   - SET PATH=C:\MinGW\msys\1.0\bin;%PATH%
   - SET RAKEOPT=-rdevkit
-  - SET TINYTDS_VERSION=0.9.5.rc.3
+  - SET TINYTDS_VERSION=1.0.2
 clone_depth: 5
 skip_tags: true
 matrix:
@@ -20,17 +20,13 @@ test_script:
   - timeout /t 4 /nobreak > NUL
   - sqlcmd -S ".\SQL2014" -U sa -P Password12! -i %APPVEYOR_BUILD_FOLDER%\test\appveyor\dbsetup.sql
   - bundle exec rake test ACTIVERECORD_UNITTEST_DATASERVER="localhost\SQL2014"
-  - bundle exec rake test ACTIVERECORD_UNITTEST_DATASERVER="localhost\SQL2014" ACTIVERECORD_UNITTEST_TDSVERSION="7.3"
   - ps: Stop-Service 'MSSQL$SQL2014'
   - ps: Start-Service 'MSSQL$SQL2012SP1'
   - timeout /t 4 /nobreak > NUL
   - sqlcmd -S ".\SQL2012SP1" -U sa -P Password12! -i %APPVEYOR_BUILD_FOLDER%\test\appveyor\dbsetup.sql
   - bundle exec rake test ACTIVERECORD_UNITTEST_DATASERVER="localhost\SQL2012SP1"
-  - bundle exec rake test ACTIVERECORD_UNITTEST_DATASERVER="localhost\SQL2012SP1" ACTIVERECORD_UNITTEST_TDSVERSION="7.3"
-  # - timeout /t 4 /nobreak > NUL
-  # - bundle exec rake test ACTIVERECORD_UNITTEST_HOST=%CI_AZURE_HOST% ACTIVERECORD_UNITTEST_PASS=%CI_AZURE_PASS% ACTIVERECORD_UNITTEST_AZURE=1
-  # - timeout /t 4 /nobreak > NUL
-  # - bundle exec rake test ACTIVERECORD_UNITTEST_HOST=%CI_AZURE_HOST% ACTIVERECORD_UNITTEST_PASS=%CI_AZURE_PASS% ACTIVERECORD_UNITTEST_AZURE=1 TDSVER=7.3
+  - timeout /t 4 /nobreak > NUL
+  - bundle exec rake test ACTIVERECORD_UNITTEST_HOST=%CI_AZURE_HOST% ACTIVERECORD_UNITTEST_PASS=%CI_AZURE_PASS% ACTIVERECORD_UNITTEST_AZURE=1
 environment:
   CI_AZURE_HOST:
     secure: VChrioaIWkf9iuuaSs4cryiA4honrADgZqNC0++begg=

data/lib/active_record/connection_adapters/sqlserver/database_statements.rb

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

data/lib/active_record/connection_adapters/sqlserver/transaction.rb

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

data/lib/active_record/tasks/sqlserver_database_tasks.rb

@@ -61,6 +61,7 @@ module ActiveRecord
         command.concat(table_args)
         view_args = connection.views.map { |v| Shellwords.escape(v) }
         command.concat(view_args)
+        puts command.inspect
         raise 'Error dumping database' unless Kernel.system(command.join(' '))
         dump = File.read(filename)
         dump.gsub!(/^USE .*$\nGO\n/, '')                      # Strip db USE statements

data/test/cases/rake_test_sqlserver.rb

@@ -43,7 +43,7 @@ class SQLServerRakeCreateTest < SQLServerRakeTest
 
   it 'establishes connection to database after create ' do
     db_tasks.create configuration
-    connection.current_database.must_equal(new_database)
+    connection.current_database.must_equal(connection_sqlserver_azure? ? 'master' : new_database)
   end
 
   it 'creates database with default collation' do

data/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
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-sqlserver-adapter
 version: !ruby/object:Gem::Version
-  version: 4.2.11
+  version: 4.2.12
 platform: ruby
 authors:
 - Ken Collins
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-24 00:00:00.000000000 Z
+date: 2016-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -188,7 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: ActiveRecord SQL Server Adapter.