Make rollback transaction transcount aware for implicit error rollbacks. Fixes #390

Author: metaskills

CHANGELOG.md

@@ -1,6 +1,8 @@
 ## v4.2.3
 
 * Fix SET defaults when using Azure.
+* Test insert 4-byte unicode chars.
+* Make rollback transaction transcount aware for implicit error rollbacks. Fixes #390
 
 
 ## v4.2.2

lib/active_record/connection_adapters/sqlserver/database_statements.rb

@@ -66,7 +66,7 @@ def commit_db_transaction
         end
 
         def rollback_db_transaction
-          do_execute 'ROLLBACK TRANSACTION'
+          do_execute 'IF @@TRANCOUNT > 0 ROLLBACK TRANSACTION'
         end
 
         include Savepoints

test/cases/helper_sqlserver.rb

@@ -33,6 +33,13 @@ def connection
       ActiveRecord::Base.connection
     end
 
+    def with_use_output_inserted_disabled
+      ActiveRecord::ConnectionAdapters::SQLServerAdapter.use_output_inserted = false
+      yield
+    ensure
+      ActiveRecord::ConnectionAdapters::SQLServerAdapter.use_output_inserted = true
+    end
+
   end
 end
 

test/cases/transaction_test_sqlserver.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 require 'cases/helper_sqlserver'
 require 'models/ship'
 require 'models/developer'

test/cases/uuid_test_sqlserver.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 require 'cases/helper_sqlserver'
 
 class SQLServerUuidTest < ActiveRecord::TestCase
@@ -10,6 +11,7 @@ class SQLServerUuidTest < ActiveRecord::TestCase
   end
 
   it 'can create with a new pk' do
+    # Type::Uuid::ACCEPTABLE_UUID
     obj = SSTestUuid.create!
     obj.id.must_be :present?
     obj.id.must_match acceptable_uuid
@@ -38,4 +40,9 @@ class SQLServerUuidTest < ActiveRecord::TestCase
     column.default_function.must_equal "newid()"
   end
 
+  it 'can insert even when use_output_inserted to false ' do
+    obj = with_use_output_inserted_disabled { SSTestUuid.create!(name: "😢") }
+    obj.id.must_be :nil?
+  end
+
 end

test/config.yml

@@ -10,6 +10,7 @@ default_connection_info: &default_connection_info
   password: <%= ENV['ACTIVERECORD_UNITTEST_PASS'] || '' %>
   azure: <%= !ENV['ACTIVERECORD_UNITTEST_AZURE'].nil? %>
   collation: <%= ENV['ACTIVERECORD_UNITTEST_COLLATION'] || nil %>
+  encoding: utf8
 
 connections: