tiny_tds 1.0.4 → 3.2.0

data/ext/tiny_tds/result.c

@@ -6,10 +6,10 @@
 
 VALUE cTinyTdsResult;
 extern VALUE mTinyTds, cTinyTdsClient, cTinyTdsError;
-VALUE cBigDecimal, cDate;
+VALUE cKernel, cDate;
 VALUE opt_decimal_zero, opt_float_zero, opt_one, opt_zero, opt_four, opt_19hdr, opt_onek, opt_tenk, opt_onemil, opt_onebil;
 static ID intern_new, intern_utc, intern_local, intern_localtime, intern_merge,
-          intern_civil, intern_new_offset, intern_plus, intern_divide;
+          intern_civil, intern_new_offset, intern_plus, intern_divide, intern_bigd;
 static ID sym_symbolize_keys, sym_as, sym_array, sym_cache_rows, sym_first, sym_timezone, sym_local, sym_utc, sym_empty_sets;
 
 
@@ -86,25 +86,40 @@ static void dbcancel_ubf(DBPROCESS *client) {
 static void nogvl_setup(DBPROCESS *client) {
   GET_CLIENT_USERDATA(client);
   userdata->nonblocking = 1;
+  userdata->nonblocking_errors_length = 0;
+  userdata->nonblocking_errors = malloc(ERRORS_STACK_INIT_SIZE * sizeof(tinytds_errordata));
+  userdata->nonblocking_errors_size = ERRORS_STACK_INIT_SIZE;
 }
 
 static void nogvl_cleanup(DBPROCESS *client) {
   GET_CLIENT_USERDATA(client);
   userdata->nonblocking = 0;
+  userdata->timing_out = 0;
   /*
   Now that the blocking operation is done, we can finally throw any
   exceptions based on errors from SQL Server.
   */
-  if (userdata->nonblocking_error.is_set) {
-    userdata->nonblocking_error.is_set = 0;
-    rb_tinytds_raise_error(client,
-      userdata->nonblocking_error.cancel,
-      userdata->nonblocking_error.error,
-      userdata->nonblocking_error.source,
-      userdata->nonblocking_error.severity,
-      userdata->nonblocking_error.dberr,
-      userdata->nonblocking_error.oserr);
+  short int i;
+  for (i = 0; i < userdata->nonblocking_errors_length; i++) {
+    tinytds_errordata error = userdata->nonblocking_errors[i];
+
+    // lookahead to drain any info messages ahead of raising error
+    if (!error.is_message) {
+      short int j;
+      for (j = i; j < userdata->nonblocking_errors_length; j++) {
+        tinytds_errordata msg_error = userdata->nonblocking_errors[j];
+        if (msg_error.is_message) {
+          rb_tinytds_raise_error(client, msg_error);
+        }
+      }
+    }
+
+    rb_tinytds_raise_error(client, error);
   }
+
+  free(userdata->nonblocking_errors);
+  userdata->nonblocking_errors_length = 0;
+  userdata->nonblocking_errors_size = 0;
 }
 
 static RETCODE nogvl_dbsqlok(DBPROCESS *client) {
@@ -227,7 +242,7 @@ static VALUE rb_tinytds_result_fetch_row(VALUE self, ID timezone, int symbolize_
           int data_slength = (int)data_info->precision + (int)data_info->scale + 1;
           char converted_decimal[data_slength];
           dbconvert(rwrap->client, coltype, data, data_len, SYBVARCHAR, (BYTE *)converted_decimal, -1);
-          val = rb_funcall(cBigDecimal, intern_new, 1, rb_str_new2((char *)converted_decimal));
+          val = rb_funcall(cKernel, intern_bigd, 1, rb_str_new2((char *)converted_decimal));
           break;
         }
         case SYBFLT8: {
@@ -245,7 +260,7 @@ static VALUE rb_tinytds_result_fetch_row(VALUE self, ID timezone, int symbolize_
           char converted_money[25];
           long long money_value = ((long long)money->mnyhigh << 32) | money->mnylow;
           sprintf(converted_money, "%" LONG_LONG_FORMAT, money_value);
-          val = rb_funcall(cBigDecimal, intern_new, 2, rb_str_new2(converted_money), opt_four);
+          val = rb_funcall(cKernel, intern_bigd, 2, rb_str_new2(converted_money), opt_four);
           val = rb_funcall(val, intern_divide, 1, opt_tenk);
           break;
         }
@@ -253,7 +268,7 @@ static VALUE rb_tinytds_result_fetch_row(VALUE self, ID timezone, int symbolize_
           DBMONEY4 *money = (DBMONEY4 *)data;
           char converted_money[20];
           sprintf(converted_money, "%f", money->mny4 / 10000.0);
-          val = rb_funcall(cBigDecimal, intern_new, 1, rb_str_new2(converted_money));
+          val = rb_funcall(cKernel, intern_bigd, 1, rb_str_new2(converted_money));
           break;
         }
         case SYBBINARY:
@@ -283,48 +298,49 @@ static VALUE rb_tinytds_result_fetch_row(VALUE self, ID timezone, int symbolize_
           }
           break;
         }
-        case 40:   // SYBMSDATE
-        case 41:   // SYBMSTIME
-        case 42:   // SYBMSDATETIME2
-        case 43: { // SYBMSDATETIMEOFFSET
-          #ifdef DBVERSION_73
-            if (dbtds(rwrap->client) >= DBTDS_7_3) {
-              DBDATEREC2 dr2;
-              dbanydatecrack(rwrap->client, &dr2, coltype, data);
-              switch(coltype) {
-                case 40: { // SYBMSDATE
-                  val = rb_funcall(cDate, intern_new, 3, INT2NUM(dr2.year), INT2NUM(dr2.month), INT2NUM(dr2.day));
-                  break;
-                }
-                case 41: { // SYBMSTIME
-                  VALUE rational_nsec = rb_Rational(INT2NUM(dr2.nanosecond), opt_onek);
-                  val = rb_funcall(rb_cTime, timezone, 7, INT2NUM(1900), INT2NUM(1), INT2NUM(1), INT2NUM(dr2.hour), INT2NUM(dr2.minute), INT2NUM(dr2.second), rational_nsec);
-                  break;
-                }
-                case 42: { // SYBMSDATETIME2
-                  VALUE rational_nsec = rb_Rational(INT2NUM(dr2.nanosecond), opt_onek);
-                  val = rb_funcall(rb_cTime, timezone, 7, INT2NUM(dr2.year), INT2NUM(dr2.month), INT2NUM(dr2.day), INT2NUM(dr2.hour), INT2NUM(dr2.minute), INT2NUM(dr2.second), rational_nsec);
-                  break;
-                }
-                case 43: { // SYBMSDATETIMEOFFSET
-                  long long numerator = ((long)dr2.second * (long long)1000000000) + (long long)dr2.nanosecond;
-                  VALUE rational_sec = rb_Rational(LL2NUM(numerator), opt_onebil);
-                  val = rb_funcall(rb_cTime, intern_new, 7, INT2NUM(dr2.year), INT2NUM(dr2.month), INT2NUM(dr2.day), INT2NUM(dr2.hour), INT2NUM(dr2.minute), rational_sec, INT2NUM(dr2.tzone*60));
-                  break;
-                }
-              }
-            } else {
-              val = ENCODED_STR_NEW(data, data_len);
+        case SYBMSDATE:
+        case SYBMSTIME:
+        case SYBMSDATETIME2:
+        case SYBMSDATETIMEOFFSET: {
+          DBDATEREC2 dr2;
+          dbanydatecrack(rwrap->client, &dr2, coltype, data);
+          switch(coltype) {
+            case SYBMSDATE: {
+              val = rb_funcall(cDate, intern_new, 3, INT2NUM(dr2.year), INT2NUM(dr2.month), INT2NUM(dr2.day));
+              break;
             }
-          #else
-            val = ENCODED_STR_NEW(data, data_len);
-          #endif
+            case SYBMSTIME: {
+              VALUE rational_nsec = rb_Rational(INT2NUM(dr2.nanosecond), opt_onek);
+              val = rb_funcall(rb_cTime, timezone, 7, INT2NUM(1900), INT2NUM(1), INT2NUM(1), INT2NUM(dr2.hour), INT2NUM(dr2.minute), INT2NUM(dr2.second), rational_nsec);
+              break;
+            }
+            case SYBMSDATETIME2: {
+              VALUE rational_nsec = rb_Rational(INT2NUM(dr2.nanosecond), opt_onek);
+              val = rb_funcall(rb_cTime, timezone, 7, INT2NUM(dr2.year), INT2NUM(dr2.month), INT2NUM(dr2.day), INT2NUM(dr2.hour), INT2NUM(dr2.minute), INT2NUM(dr2.second), rational_nsec);
+              break;
+            }
+            case SYBMSDATETIMEOFFSET: {
+              long long numerator = ((long)dr2.second * (long long)1000000000) + (long long)dr2.nanosecond;
+              VALUE rational_sec = rb_Rational(LL2NUM(numerator), opt_onebil);
+              val = rb_funcall(rb_cTime, intern_new, 7, INT2NUM(dr2.year), INT2NUM(dr2.month), INT2NUM(dr2.day), INT2NUM(dr2.hour), INT2NUM(dr2.minute), rational_sec, INT2NUM(dr2.tzone*60));
+              break;
+            }
+          }
           break;
         }
         case SYBCHAR:
         case SYBTEXT:
           val = ENCODED_STR_NEW(data, data_len);
           break;
+        case 98: { // SYBVARIANT
+          if (data_len == 4) {
+            val = INT2NUM(*(DBINT *)data);
+            break;
+          } else {
+            val = ENCODED_STR_NEW(data, data_len);
+            break;
+          }
+        }
         default:
           val = ENCODED_STR_NEW(data, data_len);
           break;
@@ -556,10 +572,11 @@ static VALUE rb_tinytds_result_insert(VALUE self) {
 
 void init_tinytds_result() {
   /* Data Classes */
-  cBigDecimal = rb_const_get(rb_cObject, rb_intern("BigDecimal"));
+  cKernel = rb_const_get(rb_cObject, rb_intern("Kernel"));
   cDate = rb_const_get(rb_cObject, rb_intern("Date"));
   /* Define TinyTds::Result */
   cTinyTdsResult = rb_define_class_under(mTinyTds, "Result", rb_cObject);
+  rb_undef_alloc_func(cTinyTdsResult);
   /* Define TinyTds::Result Public Methods */
   rb_define_method(cTinyTdsResult, "fields", rb_tinytds_result_fields, 0);
   rb_define_method(cTinyTdsResult, "each", rb_tinytds_result_each, -1);
@@ -578,6 +595,7 @@ void init_tinytds_result() {
   intern_new_offset = rb_intern("new_offset");
   intern_plus = rb_intern("+");
   intern_divide = rb_intern("/");
+  intern_bigd = rb_intern("BigDecimal");
   /* Symbol Helpers */
   sym_symbolize_keys = ID2SYM(rb_intern("symbolize_keys"));
   sym_as = ID2SYM(rb_intern("as"));

data/ext/tiny_tds/tiny_tds_ext.c

@@ -1,6 +1,9 @@
-
 #include <tiny_tds_ext.h>
 
+#ifndef DBVERSION_73
+  #error "DBVERSION_73 is not defined. Aborting compilation."
+#endif
+
 VALUE mTinyTds, cTinyTdsError;
 
 void Init_tiny_tds() {

data/lib/tiny_tds/bin.rb

@@ -1,86 +1,90 @@
-require_relative './version'
-require 'shellwords'
+require_relative "version"
+require_relative "gem"
+require "shellwords"
 
 module TinyTds
   class Bin
-
-    ROOT  = File.expand_path '../../..', __FILE__
-    PATHS = ENV['PATH'].split File::PATH_SEPARATOR
-    EXTS  = (ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']) | ['.exe']
-
     attr_reader :name
 
     class << self
-
       def exe(name, *args)
         bin = new(name)
-        puts bin.info
+        puts bin.info unless args.any? { |x| x == "-q" }
         bin.run(*args)
       end
-
     end
 
     def initialize(name)
+      @root = Gem.root_path
+      @exts = (ENV["PATHEXT"] ? ENV["PATHEXT"].split(";") : [""]) | [".exe"]
+
       @name = name
       @binstub = find_bin
       @exefile = find_exe
     end
 
     def run(*args)
-      return nil unless path
-      Kernel.system Shellwords.join(args.unshift(path))
-      $?.to_i
+      with_ports_paths do
+        return nil unless path
+        Kernel.system Shellwords.join(args.unshift(path))
+        $CHILD_STATUS.to_i
+      end
     end
 
     def path
-      return @path if defined?(@path)
-      @path = @exefile && File.exists?(@exefile) ? @exefile : which
+      @path ||= (@exefile && File.exist?(@exefile)) ? @exefile : which
     end
 
     def info
       "[TinyTds][v#{TinyTds::VERSION}][#{name}]: #{path}"
     end
 
-
     private
 
+    def search_paths
+      ENV["PATH"].split File::PATH_SEPARATOR
+    end
+
+    def with_ports_paths
+      old_path = ENV["PATH"]
+
+      begin
+        ENV["PATH"] = [
+          Gem.ports_bin_paths,
+          old_path
+        ].flatten.join File::PATH_SEPARATOR
+
+        yield if block_given?
+      ensure
+        ENV["PATH"] = old_path
+      end
+    end
+
     def find_bin
-      File.join ROOT, 'bin', name
+      File.join @root, "bin", name
     end
 
     def find_exe
-      EXTS.each do |ext|
-        f = File.join ROOT, 'exe', "#{name}#{ext}"
-        return f if File.exists?(f)
+      Gem.ports_bin_paths.each do |bin|
+        @exts.each do |ext|
+          f = File.join bin, "#{name}#{ext}"
+          return f if File.exist?(f)
+        end
       end
       nil
     end
 
     def which
-      PATHS.each do |path|
-        EXTS.each do |ext|
-          exe = File.expand_path File.join(path, "#{name}#{ext}"), ROOT
+      search_paths.each do |path|
+        @exts.each do |ext|
+          exe = File.expand_path File.join(path, "#{name}#{ext}"), @root
           next if exe == @binstub
-          next if !File.executable?(exe)
-          next if !binary?(exe)
+          next unless File.executable?(exe)
+
           return exe
         end
       end
-      return nil
-    end
-
-    # Implementation directly copied from ptools.
-    # https://github.com/djberg96/ptools
-    # https://opensource.org/licenses/Artistic-2.0
-    #
-    def binary?(file)
-      bytes = File.stat(file).blksize
-      return false unless bytes
-      bytes = 4096 if bytes > 4096
-      s = (File.read(file, bytes) || "")
-      s = s.encode('US-ASCII', :undef => :replace).split(//)
-      ((s.size - s.grep(" ".."~").size) / s.size.to_f) > 0.30
+      nil
     end
-
   end
 end

data/lib/tiny_tds/client.rb

@@ -1,21 +1,18 @@
 module TinyTds
   class Client
-
-    @@default_query_options = {
-      :as => :hash,
-      :symbolize_keys => false,
-      :cache_rows => true,
-      :timezone => :local,
-      :empty_sets => true
+    @default_query_options = {
+      as: :hash,
+      symbolize_keys: false,
+      cache_rows: true,
+      timezone: :local,
+      empty_sets: true
     }
 
     attr_reader :query_options
+    attr_reader :message_handler
 
     class << self
-
-      def default_query_options
-        @@default_query_options
-      end
+      attr_reader :default_query_options
 
       # Most, if not all, iconv encoding names can be found by ruby. Just in case, you can
       # overide this method to return a string name that Encoding.find would work with. Default
@@ -25,21 +22,38 @@ module TinyTds
         encoding
       end
 
+      def local_offset
+        ::Time.local(2010).utc_offset.to_r / 86_400
+      end
     end
 
+    # rubocop:disable Metrics/AbcSize
+    # rubocop:disable Metrics/MethodLength
+    # rubocop:disable Metrics/CyclomaticComplexity
+    # rubocop:disable Metrics/PerceivedComplexity
+    def initialize(opts = {})
+      if opts[:dataserver].to_s.empty? && opts[:host].to_s.empty?
+        raise ArgumentError, "missing :host option if no :dataserver given"
+      end
+
+      @message_handler = opts[:message_handler]
+      if @message_handler && !@message_handler.respond_to?(:call)
+        raise ArgumentError, ":message_handler must implement `call` (eg, a Proc or a Method)"
+      end
 
-    def initialize(opts={})
-      raise ArgumentError, 'missing :host option if no :dataserver given' if opts[:dataserver].to_s.empty? && opts[:host].to_s.empty?
       opts[:username] = parse_username(opts)
-      @query_options = @@default_query_options.dup
-      opts[:password] = opts[:password].to_s if opts[:password] && opts[:password].to_s.strip != ''
-      opts[:appname] ||= 'TinyTds'
+      @query_options = self.class.default_query_options.dup
+      opts[:password] = opts[:password].to_s if opts[:password] && opts[:password].to_s.strip != ""
+      opts[:appname] ||= "TinyTds"
       opts[:tds_version] = tds_versions_setter(opts)
+      opts[:use_utf16] = opts[:use_utf16].nil? || ["true", "1", "yes"].include?(opts[:use_utf16].to_s)
       opts[:login_timeout] ||= 60
       opts[:timeout] ||= 5
-      opts[:encoding] = (opts[:encoding].nil? || opts[:encoding].downcase == 'utf8') ? 'UTF-8' : opts[:encoding].upcase
+      opts[:encoding] = (opts[:encoding].nil? || opts[:encoding].casecmp("utf8").zero?) ? "UTF-8" : opts[:encoding].upcase
       opts[:port] ||= 1433
       opts[:dataserver] = "#{opts[:host]}:#{opts[:port]}" if opts[:dataserver].to_s.empty?
+      forced_integer_keys = [:login_timeout, :port, :timeout]
+      forced_integer_keys.each { |k| opts[k] = opts[k].to_i if opts[k] }
       connect(opts)
     end
 
@@ -56,13 +70,8 @@ module TinyTds
       !closed? && !dead?
     end
 
-
     private
 
-    def self.local_offset
-      ::Time.local(2010).utc_offset.to_r / 86400
-    end
-
     def parse_username(opts)
       host = opts[:host]
       username = opts[:username]
@@ -70,11 +79,11 @@ module TinyTds
       return username if username.include?("@") && !username.include?("database.windows.net")
       user, domain = username.split("@")
       domain ||= host
-      "#{user}@#{domain.split('.').first}"
+      "#{user}@#{domain.split(".").first}"
     end
 
-    def tds_versions_setter(opts={})
-      v = opts[:tds_version] || ENV['TDSVER'] || '7.3'
+    def tds_versions_setter(opts = {})
+      v = opts[:tds_version] || ENV["TDSVER"] || "7.3"
       TDS_VERSIONS_SETTERS[v.to_s]
     end
 
@@ -82,22 +91,22 @@ module TinyTds
     # DBVERSION_xxx are used with dbsetversion()
     #
     TDS_VERSIONS_SETTERS = {
-      'unknown' => 0,
-      '46'      => 1,
-      '100'     => 2,
-      '42'      => 3,
-      '70'      => 4,
-      '7.0'     => 4,
-      '71'      => 5,
-      '7.1'     => 5,
-      '80'      => 5,
-      '8.0'     => 5,
-      '72'      => 6,
-      '7.2'     => 6,
-      '90'      => 6,
-      '9.0'     => 6,
-      '73'      => 7,
-      '7.3'     => 7
+      "unknown" => 0,
+      "46" => 1,
+      "100" => 2,
+      "42" => 3,
+      "70" => 4,
+      "7.0" => 4,
+      "71" => 5,
+      "7.1" => 5,
+      "80" => 5,
+      "8.0" => 5,
+      "72" => 6,
+      "7.2" => 6,
+      "90" => 6,
+      "9.0" => 6,
+      "73" => 7,
+      "7.3" => 7
     }.freeze
 
     # From sybdb.h comments:
@@ -105,20 +114,19 @@ module TinyTds
     # The integer values of the constants are poorly chosen.
     #
     TDS_VERSIONS_GETTERS = {
-      0  => {:name => 'DBTDS_UNKNOWN',        :description => 'Unknown'},
-      1  => {:name => 'DBTDS_2_0',            :description => 'Pre 4.0 SQL Server'},
-      2  => {:name => 'DBTDS_3_4',            :description => 'Microsoft SQL Server (3.0)'},
-      3  => {:name => 'DBTDS_4_0',            :description => '4.0 SQL Server'},
-      4  => {:name => 'DBTDS_4_2',            :description => '4.2 SQL Server'},
-      5  => {:name => 'DBTDS_4_6',            :description => '2.0 OpenServer and 4.6 SQL Server.'},
-      6  => {:name => 'DBTDS_4_9_5',          :description => '4.9.5 (NCR) SQL Server'},
-      7  => {:name => 'DBTDS_5_0',            :description => '5.0 SQL Server'},
-      8  => {:name => 'DBTDS_7_0',            :description => 'Microsoft SQL Server 7.0'},
-      9  => {:name => 'DBTDS_7_1/DBTDS_8_0',  :description => 'Microsoft SQL Server 2000'},
-      10 => {:name => 'DBTDS_7_2/DBTDS_9_0',  :description => 'Microsoft SQL Server 2005'},
-      11 => {:name => 'DBTDS_7_3',            :description => 'Microsoft SQL Server 2008'},
-      12 => {:name => 'DBTDS_7_4',            :description => 'Microsoft SQL Server 2012/2014'}
+      0 => {name: "DBTDS_UNKNOWN", description: "Unknown"},
+      1 => {name: "DBTDS_2_0", description: "Pre 4.0 SQL Server"},
+      2 => {name: "DBTDS_3_4", description: "Microsoft SQL Server (3.0)"},
+      3 => {name: "DBTDS_4_0", description: "4.0 SQL Server"},
+      4 => {name: "DBTDS_4_2", description: "4.2 SQL Server"},
+      5 => {name: "DBTDS_4_6", description: "2.0 OpenServer and 4.6 SQL Server."},
+      6 => {name: "DBTDS_4_9_5", description: "4.9.5 (NCR) SQL Server"},
+      7 => {name: "DBTDS_5_0", description: "5.0 SQL Server"},
+      8 => {name: "DBTDS_7_0", description: "Microsoft SQL Server 7.0"},
+      9 => {name: "DBTDS_7_1/DBTDS_8_0", description: "Microsoft SQL Server 2000"},
+      10 => {name: "DBTDS_7_2/DBTDS_9_0", description: "Microsoft SQL Server 2005"},
+      11 => {name: "DBTDS_7_3", description: "Microsoft SQL Server 2008"},
+      12 => {name: "DBTDS_7_4", description: "Microsoft SQL Server 2012/2014"}
     }.freeze
-
   end
 end

data/lib/tiny_tds/error.rb

@@ -1,6 +1,5 @@
 module TinyTds
   class Error < StandardError
-
     attr_accessor :source, :severity, :db_error_number, :os_error_number
 
     def initialize(message)
@@ -9,7 +8,5 @@ module TinyTds
       @db_error_number = nil
       @os_error_number = nil
     end
-
-
   end
 end

data/lib/tiny_tds/gem.rb

@@ -0,0 +1,23 @@
+require "rbconfig"
+
+module TinyTds
+  module Gem
+    class << self
+      def root_path
+        File.expand_path "../../..", __FILE__
+      end
+
+      def ports_root_path
+        File.join(root_path, "ports")
+      end
+
+      def ports_bin_paths
+        Dir.glob(File.join(ports_root_path, "**", "bin"))
+      end
+
+      def ports_lib_paths
+        Dir.glob(File.join(ports_root_path, "**", "lib"))
+      end
+    end
+  end
+end

data/lib/tiny_tds/result.rb

@@ -1,8 +1,5 @@
 module TinyTds
   class Result
-    
     include Enumerable
-    
-    
   end
 end

data/lib/tiny_tds.rb

@@ -1,37 +1,42 @@
-# encoding: UTF-8
-require 'date'
-require 'bigdecimal'
-require 'rational'
+require "date"
+require "bigdecimal"
 
-require 'tiny_tds/version'
-require 'tiny_tds/error'
-require 'tiny_tds/client'
-require 'tiny_tds/result'
+require "tiny_tds/version"
+require "tiny_tds/error"
+require "tiny_tds/client"
+require "tiny_tds/result"
+require "tiny_tds/gem"
 
-# Support multiple ruby versions, fat binaries under Windows.
-if RUBY_PLATFORM =~ /mingw|mswin/ && RUBY_VERSION =~ /(\d+.\d+)/
-  ver = $1
-  # Set the PATH environment variable, so that the DLLs can be found.
-  old_path = ENV['PATH']
-  begin
-    # Do the same host consolidation as in extconf.rb
-    ports_dir = RbConfig::CONFIG["host"].gsub('i686-pc-mingw32', 'i686-w64-mingw32')
-    ENV['PATH'] = "#{File.expand_path("../../ports/#{ports_dir}/bin", __FILE__)};#{old_path}"
-    require "tiny_tds/#{ver}/tiny_tds"
-  rescue LoadError
-    require 'tiny_tds/tiny_tds'
-  ensure
-    ENV['PATH'] = old_path
-  end
-else
-  # Load dependent shared libraries into the process, so that they are already present,
-  # when tiny_tds.so is loaded. This ensures, that shared libraries are loaded even when
-  # the path is different between build and run time (e.g. Heroku).
-  ports_libs = File.expand_path("../../ports/#{RbConfig::CONFIG["host"]}/lib/*.so", __FILE__)
-  Dir[ports_libs].each do |lib|
-    require "fiddle"
-    Fiddle.dlopen(lib)
+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
+
+  add_dll_path = proc do |path, &block|
+    if RUBY_PLATFORM =~ /(mswin|mingw)/i && path
+      begin
+        require "ruby_installer/runtime"
+        RubyInstaller::Runtime.add_dll_directory(path, &block)
+      rescue LoadError
+        old_path = ENV["PATH"]
+        ENV["PATH"] = "#{path};#{old_path}"
+        block.call
+        ENV["PATH"] = old_path
+      end
+    else
+      # libsybdb is found by a relative rpath in the cross compiled extension dll
+      # or by the system library loader
+      block.call
+    end
   end
 
-  require 'tiny_tds/tiny_tds'
+  add_dll_path.call(FREETDS_LIB_PATH) do
+    # Try the <major>.<minor> subdirectory for fat binary gems
+    major_minor = RUBY_VERSION[/^(\d+\.\d+)/] or
+      raise "Oops, can't extract the major/minor version from #{RUBY_VERSION.dump}"
+    require "tiny_tds/#{major_minor}/tiny_tds"
+  rescue LoadError
+    require "tiny_tds/tiny_tds"
+  end
 end

data/{ports/patches/freetds/1.00 → patches/freetds/1.00.27}/0001-mingw_missing_inet_pton.diff

@@ -1,16 +1,16 @@
 diff --git a/src/tds/tls.c b/src/tds/tls.c
-index 0d11a33..b8ab2ba 100644
+index 09e7fa0..1da18f6 100644
 --- a/src/tds/tls.c
 +++ b/src/tds/tls.c
-@@ -72,6 +72,29 @@
- #define SSL_PTR bio->ptr
+@@ -101,6 +101,29 @@
+ #define SSL_PTR BIO_get_data(bio)
  #endif
 
 +/*
 + * Add a workaround for older Mingw versions without inet_pton().
 + * This means RubyInstallers DevKit-4.7.2 in particular.
 + */
-+#if defined(__MINGW64_VERSION_MAJOR) && !defined(InetPtonA)
++#if defined(__MINGW32__) && !defined(InetPtonA)
 +  #include <windows.h>
 +
 +  static HMODULE ws2_32 = NULL;