tiny_tds 2.1.4-x64-mingw32 → 2.1.6-x64-mingw32

data/tasks/ports.rake

@@ -7,63 +7,69 @@ require_relative 'ports/freetds'
 require_relative '../ext/tiny_tds/extconsts'
 
 namespace :ports do
-  openssl = Ports::Openssl.new(OPENSSL_VERSION)
-  libiconv = Ports::Libiconv.new(ICONV_VERSION)
-  freetds = Ports::Freetds.new(FREETDS_VERSION)
+  libraries_to_compile = {
+    openssl: Ports::Openssl.new(OPENSSL_VERSION),
+    libiconv: Ports::Libiconv.new(ICONV_VERSION),
+    freetds: Ports::Freetds.new(FREETDS_VERSION)
+  }
 
   directory "ports"
-  CLEAN.include "ports/*mingw32*"
+  CLEAN.include "ports/*mingw*"
   CLEAN.include "ports/*.installed"
 
-  task :openssl, [:host] do |task, args|
-    args.with_defaults(host: RbConfig::CONFIG['host'])
+  task :openssl, [:host, :gem_platform] do |_task, args|
+    args.with_defaults(host: RbConfig::CONFIG['host'], gem_platform: RbConfig::CONFIG["arch"])
 
-    openssl.files = [OPENSSL_SOURCE_URI]
-    openssl.host = args.host
-    openssl.cook
-    openssl.activate
+    libraries_to_compile[:openssl].files = [OPENSSL_SOURCE_URI]
+    libraries_to_compile[:openssl].host = args.host
+    libraries_to_compile[:openssl].gem_platform = args.gem_platform
+
+    libraries_to_compile[:openssl].cook
+    libraries_to_compile[:openssl].activate
   end
 
-  task :libiconv, [:host] do |task, args|
-    args.with_defaults(host: RbConfig::CONFIG['host'])
+  task :libiconv, [:host, :gem_platform] do |_task, args|
+    args.with_defaults(host: RbConfig::CONFIG['host'], gem_platform: RbConfig::CONFIG["arch"])
 
-    libiconv.files = [ICONV_SOURCE_URI]
-    libiconv.host = args.host
-    libiconv.cook
-    libiconv.activate
+    libraries_to_compile[:libiconv].files = [ICONV_SOURCE_URI]
+    libraries_to_compile[:libiconv].host = args.host
+    libraries_to_compile[:libiconv].gem_platform = args.gem_platform
+    libraries_to_compile[:libiconv].cook
+    libraries_to_compile[:libiconv].activate
   end
 
-  task :freetds, [:host] do |task, args|
-    args.with_defaults(host: RbConfig::CONFIG['host'])
+  task :freetds, [:host, :gem_platform] do |_task, args|
+    args.with_defaults(host: RbConfig::CONFIG['host'], gem_platform: RbConfig::CONFIG["arch"])
 
-    freetds.files = [FREETDS_SOURCE_URI]
-    freetds.host = args.host
+    libraries_to_compile[:freetds].files = [FREETDS_SOURCE_URI]
+    libraries_to_compile[:freetds].host = args.host
+    libraries_to_compile[:freetds].gem_platform = args.gem_platform
 
-    if openssl
+    if libraries_to_compile[:openssl]
       # freetds doesn't have an option that will provide an rpath
       # so we do it manually
-      ENV['OPENSSL_CFLAGS'] = "-Wl,-rpath -Wl,#{openssl.path}/lib"
+      ENV['OPENSSL_CFLAGS'] = "-Wl,-rpath -Wl,#{libraries_to_compile[:openssl].path}/lib"
       # Add the pkgconfig file with MSYS2'ish path, to prefer our ports build
       # over MSYS2 system OpenSSL.
-      ENV['PKG_CONFIG_PATH'] = "#{openssl.path.gsub(/^(\w):/i){"/"+$1.downcase}}/lib/pkgconfig:#{ENV['PKG_CONFIG_PATH']}"
-      freetds.configure_options << "--with-openssl=#{openssl.path}"
+      ENV['PKG_CONFIG_PATH'] = "#{libraries_to_compile[:openssl].path.gsub(/^(\w):/i) { "/" + $1.downcase }}/lib/pkgconfig:#{ENV['PKG_CONFIG_PATH']}"
+      libraries_to_compile[:freetds].configure_options << "--with-openssl=#{libraries_to_compile[:openssl].path}"
     end
 
