tiny_tds 1.0.4 → 2.1.5

data/lib/tiny_tds/client.rb

@@ -1,21 +1,20 @@
 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 +24,39 @@ 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
+      @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,24 +73,19 @@ 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]
       return username if username.nil? || !opts[:azure]
-      return username if username.include?("@") && !username.include?("database.windows.net")
-      user, domain = username.split("@")
+      return username if username.include?('@') && !username.include?('database.windows.net')
+      user, domain = username.split('@')
       domain ||= host
       "#{user}@#{domain.split('.').first}"
     end
 
-    def tds_versions_setter(opts={})
+    def tds_versions_setter(opts = {})
       v = opts[:tds_version] || ENV['TDSVER'] || '7.3'
       TDS_VERSIONS_SETTERS[v.to_s]
     end
@@ -105,19 +117,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

data/lib/tiny_tds/error.rb

@@ -10,6 +10,5 @@ module TinyTds
       @os_error_number = nil
     end
 
-
   end
 end

data/lib/tiny_tds/gem.rb

@@ -0,0 +1,32 @@
+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,ports_host,'**','bin'))
+      end
+
+      def ports_lib_paths
+        Dir.glob(File.join(ports_root_path,ports_host,'**','lib'))
+      end
+
+      def ports_host
+        h = RbConfig::CONFIG['host']
+
+        # Our fat binary builds with a i686-w64-mingw32 toolchain
+        # but ruby for windows x32-mingw32 reports i686-pc-mingw32
+        # so correct the host here
+        h.gsub('i686-pc-mingw32', 'i686-w64-mingw32')
+      end
+    end
+  end
+end

data/lib/tiny_tds/result.rb

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

data/lib/tiny_tds/version.rb

@@ -1,3 +1,3 @@
 module TinyTds
-  VERSION = File.read(File.expand_path("../../../VERSION", __FILE__)).chomp
+  VERSION = File.read(File.expand_path('../../../VERSION', __FILE__)).chomp
 end

data/lib/tiny_tds.rb

@@ -7,29 +7,53 @@ 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
+  ver = Regexp.last_match(1)
+
+  add_dll_path = proc do |path, &block|
+    begin
+      require 'ruby_installer/runtime'
+      RubyInstaller::Runtime.add_dll_directory(path, &block)
+    rescue LoadError
+      old_path = ENV['PATH']
+      ENV['PATH'] = "#{path};#{old_path}"
+      begin
+        block.call
+      ensure
+        ENV['PATH'] = old_path
+      end
+    end
+  end
+
+  add_dll_paths = proc do |paths, &block|
+    if path=paths.shift
+      add_dll_path.call(path) do
+        add_dll_paths.call(paths, &block)
+      end
+    else
+      block.call
+    end
+  end
+
+  # Temporary add bin directories for DLL search, so that freetds DLLs can be found.
+  add_dll_paths.call( TinyTds::Gem.ports_bin_paths ) do
+    begin
+      require "tiny_tds/#{ver}/tiny_tds"
+    rescue LoadError
+      require 'tiny_tds/tiny_tds'
+    end
   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__)
+  ports_libs = File.join(TinyTds::Gem.ports_root_path,
+                         "#{RbConfig::CONFIG['host']}/lib/*.so")
   Dir[ports_libs].each do |lib|
-    require "fiddle"
+    require 'fiddle'
     Fiddle.dlopen(lib)
   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;

data/patches/freetds/1.00.27/0002-Don-t-use-MSYS2-file-libws2_32.diff

