Skip to content

Commit 582bbbe

Browse files
committed
Make :timeout config cope with rails 5000 meaning 5 seconds.
1 parent a597532 commit 582bbbe

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

lib/active_record/connection_adapters/sqlserver_adapter.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ def connect
347347
when :dblib
348348
appname = config[:appname] || Rails.application.class.name.split('::').first rescue nil
349349
login_timeout = config[:login_timeout].present? ? config[:login_timeout].to_i : nil
350-
timeout = config[:timeout].present? ? config[:timeout].to_i : nil
350+
timeout = config[:timeout].present? ? config[:timeout].to_i/1000 : nil
351351
encoding = config[:encoding].present? ? config[:encoding] : nil
352352
TinyTds::Client.new({
353353
:dataserver => config[:dataserver],

0 commit comments

Comments
 (0)