Skip to content

Commit 4417a15

Browse files
committed
Debug
1 parent d735224 commit 4417a15

File tree

4 files changed

+25
-18
lines changed

4 files changed

+25
-18
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
source 'https://rubygems.org'
22
gemspec
33

4-
gem 'bcrypt'
4+
gem 'bcrypt', platforms: [:ruby]
55
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
66

77
if RbConfig::CONFIG["host_os"] =~ /darwin/

Rakefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ require_relative 'test/support/rake_helpers'
66
task test: ['test:dblib']
77
task default: [:test]
88

9+
puts ENV.inspect
10+
911
namespace :test do
1012

1113
%w(dblib odbc).each do |mode|

appveyor.yml

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,28 +14,32 @@ install:
1414
- bundle install --without odbc
1515
build: off
1616
test_script:
17-
- powershell -File "%APPVEYOR_BUILD_FOLDER%\test\appveyor\dbsetup.ps1"
18-
- timeout /t 4 /nobreak > NUL
19-
- ps: Start-Service 'MSSQL$SQL2014'
20-
- timeout /t 4 /nobreak > NUL
21-
- sqlcmd -S ".\SQL2014" -U sa -P Password12! -i %APPVEYOR_BUILD_FOLDER%\test\appveyor\dbsetup.sql
22-
- bundle exec rake test ACTIVERECORD_UNITTEST_DATASERVER="localhost\SQL2014"
23-
- bundle exec rake test ACTIVERECORD_UNITTEST_DATASERVER="localhost\SQL2014" ACTIVERECORD_UNITTEST_TDSVERSION="7.3"
24-
- ps: Stop-Service 'MSSQL$SQL2014'
25-
- ps: Start-Service 'MSSQL$SQL2012SP1'
26-
- timeout /t 4 /nobreak > NUL
27-
- sqlcmd -S ".\SQL2012SP1" -U sa -P Password12! -i %APPVEYOR_BUILD_FOLDER%\test\appveyor\dbsetup.sql
28-
- bundle exec rake test ACTIVERECORD_UNITTEST_DATASERVER="localhost\SQL2012SP1"
29-
- bundle exec rake test ACTIVERECORD_UNITTEST_DATASERVER="localhost\SQL2012SP1" ACTIVERECORD_UNITTEST_TDSVERSION="7.3"
30-
- timeout /t 4 /nobreak > NUL
31-
- bundle exec rake test ACTIVERECORD_UNITTEST_AZURE=1 ACTIVERECORD_UNITTEST_HOST=%CI_AZURE_HOST% ACTIVERECORD_UNITTEST_PASS=%CI_AZURE_PASS% ONLY_SQLSERVER=1
17+
# - powershell -File "%APPVEYOR_BUILD_FOLDER%\test\appveyor\dbsetup.ps1"
18+
# - timeout /t 4 /nobreak > NUL
19+
# - ps: Start-Service 'MSSQL$SQL2014'
20+
# - timeout /t 4 /nobreak > NUL
21+
# - sqlcmd -S ".\SQL2014" -U sa -P Password12! -i %APPVEYOR_BUILD_FOLDER%\test\appveyor\dbsetup.sql
22+
# - bundle exec rake test ACTIVERECORD_UNITTEST_DATASERVER="localhost\SQL2014"
23+
# - bundle exec rake test ACTIVERECORD_UNITTEST_DATASERVER="localhost\SQL2014" ACTIVERECORD_UNITTEST_TDSVERSION="7.3"
24+
# - ps: Stop-Service 'MSSQL$SQL2014'
25+
# - ps: Start-Service 'MSSQL$SQL2012SP1'
26+
# - timeout /t 4 /nobreak > NUL
27+
# - sqlcmd -S ".\SQL2012SP1" -U sa -P Password12! -i %APPVEYOR_BUILD_FOLDER%\test\appveyor\dbsetup.sql
28+
# - bundle exec rake test ACTIVERECORD_UNITTEST_DATASERVER="localhost\SQL2012SP1"
29+
# - bundle exec rake test ACTIVERECORD_UNITTEST_DATASERVER="localhost\SQL2012SP1" ACTIVERECORD_UNITTEST_TDSVERSION="7.3"
30+
# - timeout /t 4 /nobreak > NUL
31+
# - bundle exec rake test ACTIVERECORD_UNITTEST_AZURE=1 ACTIVERECORD_UNITTEST_HOST=%CI_AZURE_HOST% ACTIVERECORD_UNITTEST_PASS=%CI_AZURE_PASS% ONLY_SQLSERVER=1
3232
# - timeout /t 4 /nobreak > NUL
3333
# - 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"
34+
- bundle exec rake test ACTIVERECORD_UNITTEST_HOST=%CI_AZURE_HOST% ACTIVERECORD_UNITTEST_USER=%CI_AZURE_USER% ACTIVERECORD_UNITTEST_PASS=%CI_AZURE_PASS% ACTIVERECORD_UNITTEST_AZURE=1 ONLY_SQLSERVER=1 TDSVER=7.3
3435
environment:
3536
CI_AZURE_HOST:
3637
secure: VChrioaIWkf9iuuaSs4cryiA4honrADgZqNC0++begg=
38+
CI_AZURE_USER:
39+
secure: Z10Hf0Lppp+/FJNeQcpd7C2djhVBXBVDVeyxSSQ9Y3o=
3740
CI_AZURE_PASS:
3841
secure: cSQp8sk4urJYvq0utpsK+r7J+snJ2wpcdp8RdXJfB+w=
3942
matrix:
40-
- ruby_version: "200-x64"
41-
- ruby_version: "21-x64"
43+
# - ruby_version: "200-x64"
44+
# - ruby_version: "21-x64"
45+
ruby_version: "22-x64"

lib/active_record/connection_adapters/sqlserver_adapter.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -308,6 +308,7 @@ def connect
308308
end
309309

310310
def dblib_connect(config)
311+
puts config.inspect
311312
TinyTds::Client.new(
312313
dataserver: config[:dataserver],
313314
host: config[:host],

0 commit comments

Comments
 (0)