Support Ruby v4.0 (#602)

* Add Ruby 4.0 to the cross-compile list

* No longer ship a precompiled gem for Ruby 2.7

* Update OpenSSL and FreeTDS in precompiled gem

* Relax bigdecimal version requirement

* Bump Rake to v13.2.0

This removes the `ostruct` dependency from `rake` itself

* Add `ostruct` for Ruby v4.0

* Remove dependency on `logger`

* Add `benchmark` for Ruby v4.0

Author: andyundso

.github/workflows/ci.yml

@@ -60,7 +60,6 @@ jobs:
       fail-fast: false
       matrix:
         ruby-version:
-          - "2.7"
           - "3.0"
 
     name: install-windows-mingw
@@ -112,7 +111,6 @@ jobs:
           - 2019
           - 2022
         ruby-version:
-          - "2.7"
           - "3.0"
 
     name: test-windows-mingw
@@ -179,6 +177,7 @@ jobs:
           - "3.2"
           - "3.3"
           - "3.4"
+          - "4.0"
 
     name: install-windows-ucrt
     runs-on: windows-latest
@@ -233,6 +232,7 @@ jobs:
           - "3.2"
           - "3.3"
           - "3.4"
+          - "4.0"
 
     name: test-windows-ucrt
     runs-on: windows-latest
@@ -301,6 +301,7 @@ jobs:
           - "3.2"
           - "3.3"
           - "3.4"
+          - "4.0"
 
     name: install-windows-native
     runs-on: windows-latest
@@ -353,12 +354,12 @@ jobs:
           - "aarch64-linux-musl"
 
         ruby-version:
-          - "2.7"
           - "3.0"
           - "3.1"
           - "3.2"
           - "3.3"
           - "3.4"
+          - "4.0"
 
         include:
           - platform: x86_64-linux-musl
@@ -414,12 +415,12 @@ jobs:
           - 2022
 
         ruby-version:
-          - "2.7"
           - "3.0"
           - "3.1"
           - "3.2"
           - "3.3"
           - "3.4"
+          - "4.0"
 
     runs-on: ubuntu-22.04
     steps:
@@ -482,6 +483,7 @@ jobs:
           - "3.2"
           - "3.3"
           - "3.4"
+          - "4.0"
 
     name: install-linux-native
     runs-on: ubuntu-22.04
@@ -528,6 +530,7 @@ jobs:
           - "3.2"
           - "3.3"
           - "3.4"
+          - "4.0"
 
     name: install-macos-m1
     runs-on: macos-14

CHANGELOG.md

@@ -1,5 +1,13 @@
 ## (unreleased)
 
+## 3.4.0
+
+* Add Ruby 4.0 to the cross compile list
+* No longer ship a precompiled Gem for Ruby 2.7
+  * This is due to an [upstream change](https://github.com/rake-compiler/rake-compiler-dock/releases/tag/v1.11.0). Users on Windows and Linux on Ruby v2.7 are advised to either upgrade or install FreeTDS manually.
+* Use freetds v1.5.10 and OpenSSL v3.6.0 for Windows and Linux builds.
+* Lower `bigdecimal` requirement to `>= 2.0.0` (was 3.0 only) to allow `bigdecimal` 4.0 on Ruby 4.0. Closes #601.
+
 ## 3.3.0
 
 * Use freetds v1.5.4 and OpenSSL v3.5.2 for Windows and Linux builds.

ext/tiny_tds/extconsts.rb

@@ -1,8 +1,8 @@
 ICONV_VERSION = ENV["TINYTDS_ICONV_VERSION"] || "1.18"
 ICONV_SOURCE_URI = "http://ftp.gnu.org/pub/gnu/libiconv/libiconv-#{ICONV_VERSION}.tar.gz"
 
-OPENSSL_VERSION = ENV["TINYTDS_OPENSSL_VERSION"] || "3.5.2"
+OPENSSL_VERSION = ENV["TINYTDS_OPENSSL_VERSION"] || "3.6.0"
 OPENSSL_SOURCE_URI = "https://www.openssl.org/source/openssl-#{OPENSSL_VERSION}.tar.gz"
 
-FREETDS_VERSION = ENV["TINYTDS_FREETDS_VERSION"] || "1.5.4"
+FREETDS_VERSION = ENV["TINYTDS_FREETDS_VERSION"] || "1.5.10"
 FREETDS_SOURCE_URI = "http://www.freetds.org/files/stable/freetds-#{FREETDS_VERSION}.tar.bz2"

tasks/native_gem.rake

@@ -7,7 +7,7 @@ CrossLibraries.each do |xlib|
 
     RakeCompilerDock.sh <<-EOT, platform: platform
 			bundle install &&
-			rake native:#{platform} pkg/#{SPEC.full_name}-#{platform}.gem MAKEOPTS=-j`nproc` RUBY_CC_VERSION=#{RakeCompilerDock.set_ruby_cc_version("~> 2.7", "~> 3.0")} MAKEFLAGS="V=1"
+			rake native:#{platform} pkg/#{SPEC.full_name}-#{platform}.gem MAKEOPTS=-j`nproc` RUBY_CC_VERSION=#{RakeCompilerDock.set_ruby_cc_version("~> 3.0", "~> 4.0")} MAKEFLAGS="V=1"
     EOT
   end
 

test/thread_test.rb

@@ -1,12 +1,9 @@
 require "test_helper"
-require "logger"
 require "benchmark"
 
 class ThreadTest < TinyTds::TestCase
   describe "Threaded SELECT queries" do
     before do
-      @logger = Logger.new $stdout
-      @logger.level = Logger::WARN
       @poolsize = 4
       @numthreads = 10
       @query = "waitfor delay '00:00:01'"
@@ -22,19 +19,14 @@ class ThreadTest < TinyTds::TestCase
       x = Benchmark.realtime do
         threads = []
         @numthreads.times do |i|
-          start = Time.new
           threads << Thread.new do
-            ts = Time.new
             @pool.with { |c| c.execute(@query).do }
-            te = Time.new
-            @logger.info "Thread #{i} finished in #{te - ts} thread seconds, #{te - start} real seconds"
           end
         end
         threads.each { |t| t.join }
       end
       assert x < @numthreads, "#{x} is not faster than #{@numthreads} seconds"
       mintime = (1.0 * @numthreads / @poolsize).ceil
-      @logger.info "#{@numthreads} queries on #{@poolsize} threads: #{x} sec. Minimum time: #{mintime} sec."
       assert x > mintime, "#{x} is not slower than #{mintime} seconds"
     end
 

tiny_tds.gemspec

@@ -18,14 +18,17 @@ Gem::Specification.new do |s|
   s.license = "MIT"
   s.required_ruby_version = ">= 2.7.0"
   s.metadata["msys2_mingw_dependencies"] = "freetds"
-  s.add_dependency "bigdecimal", "~> 3"
+  s.add_dependency "bigdecimal", ">= 2.0.0"
   s.add_development_dependency "mini_portile2", "~> 2.8.0"
-  s.add_development_dependency "rake", "~> 13.0.0"
+  s.add_development_dependency "rake", "~> 13.2.0"
   s.add_development_dependency "rake-compiler", "~> 1.2"
-  s.add_development_dependency "rake-compiler-dock", "~> 1.9.1"
+  s.add_development_dependency "rake-compiler-dock", "~> 1.11.0"
   s.add_development_dependency "minitest", "~> 5.25"
   s.add_development_dependency "minitest-reporters", "~> 1.6.1"
   s.add_development_dependency "connection_pool", "~> 2.2.0"
   s.add_development_dependency "toxiproxy", "~> 2.0.0"
   s.add_development_dependency "standard", "~> 1.31.0"
+  # ostruct can be dropped when updating to Rubocop 1.65+
+  s.add_development_dependency "ostruct"
+  s.add_development_dependency "benchmark"
 end