tiny_tds 3.2.0 → 3.3.0

data/lib/tiny_tds/gem.rb

@@ -1,5 +1,3 @@
-require "rbconfig"
-
 module TinyTds
   module Gem
     class << self
@@ -11,12 +9,14 @@ module TinyTds
         File.join(root_path, "ports")
       end
 
-      def ports_bin_paths
-        Dir.glob(File.join(ports_root_path, "**", "bin"))
+      def ports_bin_and_lib_paths
+        Dir.glob(File.join(ports_root_path, "#{gem_platform.cpu}-#{gem_platform.os}*", "{bin,lib}"))
       end
 
-      def ports_lib_paths
-        Dir.glob(File.join(ports_root_path, "**", "lib"))
+      private
+
+      def gem_platform
+        ::Gem::Platform.local
       end
     end
   end

data/lib/tiny_tds.rb

@@ -10,8 +10,7 @@ require "tiny_tds/gem"
 module TinyTds
   # Is this file part of a fat binary gem with bundled freetds?
   # This path must be enabled by add_dll_directory on Windows.
-  gplat = ::Gem::Platform.local
-  FREETDS_LIB_PATH = Dir[File.expand_path("../ports/#{gplat.cpu}-#{gplat.os}*/lib", __dir__)].first
+  FREETDS_LIB_PATH = TinyTds::Gem.ports_bin_and_lib_paths.first
 
   add_dll_path = proc do |path, &block|
     if RUBY_PLATFORM =~ /(mswin|mingw)/i && path

data/test/bin/restore-from-native-gem.ps1

@@ -4,7 +4,13 @@ $gemToUnpack = "./tiny_tds-$gemVersion-$env:RUBY_ARCHITECTURE.gem"
 Write-Host "Looking to unpack $gemToUnpack"
 gem unpack --target ./tmp "$gemToUnpack"
 
-# Restore precompiled code
+# Restore precompiled code (Gem code)
 $source = (Resolve-Path ".\tmp\tiny_tds-$gemVersion-$env:RUBY_ARCHITECTURE\lib\tiny_tds").Path
 $destination = (Resolve-Path ".\lib\tiny_tds").Path
 Get-ChildItem $source -Recurse -Exclude "*.rb" | Copy-Item -Destination {Join-Path $destination $_.FullName.Substring($source.length)}
+
+# Restore precompiled code (ports)
+$source = (Resolve-Path ".\tmp\tiny_tds-$gemVersion-$env:RUBY_ARCHITECTURE\ports").Path
+New-Item -ItemType Directory -Path ".\ports" -Force
+$destination = (Resolve-Path ".\ports").Path
+Get-ChildItem $source -Recurse -Exclude "*.rb" | Copy-Item -Destination {Join-Path $destination $_.FullName.Substring($source.length)}

data/test/gem_test.rb

@@ -7,11 +7,9 @@ class GemTest < Minitest::Spec
   describe TinyTds::Gem do
     # We're going to muck with some system globals so lets make sure
     # they get set back later
-    original_platform = RbConfig::CONFIG["arch"]
     original_pwd = Dir.pwd
 
     after do
-      RbConfig::CONFIG["arch"] = original_platform
       Dir.chdir original_pwd
     end
 
@@ -43,56 +41,53 @@ class GemTest < Minitest::Spec
       end
     end
 
-    describe "#ports_bin_paths" do
-      let(:ports_bin_paths) { TinyTds::Gem.ports_bin_paths }
+    describe "#ports_bin_and_lib_paths" do
+      let(:ports_bin_and_lib_paths) { TinyTds::Gem.ports_bin_and_lib_paths }
 
       describe "when the ports directories exist" do
-        let(:fake_bin_paths) do
-          ports_host_root = File.join(gem_root, "ports", "fake-host-with-dirs")
-          [
-            File.join("a", "bin"),
-            File.join("a", "inner", "bin"),
-            File.join("b", "bin")
-          ].map do |p|
+        let(:fake_bin_and_lib_path) do
+          ports_host_root = File.join(gem_root, "ports", "x86_64-unknown")
+          ["bin", "lib"].map do |p|
             File.join(ports_host_root, p)
           end
         end
 
         before do
-          RbConfig::CONFIG["arch"] = "fake-host-with-dirs"
-          fake_bin_paths.each do |path|
+          fake_bin_and_lib_path.each do |path|
             FileUtils.mkdir_p(path)
           end
         end
 
         after do
           FileUtils.remove_entry_secure(
-            File.join(gem_root, "ports", "fake-host-with-dirs"), true
+            File.join(gem_root, "ports", "x86_64-unknown"), true
           )
         end
 
         it "should return all the bin directories" do
-          _(ports_bin_paths.sort).must_equal fake_bin_paths.sort
-        end
+          fake_platform = Gem::Platform.new("x86_64-unknown")
+
+          Gem::Platform.stub(:local, fake_platform) do
+            _(ports_bin_and_lib_paths.sort).must_equal fake_bin_and_lib_path.sort
 