-    if libiconv
-      freetds.configure_options << "--with-libiconv-prefix=#{libiconv.path}"
+    if libraries_to_compile[:libiconv]
+      libraries_to_compile[:freetds].configure_options << "--with-libiconv-prefix=#{libraries_to_compile[:libiconv].path}"
     end
 
-    freetds.cook
-    freetds.activate
+    libraries_to_compile[:freetds].cook
+    libraries_to_compile[:freetds].activate
   end
 
-  task :compile, [:host] do |task,args|
-    args.with_defaults(host: RbConfig::CONFIG['host'])
+  task :compile, [:host, :gem_platform] do |_task, args|
+    args.with_defaults(host: RbConfig::CONFIG['host'], gem_platform: RbConfig::CONFIG["arch"])
 
-    puts "Compiling ports for #{args.host}..."
+    puts "Compiling ports for #{args.host} (Ruby platform #{args.gem_platform}) ..."
 
-    ['openssl','libiconv','freetds'].each do |lib|
-      Rake::Task["ports:#{lib}"].invoke(args.host)
+    libraries_to_compile.keys.each do |lib|
+      Rake::Task["ports:#{lib}"].invoke(args.host, args.gem_platform)
     end
   end
 
@@ -72,13 +78,30 @@ namespace :ports do
     require 'rake_compiler_dock'
 
     # build the ports for all our cross compile hosts
-    GEM_PLATFORM_HOSTS.each do |gem_platform, host|
+    GEM_PLATFORM_HOSTS.each do |gem_platform, meta|
       # make sure to install our bundle
       build = ['bundle']
-      build << "rake ports:compile[#{host}] MAKE='make -j`nproc`'"
+      build << "RUBY_CC_VERSION=#{meta[:ruby_versions]} rake ports:compile[#{meta[:host]},#{gem_platform}] MAKE='make -j`nproc`'"
       RakeCompilerDock.sh build.join(' && '), platform: gem_platform
     end
   end
+
+  desc "Notes the actual versions for the compiled ports into a file"
+  task "version_file", [:gem_platform] do |_task, args|
+    args.with_defaults(gem_platform: RbConfig::CONFIG["arch"])
+
+    ports_version = {}
+
+    libraries_to_compile.each do |library, library_recipe|
+      ports_version[library] = library_recipe.version
+    end
+
+    ports_version[:platform] = args.gem_platform
+
+    File.open(".ports_versions", "w") do |f|
+      f.write ports_version
+    end
+  end
 end
 
 desc 'Build ports and activate libraries for the current architecture.'

data/test/bin/install-mssql.ps1

@@ -0,0 +1,31 @@
+$ProgressPreference = 'SilentlyContinue'
+
+if (-not(Test-path "C:\Downloads"))
+{
+    mkdir "C:\Downloads"
+}
+
+$sqlInstallationFile = "C:\Downloads\sqlexpress.exe"
+if (-not(Test-path $sqlInstallationFile -PathType leaf))
+{
+    Write-Host "Downloading SQL Express ..."
+    Invoke-WebRequest -Uri "https://go.microsoft.com/fwlink/?linkid=829176" -OutFile "C:\Downloads\sqlexpress.exe"
+}
+
+Write-Host "Installing SQL Express ..."
+Start-Process -Wait -FilePath "C:\Downloads\sqlexpress.exe" -ArgumentList /qs, /x:"C:\Downloads\setup"
+C:\Downloads\setup\setup.exe /q /ACTION=Install /INSTANCENAME=SQLEXPRESS /FEATURES=SQLEngine /UPDATEENABLED=0 /SQLSVCACCOUNT='NT AUTHORITY\System' /SQLSYSADMINACCOUNTS='BUILTIN\ADMINISTRATORS' /TCPENABLED=1 /NPENABLED=0 /IACCEPTSQLSERVERLICENSETERMS
+
+Write-Host "Configuring SQL Express ..."
+stop-service MSSQL`$SQLEXPRESS
+set-itemproperty -path 'HKLM:\software\microsoft\microsoft sql server\mssql14.SQLEXPRESS\mssqlserver\supersocketnetlib\tcp\ipall' -name tcpdynamicports -value ''
+set-itemproperty -path 'HKLM:\software\microsoft\microsoft sql server\mssql14.SQLEXPRESS\mssqlserver\supersocketnetlib\tcp\ipall' -name tcpport -value 1433
+set-itemproperty -path 'HKLM:\software\microsoft\microsoft sql server\mssql14.SQLEXPRESS\mssqlserver\' -name LoginMode -value 2
+
+Write-Host "Starting SQL Express ..."
+start-service MSSQL`$SQLEXPRESS
+
+Write-Host "Configuring MSSQL for TinyTDS ..."
+& sqlcmd -Q "CREATE DATABASE [tinytdstest];"
+& sqlcmd -Q "CREATE LOGIN [tinytds] WITH PASSWORD = '', CHECK_POLICY = OFF, DEFAULT_DATABASE = [tinytdstest];"
+& sqlcmd -Q "USE [tinytdstest]; CREATE USER [tinytds] FOR LOGIN [tinytds]; EXEC sp_addrolemember N'db_owner', N'tinytds';"

