tiny_tds 3.1.0 → 3.2.0

data/test/test_helper.rb

@@ -1,26 +1,24 @@
-# encoding: UTF-8
-require 'bundler' ; Bundler.require :development, :test
-require 'tiny_tds'
-require 'minitest/autorun'
-require 'toxiproxy'
+require "bundler"
+Bundler.require :development, :test
+require "tiny_tds"
+require "minitest/autorun"
+require "toxiproxy"
 
 require "minitest/reporters"
 Minitest::Reporters.use! [Minitest::Reporters::SpecReporter.new, Minitest::Reporters::JUnitReporter.new]
 
-TINYTDS_SCHEMAS = ['sqlserver_2017', 'sqlserver_azure'].freeze
+TINYTDS_SCHEMAS = ["sqlserver_2017", "sqlserver_azure"].freeze
 
 module TinyTds
   class TestCase < Minitest::Spec
-
     class << self
-
       def current_schema
-        ENV['TINYTDS_SCHEMA'] || 'sqlserver_2017'
+        ENV["TINYTDS_SCHEMA"] || "sqlserver_2017"
       end
 
       TINYTDS_SCHEMAS.each do |schema|
-        define_method "#{schema}?" do
-          schema == self.current_schema
+        define_method :"#{schema}?" do
+          schema == current_schema
         end
       end
     end
@@ -30,7 +28,7 @@ module TinyTds
     protected
 
     TINYTDS_SCHEMAS.each do |schema|
-      define_method "#{schema}?" do
+      define_method :"#{schema}?" do
         schema == self.class.current_schema
       end
     end
@@ -39,45 +37,44 @@ module TinyTds
       self.class.current_schema
     end
 
-    def close_client(client=@client)
+    def close_client(client = @client)
       client.close if defined?(client) && client.is_a?(TinyTds::Client)
     end
 
-    def new_connection(options={})
+    def new_connection(options = {})
       client = TinyTds::Client.new(connection_options(options))
       if sqlserver_azure?
-        client.execute('SET ANSI_NULLS ON').do
-        client.execute('SET CURSOR_CLOSE_ON_COMMIT OFF').do
-        client.execute('SET ANSI_NULL_DFLT_ON ON').do
-        client.execute('SET IMPLICIT_TRANSACTIONS OFF').do
-        client.execute('SET ANSI_PADDING ON').do
-        client.execute('SET QUOTED_IDENTIFIER ON').do
-        client.execute('SET ANSI_WARNINGS ON').do
+        client.execute("SET ANSI_NULLS ON").do
+        client.execute("SET CURSOR_CLOSE_ON_COMMIT OFF").do
+        client.execute("SET ANSI_NULL_DFLT_ON ON").do
+        client.execute("SET IMPLICIT_TRANSACTIONS OFF").do
+        client.execute("SET ANSI_PADDING ON").do
+        client.execute("SET QUOTED_IDENTIFIER ON").do
+        client.execute("SET ANSI_WARNINGS ON").do
       else
-        client.execute('SET ANSI_DEFAULTS ON').do
-        client.execute('SET CURSOR_CLOSE_ON_COMMIT OFF').do
-        client.execute('SET IMPLICIT_TRANSACTIONS OFF').do
+        client.execute("SET ANSI_DEFAULTS ON").do
+        client.execute("SET CURSOR_CLOSE_ON_COMMIT OFF").do
+        client.execute("SET IMPLICIT_TRANSACTIONS OFF").do
       end
-      client.execute('SET TEXTSIZE 2147483647').do
-      client.execute('SET CONCAT_NULL_YIELDS_NULL ON').do
+      client.execute("SET TEXTSIZE 2147483647").do
+      client.execute("SET CONCAT_NULL_YIELDS_NULL ON").do
       client
     end
 