@@ -0,0 +1,28 @@
+From 56e8972f66c3e948e2ad6885595c58fd23dcdb37 Mon Sep 17 00:00:00 2001
+From: Lars Kanis <kanis@comcard.de>
+Date: Thu, 6 Jul 2017 17:09:40 +0200
+Subject: [PATCH] Don't use MSYS2 file libws2_32.a for MINGW build
+
+This file is intended for MSYS2/cygwin builds and blocks OpenSSL
+detection of freetds on i686.
+---
+ configure    | 2 --
+ configure.ac | 2 --
+ 2 files changed, 4 deletions(-)
+
+diff --git a/configure b/configure
+index 9495a49..31eb01d 100644
+--- a/configure
++++ b/configure
+@@ -15915,8 +15915,6 @@ case $host in
+ 	tds_mingw=yes
+ 	if test "$host_cpu" = "x86_64"; then
+ 		LIBS="-lws2_32"
+-	elif test -r /usr/lib/w32api/libws2_32.a; then
+-		LIBS="-L/usr/lib/w32api -lws2_32"
+ 	else
+ 		LIBS="-lws2_32"
+ 	fi
+-- 
+2.6.2.windows.1
+

data/patches/libiconv/1.14/1-avoid-gets-error.patch

@@ -0,0 +1,17 @@
+--- a/srclib/stdio.in.h	2017-01-22 01:23:00.000000000 -0400
++++ b/srclib/stdio.in.h	2017-01-22 01:24:00.000000000 -0400
+@@ -695,8 +695,14 @@
+ /* It is very rare that the developer ever has full control of stdin,
+    so any use of gets warrants an unconditional warning.  Assume it is
+    always declared, since it is required by C89.  */
++#if defined(__GLIBC__) && !defined(__UCLIBC__)
++# ifdef __GLIBC_PREREQ 
++#  if !__GLIBC_PREREQ(2, 16)
+ _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
++#  endif
++# endif
++#endif
+ #endif
+ 
+ 
+ #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@

data/tasks/native_gem.rake

@@ -0,0 +1,14 @@
+# encoding: UTF-8
+
+desc 'Build the windows binary gems per rake-compiler-dock'
+task 'gem:windows' => ['ports:cross'] do
+  require 'rake_compiler_dock'
+
+  # make sure to install our bundle
+  build = ['bundle']
+
+  # and finally build the native gem
+  build << 'rake cross native gem RUBY_CC_VERSION=2.7.0:2.6.0:2.5.0:2.4.0 CFLAGS="-Wall" MAKE="make -j`nproc`"'
+
+  RakeCompilerDock.sh build.join(' && ')
+end

data/tasks/package.rake

@@ -0,0 +1,8 @@
+# encoding: UTF-8
+require 'rubygems/package_task'
+
+Gem::PackageTask.new(SPEC) do |pkg|
+  pkg.need_tar = false
+  pkg.need_zip = false
+end
+

data/tasks/ports/freetds.rb

@@ -0,0 +1,37 @@
+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'
+
+      if version =~ /0\.91/
+        opts << '--with-tdsver=7.1'
+      else
+        opts << '--with-tdsver=7.3'
+      end
+
+      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

@@ -0,0 +1,43 @@
+require_relative './recipe'
+
+module Ports
+  class Libiconv < Recipe
+    def initialize(version)
+      super('libiconv', version)
+
+      set_patches
+    end
+
+    def cook
+      chdir_for_build do
+        super
+      end
+      self
+    end
+
+    private
+
+    # When using rake-compiler-dock on Windows, the underlying Virtualbox shared
+    # folders don't support symlinks, but libiconv expects it for a build on
+    # Linux. We work around this limitation by using the temp dir for cooking.
+    def chdir_for_build
+      build_dir = ENV['RCD_HOST_RUBY_PLATFORM'].to_s =~ /mingw|mswin|cygwin/ ? '/tmp' : '.'
+      Dir.chdir(build_dir) do
+        yield
+      end
+    end
+
+    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

@@ -0,0 +1,62 @@
+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

data/tasks/ports/recipe.rb