data/test/bin/install-mssqltools.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+set -x
+set -e
+
+curl https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add -
+curl https://packages.microsoft.com/config/ubuntu/20.04/prod.list | sudo tee /etc/apt/sources.list.d/msprod.list
+sudo apt-get update
+sudo ACCEPT_EULA=Y apt-get -y install mssql-tools unixodbc-dev

data/test/bin/setup_tinytds_db.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+set -x
+set -e
+
+/opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P $SA_PASSWORD -i ./test/sql/db-create.sql
+/opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P $SA_PASSWORD -i ./test/sql/db-login.sql

data/test/bin/setup_volume_permissions.sh

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+set -x
+
+sudo groupadd -g 3434 circleci_tinytds
+sudo usermod -a -G circleci_tinytds $USER
+sudo useradd circleci_tinytds -u 3434 -g 3434
+sudo usermod -a -G circleci_tinytds circleci_tinytds
+sudo chgrp -R circleci_tinytds .
+sudo chmod -R g+rwx .

data/test/client_test.rb

@@ -16,6 +16,7 @@ class ClientTest < TinyTds::TestCase
       assert @client.close
       assert @client.closed?
       assert !@client.active?
+      assert @client.dead?
       action = lambda { @client.execute('SELECT 1 as [one]').each }
       assert_raise_tinytds_error(action) do |e|
         assert_match %r{closed connection}i, e.message, 'ignore if non-english test run'
@@ -133,9 +134,8 @@ class ClientTest < TinyTds::TestCase
     end
 
     it 'raises TinyTds exception with tcp socket network failure' do
-      skip if ENV['CI'] && ENV['APPVEYOR_BUILD_FOLDER'] # only CI using docker
       begin
-        client = new_connection timeout: 2, port: 1234
+        client = new_connection timeout: 2, port: 1234, host: ENV['TOXIPROXY_HOST']
         assert_client_works(client)
         action = lambda { client.execute("waitfor delay '00:00:05'").do }
 
@@ -155,9 +155,10 @@ class ClientTest < TinyTds::TestCase
     end
 
     it 'raises TinyTds exception with dead connection network failure' do
-      skip if ENV['CI'] && ENV['APPVEYOR_BUILD_FOLDER'] # only CI using docker
+      skip if ruby_windows?
+
       begin
-        client = new_connection timeout: 2, port: 1234
+        client = new_connection timeout: 2, port: 1234, host: ENV['TOXIPROXY_HOST']
         assert_client_works(client)
         action = lambda { client.execute("waitfor delay '00:00:05'").do }
 
@@ -176,6 +177,23 @@ class ClientTest < TinyTds::TestCase
       end
     end
 
+    it 'raises TinyTds exception with login timeout' do
+      begin
+        action = lambda do
+          Toxiproxy[:sqlserver_test].toxic(:timeout, timeout: 0).apply do
+            new_connection login_timeout: 1, port: 1234, host: ENV['TOXIPROXY_HOST']
+          end
+        end
+        assert_raise_tinytds_error(action) do |e|
+          assert_equal 20003, e.db_error_number
+          assert_equal 6, e.severity
+          assert_match %r{timed out}i, e.message, 'ignore if non-english test run'
+        end
+      ensure
+        assert_new_connections_work
+      end
+    end
+
     it 'raises TinyTds exception with wrong :username' do
       skip if ENV['CI'] && sqlserver_azure? # Some issue with db_error_number.
       options = connection_options :username => 'willnotwork'

data/test/gem_test.rb

@@ -9,11 +9,11 @@ class GemTest < MiniTest::Spec
 
     # We're going to muck with some system globals so lets make sure
     # they get set back later