-        it "should return all the bin directories regardless of cwd" do
-          Dir.chdir "/"
-          _(ports_bin_paths.sort).must_equal fake_bin_paths.sort
+            # should return the same regardless of path
+            Dir.chdir "/"
+            _(ports_bin_and_lib_paths.sort).must_equal fake_bin_and_lib_path.sort
+          end
         end
       end
 
       describe "when the ports directories are missing" do
-        before do
-          RbConfig::CONFIG["arch"] = "fake-host-without-dirs"
-        end
-
         it "should return no directories" do
-          _(ports_bin_paths).must_be_empty
-        end
+          fake_platform = Gem::Platform.new("x86_64-unknown")
 
-        it "should return no directories regardless of cwd" do
-          Dir.chdir "/"
-          _(ports_bin_paths).must_be_empty
+          Gem::Platform.stub(:local, fake_platform) do
+            _(ports_bin_and_lib_paths).must_be_empty
+
+            # should be empty regardless of path
+            Dir.chdir "/"
+            _(ports_bin_and_lib_paths).must_be_empty
+          end
         end
       end
     end

data/test/thread_test.rb

@@ -65,7 +65,7 @@ class ThreadTest < TinyTds::TestCase
           result = client.execute "waitfor delay '00:00:#{delay}'; select db_name()"
           result.each { |r| puts r }
         rescue TinyTds::Error => e
-          if e.message == "Adaptive Server connection timed out"
+          if e.message.include?("connection timed out")
             exception = true
           end
         end

data/tiny_tds.gemspec

@@ -1,9 +1,9 @@
 $LOAD_PATH.push File.expand_path("../lib", __FILE__)
-require "tiny_tds/version"
+version = File.read(File.expand_path("VERSION", __dir__)).strip
 
 Gem::Specification.new do |s|
   s.name = "tiny_tds"
-  s.version = TinyTds::VERSION
+  s.version = version
   s.platform = Gem::Platform::RUBY
   s.authors = ["Ken Collins", "Erik Bryn", "Will Bond"]
   s.email = ["ken@metaskills.net", "will@wbond.net"]

metadata

@@ -1,16 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: tiny_tds
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Ken Collins
 - Erik Bryn
 - Will Bond
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-02-11 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bigdecimal
@@ -165,6 +164,10 @@ extensions:
 extra_rdoc_files: []
 files:
 - ".codeclimate.yml"
+- ".devcontainer/Dockerfile"
+- ".devcontainer/boot.sh"
+- ".devcontainer/compose.yaml"
+- ".devcontainer/devcontainer.json"
 - ".gitattributes"
 - ".github/workflows/ci.yml"
 - ".gitignore"
@@ -177,9 +180,9 @@ files:
 - README.md
 - Rakefile
 - VERSION
+- astyle.conf
 - bin/defncopy-ttds
 - bin/tsql-ttds
-- docker-compose.yml
 - exe/.keep
 - ext/tiny_tds/client.c
 - ext/tiny_tds/client.h
@@ -199,19 +202,12 @@ files:
 - patches/freetds/1.00.27/0001-mingw_missing_inet_pton.diff
 - patches/freetds/1.00.27/0002-Don-t-use-MSYS2-file-libws2_32.diff
 - patches/libiconv/1.14/1-avoid-gets-error.patch
-- setup_cimgruby_dev.sh
-- start_dev.sh
 - tasks/native_gem.rake
 - tasks/package.rake
 - tasks/ports.rake
 - tasks/test.rake
 - test/bin/install-freetds.sh
-- test/bin/install-mssql.ps1
-- test/bin/install-mssqltools.sh
-- test/bin/install-openssl.sh
 - test/bin/restore-from-native-gem.ps1
-- test/bin/setup_tinytds_db.sh
-- test/bin/setup_volume_permissions.sh
 - test/client_test.rb
 - test/gem_test.rb
 - test/result_test.rb
@@ -229,7 +225,6 @@ licenses:
 - MIT
 metadata:
   msys2_mingw_dependencies: freetds
-post_install_message: 
 rdoc_options:
 - "--charset=UTF-8"
 require_paths:
@@ -245,8 +240,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: TinyTDS - A modern, simple and fast FreeTDS library for Ruby using DB-Library.
 test_files: []

data/docker-compose.yml

