Debug

Author: metaskills

appveyor.yml

@@ -32,7 +32,7 @@ test_script:
   # - timeout /t 4 /nobreak > NUL
   # - bundle exec rake test ACTIVERECORD_UNITTEST_AZURE=1 ACTIVERECORD_UNITTEST_HOST=%CI_AZURE_HOST% ACTIVERECORD_UNITTEST_PASS=%CI_AZURE_PASS% ACTIVERECORD_UNITTEST_TDSVERSION="7.3"
   - bundle exec ruby %APPVEYOR_BUILD_FOLDER%\test\debug.rb
-  - bundle exec rake --trace test ACTIVERECORD_UNITTEST_HOST=%CI_AZURE_HOST% ACTIVERECORD_UNITTEST_PASS=%CI_AZURE_PASS% ACTIVERECORD_UNITTEST_AZURE=1 ONLY_SQLSERVER=1 TDSVER=7.3
+  # - bundle exec rake --trace test ACTIVERECORD_UNITTEST_HOST=%CI_AZURE_HOST% ACTIVERECORD_UNITTEST_PASS=%CI_AZURE_PASS% ACTIVERECORD_UNITTEST_AZURE=1 ONLY_SQLSERVER=1 TDSVER=7.3
 environment:
   CI_AZURE_HOST:
     secure: VChrioaIWkf9iuuaSs4cryiA4honrADgZqNC0++begg=

lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -308,32 +308,20 @@ def connect
       end
 
       def dblib_connect(config)
-        options = {
-          # dataserver: config[:dataserver],
+        TinyTds::Client.new(
+          dataserver: config[:dataserver],
           host: config[:host],
-          # port: config[:port],
+          port: config[:port],
           username: config[:username],
           password: config[:password],
           database: config[:database],
-          # tds_version: config[:tds_version],
-          # appname: config_appname(config),
-          # login_timeout: config_login_timeout(config),
-          # timeout: config_timeout(config),
-          # encoding:  config_encoding(config),
+          tds_version: config[:tds_version],
+          appname: config_appname(config),
+          login_timeout: config_login_timeout(config),
+          timeout: config_timeout(config),
+          encoding:  config_encoding(config),
           azure: config[:azure]
-        }
-        puts "\n\n\ndblib_connect:"
-        puts options.except(:password).inspect
-        c = ::TinyTds::Client.new(
-          host: ENV['CI_AZURE_HOST'],
-          username: 'rails',
-          password: ENV['CI_AZURE_PASS'],
-          database: 'activerecord_unittest',
-          azure: true
-        )
-        puts c.execute("SELECT 1 AS [one]").each
-        c.close
-        TinyTds::Client.new(options).tap do |client|
+        ).tap do |client|
           if config[:azure]
             client.execute('SET ANSI_NULLS ON').do
             client.execute('SET CURSOR_CLOSE_ON_COMMIT OFF').do

test/cases/helper_sqlserver.rb

@@ -1,17 +1,4 @@
 require 'bundler' ; Bundler.require :default, :development, :test
-
-puts "\n\n\nBOOT:"
-require 'tiny_tds'
-c = ::TinyTds::Client.new(
-  host: ENV['CI_AZURE_HOST'],
-  username: 'rails',
-  password: ENV['CI_AZURE_PASS'],
-  database: 'activerecord_unittest',
-  azure: true
-)
-puts c.execute("SELECT 1 AS [one]").each
-c.close
-
 require 'support/paths_sqlserver'
 require 'support/minitest_sqlserver'
 require 'cases/helper'

test/debug.rb

@@ -1,4 +1,4 @@
-require 'bundler' ; Bundler.require :default, :development, :test
+# require 'bundler' ; Bundler.require :default, :development, :test
 require 'tiny_tds'
 
 c = TinyTds::Client.new(