-    original_host = RbConfig::CONFIG['host']
+    original_platform = RbConfig::CONFIG['arch']
     original_pwd = Dir.pwd
 
     after do
-      RbConfig::CONFIG['host'] = original_host
+      RbConfig::CONFIG['arch'] = original_platform
       Dir.chdir original_pwd
     end
 
@@ -61,7 +61,7 @@ class GemTest < MiniTest::Spec
         end
 
         before do
-          RbConfig::CONFIG['host'] = 'fake-host-with-dirs'
+          RbConfig::CONFIG['arch'] = 'fake-host-with-dirs'
           fake_bin_paths.each do |path|
             FileUtils.mkdir_p(path)
           end
@@ -85,7 +85,7 @@ class GemTest < MiniTest::Spec
 
       describe 'when the ports directories are missing' do
         before do
-          RbConfig::CONFIG['host'] = 'fake-host-without-dirs'
+          RbConfig::CONFIG['arch'] = 'fake-host-without-dirs'
         end
 
         it 'should return no directories' do
@@ -115,7 +115,7 @@ class GemTest < MiniTest::Spec
         end
 
         before do
-          RbConfig::CONFIG['host'] = 'fake-host-with-dirs'
+          RbConfig::CONFIG['arch'] = 'fake-host-with-dirs'
           fake_lib_paths.each do |path|
             FileUtils.mkdir_p(path)
           end
@@ -139,7 +139,7 @@ class GemTest < MiniTest::Spec
 
       describe 'when the ports directories are missing' do
         before do
-          RbConfig::CONFIG['host'] = 'fake-host-without-dirs'
+          RbConfig::CONFIG['arch'] = 'fake-host-without-dirs'
         end
 
 
@@ -156,16 +156,14 @@ class GemTest < MiniTest::Spec
 
     describe '#ports_host' do
       {
-        'i686-pc-linux-gnu' => 'i686-pc-linux-gnu',
-        'x86_64-pc-linux-gnu' => 'x86_64-pc-linux-gnu',
-        'i686-w64-mingw32' => 'i686-w64-mingw32',
-        'x86_64-w64-mingw32' => 'x86_64-w64-mingw32',
-        # consolidate this host to our build w64-mingw32 arch
-        'i686-pc-mingw32' => 'i686-w64-mingw32'
+        'x64-mingw-ucrt' => 'x64-mingw-ucrt',
+        'x64-mingw32' => 'x64-mingw32',
+        'x86-mingw32' => 'x86-mingw32',
+        'x86_64-linux' => 'x86_64-linux',
       }.each do |host,expected|
         describe "on a #{host} architecture" do
           before do
-            RbConfig::CONFIG['host'] = host
+            RbConfig::CONFIG['arch'] = host
           end
 
           it "should return a #{expected} ports host" do

data/test/sql/db-create.sql

@@ -0,0 +1,18 @@
+:ON ERROR EXIT
+
+PRINT 'RUNNING DB-CREATE.SQL, CREATING TINYTDS TEST DATABASE';
+IF NOT EXISTS(SELECT * FROM sys.databases WHERE name = 'tinytdstest')
+BEGIN
+  CREATE DATABASE [tinytdstest];
+END
+GO
+
+IF EXISTS (SELECT name FROM master.dbo.sysdatabases WHERE name LIKE 'tinytdstest')
+BEGIN
+  PRINT 'TINY TDS TEST DB SUCCESSFULY CREATED';
+END
+ELSE
+BEGIN
+  THROW 51000, 'TINY TDS TEST DB CREATION FAILED', 1;
+END
+GO

data/test/sql/db-login.sql