-    def connection_options(options={})
-      username = (sqlserver_azure? ? ENV['TINYTDS_UNIT_AZURE_USER'] : ENV['TINYTDS_UNIT_USER']) || 'tinytds'
-      password = (sqlserver_azure? ? ENV['TINYTDS_UNIT_AZURE_PASS'] : ENV['TINYTDS_UNIT_PASS']) || ''
-      { :dataserver    => sqlserver_azure? ? nil : ENV['TINYTDS_UNIT_DATASERVER'],
-        :host          => ENV['TINYTDS_UNIT_HOST'] || 'localhost',
-        :port          => ENV['TINYTDS_UNIT_PORT'] || '1433',
-        :tds_version   => ENV['TINYTDS_UNIT_VERSION'],
-        :username      => username,
-        :password      => password,
-        :database      => ENV['TINYTDS_UNIT_DATABASE'] || 'tinytdstest',
-        :appname       => 'TinyTds Dev',
-        :login_timeout => 5,
-        :timeout       => connection_timeout,
-        :azure         => sqlserver_azure?
-      }.merge(options)
+    def connection_options(options = {})
+      username = (sqlserver_azure? ? ENV["TINYTDS_UNIT_AZURE_USER"] : ENV["TINYTDS_UNIT_USER"]) || "tinytds"
+      password = (sqlserver_azure? ? ENV["TINYTDS_UNIT_AZURE_PASS"] : ENV["TINYTDS_UNIT_PASS"]) || ""
+      {dataserver: sqlserver_azure? ? nil : ENV["TINYTDS_UNIT_DATASERVER"],
+       host: ENV["TINYTDS_UNIT_HOST"] || "localhost",
+       port: ENV["TINYTDS_UNIT_PORT"] || "1433",
+       tds_version: ENV["TINYTDS_UNIT_VERSION"],
+       username: username,
+       password: password,
+       database: ENV["TINYTDS_UNIT_DATABASE"] || "tinytdstest",
+       appname: "TinyTds Dev",
+       login_timeout: 5,
+       timeout: connection_timeout,
+       azure: sqlserver_azure?}.merge(options)
     end
 
     def connection_timeout
@@ -85,7 +82,7 @@ module TinyTds
     end
 
     def assert_client_works(client)
-      _(client.execute("SELECT 'client_works' as [client_works]").each).must_equal [{'client_works' => 'client_works'}]
+      _(client.execute("SELECT 'client_works' as [client_works]").each).must_equal [{"client_works" => "client_works"}]
     end
 
     def assert_new_connections_work
@@ -102,28 +99,26 @@ module TinyTds
       rescue TinyTds::Error => e
         error_raised = true
       end
-      assert error_raised, 'expected a TinyTds::Error but none happened'
+      assert error_raised, "expected a TinyTds::Error but none happened"
       yield e
     ensure
       close_client(result)
     end
 
     def inspect_tinytds_exception
-      begin
-        yield
-      rescue TinyTds::Error => e
-        props = { :source => e.source, :message => e.message, :severity => e.severity,
-                  :db_error_number => e.db_error_number, :os_error_number => e.os_error_number }
-        raise "TinyTds::Error - #{props.inspect}"
-      end
+      yield
+    rescue TinyTds::Error => e
+      props = {source: e.source, message: e.message, severity: e.severity,
+               db_error_number: e.db_error_number, os_error_number: e.os_error_number}
+      raise "TinyTds::Error - #{props.inspect}"
     end
 
     def assert_binary_encoding(value)
-      assert_equal Encoding.find('BINARY'), value.encoding
+      assert_equal Encoding.find("BINARY"), value.encoding
     end
 
     def assert_utf8_encoding(value)
-      assert_equal Encoding.find('UTF-8'), value.encoding
+      assert_equal Encoding.find("UTF-8"), value.encoding
     end
 
     def rubyRbx?
@@ -131,17 +126,17 @@ module TinyTds
     end
 
     def ruby_windows?
-      RbConfig::CONFIG['host_os'] =~ /ming/
+      RbConfig::CONFIG["host_os"] =~ /ming/
     end
 
     def ruby_darwin?
-      RbConfig::CONFIG['host_os'] =~ /darwin/
+      RbConfig::CONFIG["host_os"] =~ /darwin/
     end
 
     def load_current_schema
       loader = new_connection
-      schema_file = File.expand_path File.join(File.dirname(__FILE__), 'schema', "#{current_schema}.sql")
-      schema_sql = File.open(schema_file,"rb:UTF-8") { |f|f.read }
+      schema_file = File.expand_path File.join(File.dirname(__FILE__), "schema", "#{current_schema}.sql")
+      schema_sql = File.open(schema_file, "rb:UTF-8") { |f| f.read }
       loader.execute(drop_sql).do
       loader.execute(schema_sql).do
       loader.execute(sp_sql).do
@@ -188,14 +183,14 @@ module TinyTds
     end
 
     def sp_several_prints_sql
-      %|CREATE PROCEDURE tinytds_TestSeveralPrints
+      %(CREATE PROCEDURE tinytds_TestSeveralPrints
         AS
         PRINT 'hello 1'
         PRINT 'hello 2'
-        PRINT 'hello 3'|
+        PRINT 'hello 3')
     end
 
-    def find_value(id, column, query_options={})
+    def find_value(id, column, query_options = {})
       query_options[:timezone] ||= :utc
       sql = "SELECT [#{column}] FROM [datatypes] WHERE [id] = #{id}"
       @client.execute(sql).each(query_options).first[column.to_s]
@@ -223,19 +218,19 @@ module TinyTds
       # 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
