Skip to content

Commit 6265ca8

Browse files
committed
Reset transactions on reconnects and disconnects.
1 parent b120c04 commit 6265ca8

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

lib/active_record/connection_adapters/sqlserver_adapter.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ class SQLServerAdapter < AbstractAdapter
186186
attr_reader :database_version, :database_year, :spid, :product_level, :product_version, :edition
187187

188188
cattr_accessor :native_text_database_type, :native_binary_database_type, :native_string_database_type,
189-
:enable_default_unicode_types, :auto_connect, :cs_equality_operator,
189+
:enable_default_unicode_types, :auto_connect, :cs_equality_operator,
190190
:lowercase_schema_reflection, :auto_connect_duration, :showplan_option
191191

192192
self.enable_default_unicode_types = true
@@ -286,12 +286,14 @@ def active?
286286
end
287287

288288
def reconnect!
289+
reset_transaction
289290
disconnect!
290291
connect
291292
active?
292293
end
293294

294295
def disconnect!
296+
reset_transaction
295297
@spid = nil
296298
case @connection_options[:mode]
297299
when :dblib

0 commit comments

Comments
 (0)