@@ -0,0 +1,38 @@
+:ON ERROR EXIT
+
+PRINT 'RUNNING DB-LOGIN.SQL';
+
+PRINT 'CREATING TINYTDS TEST LOGIN';
+IF NOT EXISTS (select name from sys.server_principals where name like 'tinytds')
+BEGIN
+  CREATE LOGIN [tinytds] WITH PASSWORD = '', CHECK_POLICY = OFF, DEFAULT_DATABASE = [tinytdstest];
+END
+GO
+
+IF EXISTS (select name from sys.server_principals where name like 'tinytds')
+BEGIN
+  PRINT 'TINY TDS TEST LOGIN SUCCESSFULY CREATED';
+END
+ELSE
+BEGIN
+  THROW 51000, 'TINY TDS TEST LOGIN CREATION FAILED', 1;
+END
+GO
+
+USE [tinytdstest];
+IF NOT EXISTS (select name from sys.database_principals where name LIKE 'tinytds')
+BEGIN
+  CREATE USER [tinytds] FOR LOGIN [tinytds];
+  EXEC sp_addrolemember N'db_owner', N'tinytds';
+END
+GO
+
+IF EXISTS (select name from sys.database_principals where name LIKE 'tinytds')
+BEGIN
+  PRINT 'TINY TDS TEST USER SUCCESSFULY CREATED';
+END
+ELSE
+BEGIN
+  THROW 51000, 'TINY TDS TEST USER CREATION FAILED', 1;
+END
+GO

data/test/test_helper.rb

@@ -248,22 +248,31 @@ module TinyTds
     end
 
     def init_toxiproxy
-      return if ENV['APPVEYOR_BUILD_FOLDER'] # only for CI using docker
-
       # In order for toxiproxy to work for local docker instances of mssql, the containers must be on the same network
       # and the host used below must match the mssql container name so toxiproxy knows where to proxy to.
       # localhost from the perspective of toxiproxy's container is its own container an *not* the mssql container it needs to proxy to.
       # docker-compose.yml handles this automatically for us. In instances where someone is using their own local mssql container they'll
       # need to set up the networks manually and set TINYTDS_UNIT_HOST to their mssql container name
       # For anything other than localhost just use the environment config
-      env_host = ENV['TINYTDS_UNIT_HOST_TEST'] || ENV['TINYTDS_UNIT_HOST'] || 'localhost'
-      host = ['localhost', '127.0.0.1', '0.0.0.0'].include?(env_host) ? 'sqlserver' : env_host
-      port = ENV['TINYTDS_UNIT_PORT'] || 1433
+      toxi_host = ENV['TOXIPROXY_HOST'] || 'localhost'
+      toxi_api_port = 8474
+      toxi_test_port = 1234
+      Toxiproxy.host = "http://#{toxi_host}:#{toxi_api_port}"
+
+      toxi_upstream_host = ENV['TINYTDS_UNIT_HOST_TEST'] || ENV['TINYTDS_UNIT_HOST'] || 'localhost'
+      toxi_upstream_port = ENV['TINYTDS_UNIT_PORT'] || 1433
+
+      puts "\n-------------------------"
+      puts "Toxiproxy api listener: #{toxi_host}:#{toxi_api_port}"
+      puts "Toxiproxy unit test listener: #{toxi_host}:#{toxi_test_port}"
+      puts "Toxiproxy upstream sqlserver: #{toxi_upstream_host}:#{toxi_upstream_port}"
+      puts '-------------------------'
+
       Toxiproxy.populate([
         {
           name: "sqlserver_test",
-          listen: "0.0.0.0:1234",
-          upstream: "#{host}:#{port}"
+          listen: "#{toxi_host}:#{toxi_test_port}",
+          upstream: "#{toxi_upstream_host}:#{toxi_upstream_port}"
         }
       ])
     end

data/tiny_tds.gemspec

@@ -20,11 +20,12 @@ Gem::Specification.new do |s|
   s.license       = 'MIT'
   s.required_ruby_version = '>= 2.0.0'
   s.metadata['msys2_mingw_dependencies'] = 'freetds'
-  s.add_development_dependency 'mini_portile2', '~> 2.0'
-  s.add_development_dependency 'rake', '~> 13.0'
-  s.add_development_dependency 'rake-compiler', '~> 1.0'
-  s.add_development_dependency 'rake-compiler-dock', '~> 1.0'
-  s.add_development_dependency 'minitest', '~> 5.6'
-  s.add_development_dependency 'connection_pool', '~> 2.2'
+  s.add_development_dependency 'mini_portile2', '~> 2.5.0'
+  s.add_development_dependency 'rake', '~> 13.0.0'
+  s.add_development_dependency 'rake-compiler', '~> 1.2'
+  s.add_development_dependency 'rake-compiler-dock', '~> 1.3.0'
+  s.add_development_dependency 'minitest', '~> 5.14.0'
+  s.add_development_dependency 'minitest-ci', '~> 3.4.0'
+  s.add_development_dependency 'connection_pool', '~> 2.2.0'
   s.add_development_dependency 'toxiproxy', '~> 2.0.0'
 end