-      toxi_host = ENV['TOXIPROXY_HOST'] || 'localhost'
+      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
+      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 '-------------------------'
+      puts "-------------------------"
 
       Toxiproxy.populate([
         {

data/test/thread_test.rb

@@ -1,25 +1,23 @@
-require 'test_helper'
-require 'logger'
-require 'benchmark'
+require "test_helper"
+require "logger"
+require "benchmark"
 
 class ThreadTest < TinyTds::TestCase
-
-  describe 'Threaded SELECT queries' do
-
+  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'"
-      @pool = ConnectionPool.new(:size => @poolsize, :timeout => 5) { new_connection }
+      @pool = ConnectionPool.new(size: @poolsize, timeout: 5) { new_connection }
     end
 
     after do
       @pool.shutdown { |c| c.close }
     end
 
-    it 'should finish faster in parallel' do
+    it "should finish faster in parallel" do
       skip if sqlserver_azure?
       x = Benchmark.realtime do
         threads = []
@@ -35,24 +33,22 @@ class ThreadTest < TinyTds::TestCase
         threads.each { |t| t.join }
       end
       assert x < @numthreads, "#{x} is not faster than #{@numthreads} seconds"
-      mintime = (1.0*@numthreads/@poolsize).ceil
+      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
 
-    it 'should not crash on error in parallel' do
+    it "should not crash on error in parallel" do
       skip if sqlserver_azure?
       threads = []
       @numthreads.times do |i|
         threads << Thread.new do
           @pool.with do |client|
-            begin
-              result = client.execute "select dbname()"
-              result.each { |r| puts r }
-            rescue Exception => _e
-              # We are throwing an error on purpose here since 0.6.1 would
-              # segfault on errors thrown in threads
-            end
+            result = client.execute "select dbname()"
+            result.each { |r| puts r }
+          rescue => _e
+            # We are throwing an error on purpose here since 0.6.1 would
+            # segfault on errors thrown in threads
           end
         end
       end
@@ -60,27 +56,25 @@ class ThreadTest < TinyTds::TestCase
       assert true
     end
 
-    it 'should cancel when hitting timeout in thread' do
+    it "should cancel when hitting timeout in thread" do
       exception = false
 
       thread = Thread.new do
         @pool.with do |client|
-          begin
-            delay = ('0' + (connection_timeout + 2).to_s)[-2,2] # Two seconds longer than default.
-            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'
-              exception = true
-            end
+          delay = ("0" + (connection_timeout + 2).to_s)[-2, 2] # Two seconds longer than default.
+          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"
+            exception = true
           end
         end
       end
 
       timer_thread = Thread.new do
         # Sleep until after the timeout should have been reached
-        sleep(connection_timeout+2)
-        if not exception
+        sleep(connection_timeout + 2)
+        if !exception
           thread.kill
           raise "Timeout passed without query timing out"
         end
@@ -91,8 +85,5 @@ class ThreadTest < TinyTds::TestCase
 
       assert exception
     end
-
   end
-
 end
-

data/tiny_tds.gemspec

@@ -1,32 +1,31 @@
-# -*- encoding: utf-8 -*-
-$LOAD_PATH.push File.expand_path('../lib', __FILE__)
-require 'tiny_tds/version'
+$LOAD_PATH.push File.expand_path("../lib", __FILE__)
+require "tiny_tds/version"
 
 Gem::Specification.new do |s|
-  s.name          = 'tiny_tds'
-  s.version       = TinyTds::VERSION
-  s.platform      = Gem::Platform::RUBY
-  s.authors       = ['Ken Collins', 'Erik Bryn', 'Will Bond']
-  s.email         = ['ken@metaskills.net', 'will@wbond.net']
-  s.homepage      = 'http://github.com/rails-sqlserver/tiny_tds'
-  s.summary       = 'TinyTDS - A modern, simple and fast FreeTDS library for Ruby using DB-Library.'
-  s.description   = 'TinyTDS - A modern, simple and fast FreeTDS library for Ruby using DB-Library. Developed for the ActiveRecord SQL Server adapter.'
-  s.files         = `git ls-files`.split("\n") + Dir.glob('exe/*')
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
-  s.require_paths = ['lib']
-  s.rdoc_options  = ['--charset=UTF-8']
-  s.extensions    = ['ext/tiny_tds/extconf.rb']
-  s.license       = 'MIT'
-  s.required_ruby_version = '>= 2.7.0'
-  s.metadata['msys2_mingw_dependencies'] = 'freetds'
-  s.add_dependency 'bigdecimal', '~> 3'
-  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.7.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.name = "tiny_tds"
+  s.version = TinyTds::VERSION
+  s.platform = Gem::Platform::RUBY
+  s.authors = ["Ken Collins", "Erik Bryn", "Will Bond"]
+  s.email = ["ken@metaskills.net", "will@wbond.net"]
+  s.homepage = "http://github.com/rails-sqlserver/tiny_tds"
+  s.summary = "TinyTDS - A modern, simple and fast FreeTDS library for Ruby using DB-Library."
+  s.description = "TinyTDS - A modern, simple and fast FreeTDS library for Ruby using DB-Library. Developed for the ActiveRecord SQL Server adapter."
+  s.files = `git ls-files`.split("\n") + Dir.glob("exe/*")
+  s.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
+  s.require_paths = ["lib"]
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.extensions = ["ext/tiny_tds/extconf.rb"]
+  s.license = "MIT"
+  s.required_ruby_version = ">= 2.7.0"
+  s.metadata["msys2_mingw_dependencies"] = "freetds"
+  s.add_dependency "bigdecimal", "~> 3"
+  s.add_development_dependency "mini_portile2", "~> 2.8.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.9.1"
+  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"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tiny_tds
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Ken Collins
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-01-02 00:00:00.000000000 Z
+date: 2025-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bigdecimal
@@ -32,14 +32,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -74,14 +74,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.9.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.9.1
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -138,6 +138,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: standard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.31.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.31.0
 description: TinyTDS - A modern, simple and fast FreeTDS library for Ruby using DB-Library.
   Developed for the ActiveRecord SQL Server adapter.
 email:
@@ -190,18 +204,12 @@ files:
 - tasks/native_gem.rake
 - tasks/package.rake
 - tasks/ports.rake
-- tasks/ports/freetds.rb
-- tasks/ports/libiconv.rb
-- tasks/ports/openssl.rb
-- tasks/ports/recipe.rb
 - tasks/test.rake
-- test/benchmark/query.rb
-- test/benchmark/query_odbc.rb
-- test/benchmark/query_tinytds.rb
 - 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

data/tasks/ports/freetds.rb

@@ -1,32 +0,0 @@
-require_relative './recipe'
-
-module Ports
-  class Freetds < Recipe
-    def initialize(version)
-      super('freetds', version)
-
-      set_patches
-    end
-
-    private
-
-    def configure_defaults
-      opts = super
-
-      opts << '--with-pic'
-      opts << '--disable-odbc'
-      opts << '--with-tdsver=7.3'
-
-      if windows?
-        opts << '--sysconfdir=C:/Sites'
-        opts << '--enable-sspi'
-      end
-
-      opts
-    end
-
-    def set_patches
-      self.patch_files.concat get_patches(name, version)
-    end
-  end
-end

data/tasks/ports/libiconv.rb

@@ -1,26 +0,0 @@
-require_relative './recipe'
-
-module Ports
-  class Libiconv < Recipe
-    def initialize(version)
-      super('libiconv', version)
-
-      set_patches
-    end
-
-    private
-
-    def configure_defaults
-      [
-        "--host=#{@host}",
-        '--disable-static',
-        '--enable-shared',
-        'CFLAGS=-fPIC -O2'
-      ]
-    end
-
-    def set_patches
-      self.patch_files.concat get_patches(name, version)
-    end
-  end
-end

data/tasks/ports/openssl.rb

@@ -1,62 +0,0 @@
-require_relative './recipe'
-
-module Ports
-  class Openssl < Recipe
-    def initialize(version)
-      super('openssl', version)
-
-      set_patches
-    end
-
-    def configure
-      return if configured?
-
-      md5_file = File.join(tmp_path, 'configure.md5')
-      digest   = Digest::MD5.hexdigest(computed_options.to_s)
-      File.open(md5_file, "w") { |f| f.write digest }
-
-      # Windows doesn't recognize the shebang so always explicitly use sh
-      execute('configure', "sh -c \"./Configure #{computed_options.join(' ')}\"")
-    end
-
-    def install
-      unless installed?
-        execute('install', %Q(#{make_cmd} install_sw install_ssldirs))
-      end
-    end
-
-    private
-
-    def configure_defaults
-      opts = [
-        'shared',
-        target_arch,
-        "--openssldir=#{path}",
-      ]
-
-      if cross_build?
-        opts << "--cross-compile-prefix=#{host}-"
-      end
-
-      opts
-    end
-
-    def target_arch
-      if windows?
-        arch = ''
-        arch = '64' if host=~ /x86_64/
-
-        "mingw#{arch}"
-      else
-        arch = 'x32'
-        arch = 'x86_64' if host=~ /x86_64/
-
-        "linux-#{arch}"
-      end
-    end
-
-    def set_patches
-      self.patch_files.concat get_patches(name, version)
-    end
-  end
-end