@@ -1,34 +0,0 @@
-version: '3'
-
-networks:
-  main-network:
-
-services:
-  mssql:
-    image: mcr.microsoft.com/mssql/server:${MSSQL_VERSION:-2017}-latest
-    container_name: sqlserver
-    environment:
-      ACCEPT_EULA: Y
-      MSSQL_SA_PASSWORD: super01S3cUr3
-    ports:
-      - "1433:1433"
-    network_mode: "host"
-
-  toxiproxy:
-    image: shopify/toxiproxy
-    container_name: toxiproxy
-    command: '/toxiproxy -host=127.0.0.1'
-    network_mode: "host"
-
-  cimgruby:
-    image: "cimg/ruby:${RUBY_VERSION:-2.7}"
-    container_name: cimg_ruby
-    environment:
-      TESTOPTS: '-v'
-      TINYTDS_UNIT_HOST: '127.0.0.1'
-      SA_PASSWORD: super01S3cUr3
-      TOXIPROXY_HOST: '127.0.0.1'
-    command: tail -F anything
-    volumes:
-      - .:/home/circleci/project
-    network_mode: "host"

data/setup_cimgruby_dev.sh

@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-
-set -x
-set -e
-
-# this should mirror the steps outlined in the circleci yml
-echo "Installing mssql-tools..."
-sleep 5
-sudo -E ./test/bin/install-mssqltools.sh
-
-echo "Configurating tinytds test database..."
-sleep 5
-./test/bin/setup_tinytds_db.sh
-
-echo "Building openssl library..."
-sleep 5
-sudo -E ./test/bin/install-openssl.sh
-
-echo "Building freetds library..."
-sleep 5
-sudo -E ./test/bin/install-freetds.sh
-
-echo "Installing gems..."
-sleep 5
-bundle install

data/start_dev.sh

@@ -1,21 +0,0 @@
-#!/usr/bin/env bash
-
-set -x
-set -e
-
-# set volume read/write permissions to work both outside and inside container
-sudo ./test/bin/setup_volume_permissions.sh
-
-docker-compose up -d
-echo "Waiting for containers to start..."
-sleep 10
-
-# setup circleci ruby container for development
-docker exec cimg_ruby bash -c './setup_cimgruby_dev.sh'
-
-# enter container
-set +x
-echo "cimg/ruby container is ready for tiny_tds development.........."
-echo "To enter container run: docker exec -it cimg_ruby /bin/bash"
-echo "To build solution run: docker exec cimg_ruby bash -c 'bundle exec rake build'"
-echo "To test solution run: docker exec cimg_ruby bash -c 'bundle exec rake test'"

data/test/bin/install-mssql.ps1

@@ -1,42 +0,0 @@
-param ([int] $Version)
-
-$ProgressPreference = 'SilentlyContinue'
-
-$DownloadLinkTable = @{
-    2017 = "https://go.microsoft.com/fwlink/?linkid=829176";
-    2019 = "https://download.microsoft.com/download/7/c/1/7c14e92e-bdcb-4f89-b7cf-93543e7112d1/SQLEXPR_x64_ENU.exe";
-    2022 = "https://download.microsoft.com/download/3/8/d/38de7036-2433-4207-8eae-06e247e17b25/SQLEXPR_x64_ENU.exe";
-}
-
-$MajorVersionTable = @{
-    2017 = 14;
-    2019 = 15;
-    2022 = 16;
-}
-
-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 $DownloadLinkTable[$Version] -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\mssql$($MajorVersionTable[$Version]).SQLEXPRESS\mssqlserver\supersocketnetlib\tcp\ipall" -name tcpdynamicports -value ''
-set-itemproperty -path "HKLM:\software\microsoft\microsoft sql server\mssql$($MajorVersionTable[$Version]).SQLEXPRESS\mssqlserver\supersocketnetlib\tcp\ipall" -name tcpport -value 1433
-set-itemproperty -path "HKLM:\software\microsoft\microsoft sql server\mssql$($MajorVersionTable[$Version]).SQLEXPRESS\mssqlserver\" -name LoginMode -value 2
-
-Write-Host "Starting SQL Express ..."
-start-service MSSQL`$SQLEXPRESS
-
-Write-Host "Configuring MSSQL for TinyTDS ..."
-& sqlcmd -i './test/sql/db-create.sql'
-& sqlcmd -i './test/sql/db-login.sql'

data/test/bin/install-mssqltools.sh

@@ -1,9 +0,0 @@
-#!/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/install-openssl.sh

@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-
-set -x
-set -e
-
-if [ -z "$OPENSSL_VERSION" ]; then
-  OPENSSL_VERSION=$(ruby -r "./ext/tiny_tds/extconsts.rb" -e "puts OPENSSL_VERSION")
-fi
-
-wget https://www.openssl.org/source/openssl-$OPENSSL_VERSION.tar.gz
-tar -xzf openssl-$OPENSSL_VERSION.tar.gz
-cd openssl-$OPENSSL_VERSION
-./config --prefix=/opt/local --openssldir=/opt/local
-make
-make install_sw install_ssldirs
-cd ..
-rm -rf openssl-$OPENSSL_VERSION
-rm openssl-$OPENSSL_VERSION.tar.gz

data/test/bin/setup_tinytds_db.sh

@@ -1,7 +0,0 @@
-#!/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

@@ -1,10 +0,0 @@
-#!/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 .