@@ -0,0 +1,52 @@
+# encoding: UTF-8
+require 'mini_portile2'
+require 'fileutils'
+require 'rbconfig'
+
+module Ports
+  class Recipe < MiniPortile
+    def cook
+      checkpoint = "ports/#{name}-#{version}-#{host}.installed"
+
+      unless File.exist? checkpoint
+        super
+        FileUtils.touch checkpoint
+      end
+    end
+
+    private
+
+    def configure_defaults
+      [
+        "--host=#{@host}",
+        '--disable-static',
+        '--enable-shared'
+      ]
+    end
+
+    def windows?
+      host =~ /mswin|mingw32/
+    end
+
+    def system_host
+      RbConfig::CONFIG['host']
+    end
+
+    def cross_build?
+      host != system_host
+    end
+
+    def get_patches(libname, version)
+      patches = []
+  
+      patch_path = File.expand_path(
+        File.join('..','..','..','patches',libname,version), 
+        __FILE__
+      )
+
+      patches.concat(Dir[File.join(patch_path, '*.patch')].sort)
+      patches.concat(Dir[File.join(patch_path, '*.diff')].sort)
+    end
+  end
+end
+

data/tasks/ports.rake

@@ -0,0 +1,85 @@
+# encoding: UTF-8
+require 'mini_portile2'
+require 'fileutils'
+require_relative 'ports/libiconv'
+require_relative 'ports/openssl'
+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)
+
+  directory "ports"
+  CLEAN.include "ports/*mingw32*"
+  CLEAN.include "ports/*.installed"
+
+  task :openssl, [:host] do |task, args|
+    args.with_defaults(host: RbConfig::CONFIG['host'])
+
+    openssl.files = [OPENSSL_SOURCE_URI]
+    openssl.host = args.host
+    openssl.cook
+    openssl.activate
+  end
+
+  task :libiconv, [:host] do |task, args|
+    args.with_defaults(host: RbConfig::CONFIG['host'])
+
+    libiconv.files = [ICONV_SOURCE_URI]
+    libiconv.host = args.host
+    libiconv.cook
+    libiconv.activate
+  end
+
+  task :freetds, [:host] do |task, args|
+    args.with_defaults(host: RbConfig::CONFIG['host'])
+
+    freetds.files = [FREETDS_SOURCE_URI]
+    freetds.host = args.host
+
+    if 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"
+      # 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}"
+    end
+
+    if libiconv
+      freetds.configure_options << "--with-libiconv-prefix=#{libiconv.path}"
+    end
+
+    freetds.cook
+    freetds.activate
+  end
+
+  task :compile, [:host] do |task,args|
+    args.with_defaults(host: RbConfig::CONFIG['host'])
+
+    puts "Compiling ports for #{args.host}..."
+
+    ['openssl','libiconv','freetds'].each do |lib|
+      Rake::Task["ports:#{lib}"].invoke(args.host)
+    end
+  end
+
+  desc 'Build the ports windows binaries via rake-compiler-dock'
+  task 'cross' do
+    require 'rake_compiler_dock'
+
+    # build the ports for all our cross compile hosts
+    GEM_PLATFORM_HOSTS.each do |gem_platform, host|
+      # make sure to install our bundle
+      build = ['bundle']
+      build << "rake ports:compile[#{host}] MAKE='make -j`nproc`'"
+      RakeCompilerDock.sh build.join(' && '), platform: gem_platform
+    end
+  end
+end
+
+desc 'Build ports and activate libraries for the current architecture.'
+task :ports => ['ports:compile']

data/tasks/test.rake

@@ -0,0 +1,9 @@
+# encoding: UTF-8
+require 'rake/testtask'
+
+Rake::TestTask.new do |t|
+  t.libs << 'test'
+  t.test_files = FileList['test/**/*_test.rb']
+  t.verbose = true
+end
+

data/test/appveyor/dbsetup.ps1

@@ -5,7 +5,7 @@ Write-Output "Setting up..."
 
 Write-Output "Setting variables..."
 $serverName = $env:COMPUTERNAME
-$instances = @('SQL2008R2SP2', 'SQL2012SP1', 'SQL2014')
+$instances = @('SQL2012SP1', 'SQL2014', 'SQL2016')
 $smo = 'Microsoft.SqlServer.Management.Smo.'
 $wmi = new-object ($smo + 'Wmi.ManagedComputer')