tiny_tds 0.6.2-x86-mingw32 → 0.6.3.rc2-x86-mingw32

data/test/thread_test.rb

@@ -63,8 +63,8 @@ class ThreadTest < TinyTds::TestCase
       thread = Thread.new do
         @pool.with do |client|
           begin
-            # The default query timeout is 5, so this will last longer than that
-            result = client.execute "waitfor delay '00:00:07'; select db_name()"
+            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'
@@ -75,8 +75,8 @@ class ThreadTest < TinyTds::TestCase
       end
 
       timer_thread = Thread.new do
-        # Sleep until after the timeout (of 5) should have been reached
-        sleep(6)
+        # Sleep until after the timeout should have been reached
+        sleep(connection_timeout+2)
         if not exception
           thread.kill
           raise "Timeout passed without query timing out"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tiny_tds
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3.rc2
 platform: x86-mingw32
 authors:
 - Ken Collins
@@ -10,92 +10,92 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-19 00:00:00.000000000 Z
+date: 2015-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: mini_portile
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.2
-  type: :development
+        version: 0.6.2
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 0.6.2
 - !ruby/object:Gem::Dependency
-  name: mini_portile
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: '10.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: '10.4'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.9.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.9.5
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: rake-compiler-dock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 0.4.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 0.4.3
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.6'
 - !ruby/object:Gem::Dependency
   name: connection_pool
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '2.2'
 description: TinyTDS - A modern, simple and fast FreeTDS library for Ruby using DB-Library.
   Developed for the ActiveRecord SQL Server adapter.
 email:
@@ -105,16 +105,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - CHANGELOG
+- CODE_OF_CONDUCT.md
 - Gemfile
 - MIT-LICENSE
 - README.md
 - Rakefile
-- compile/rake-compiler-dev-box.patch
-- ext/patch/Makefile.in.diff
-- ext/patch/dblib-30-char-username.diff
-- ext/patch/sspi_w_kerberos.diff
+- appveyor.yml
 - ext/tiny_tds/client.c
 - ext/tiny_tds/client.h
 - ext/tiny_tds/extconf.rb
@@ -126,11 +124,17 @@ files:
 - lib/tiny_tds/1.9/tiny_tds.so
 - lib/tiny_tds/2.0/tiny_tds.so
 - lib/tiny_tds/2.1/tiny_tds.so
+- lib/tiny_tds/2.2/tiny_tds.so
 - lib/tiny_tds/client.rb
 - lib/tiny_tds/error.rb
 - lib/tiny_tds/result.rb
 - lib/tiny_tds/version.rb
-- tasks/ports.rake
+- ports/i686-w64-mingw32/bin/libeay32-1.0.2d-i686-w64-mingw32.dll
+- ports/i686-w64-mingw32/bin/libiconv-2.dll
+- ports/i686-w64-mingw32/bin/libsybdb-5.dll
+- ports/i686-w64-mingw32/bin/ssleay32-1.0.2d-i686-w64-mingw32.dll
+- ports/patches/freetds/0.91/Makefile.in.diff
+- ports/patches/freetds/0.91/dblib-30-char-username.diff
 - test/benchmark/query.rb
 - test/benchmark/query_odbc.rb
 - test/benchmark/query_tinytds.rb
@@ -140,32 +144,34 @@ files:
 - test/schema/sqlserver_2000.sql
 - test/schema/sqlserver_2005.sql
 - test/schema/sqlserver_2008.sql
+- test/schema/sqlserver_2014.sql
 - test/schema/sqlserver_azure.sql
 - test/schema/sybase_ase.sql
 - test/schema_test.rb
 - test/test_helper.rb
 - test/thread_test.rb
 homepage: http://github.com/rails-sqlserver/tiny_tds
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --charset=UTF-8
+- "--charset=UTF-8"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: TinyTDS - A modern, simple and fast FreeTDS library for Ruby using DB-Library.

data/compile/rake-compiler-dev-box.patch

@@ -1,31 +0,0 @@
-diff --git a/bin/package_win32_fat_binary b/bin/package_win32_fat_binary
-index b336eb7..8ef4f98 100755
---- a/bin/package_win32_fat_binary
-+++ b/bin/package_win32_fat_binary
-@@ -12,9 +12,8 @@ cd '/vagrant'
- # passed in path of gem to be cross-compiled
- cd $1
- 
--# need to use 1.8.7 for fat-binaries (1.9.3 can't cross-build 1.8.7)
--rvm use 1.8.7
-+rvm use 1.9.3
- bundle install
- 
- bundle exec rake clean
--bundle exec rake cross native gem RUBY_CC_VERSION=1.8.7:1.9.3:2.0.0
-+bundle exec rake cross native gem RUBY_CC_VERSION=1.9.3:2.0.0:2.1.1
-diff --git a/bin/prepare_xrubies b/bin/prepare_xrubies
-index 0e2043c..bd1d3c8 100755
---- a/bin/prepare_xrubies
-+++ b/bin/prepare_xrubies
-@@ -18,10 +18,6 @@ rvm all do gem install rake-compiler -v "~> 0.9.2"
- # Use just one CPU for building 1.8.7 and 1.9.3
- export MAKE="make"
- 
--# Build 1.8.7 with mingw32 compiler (GCC 4.2)
--rvm use 1.8.7
--rake-compiler cross-ruby VERSION=1.8.7-p374 HOST=i586-mingw32msvc
--
- # Build 1.9.3 using 1.9.3 as base
- rvm use 1.9.3
- rake-compiler cross-ruby VERSION=1.9.3-p545 HOST=i586-mingw32msvc

data/ext/patch/Makefile.in.diff

@@ -1,29 +0,0 @@
---- a/Makefile.in	2011-08-17 18:57:36.000000000 -0700
-+++ b/Makefile.in	2014-05-02 10:27:01.275813000 -0700
-@@ -772,13 +772,6 @@
- 
- 
- install-data-local:
--	$(mkinstalldirs) $(ETC)
--	if test ! -f $(ETC)/freetds.conf; then \
--		$(INSTALL_DATA) $(srcdir)/freetds.conf $(ETC)/freetds.conf; \
--	fi
--	if test ! -f $(ETC)/locales.conf; then \
--		$(INSTALL_DATA) $(srcdir)/locales.conf $(ETC)/locales.conf; \
--	fi
- 
- clean-local:
- 	find . \( -name \*.test_output -o -name \*.bb -o -name \*.bbg -o -name \*.da -o -name \*.gc\* \) -exec rm -f {} \;
---- a/src/pool/Makefile.in	2011-08-17 18:57:36.000000000 -0700
-+++ b/src/pool/Makefile.in	2014-05-02 10:32:39.628347600 -0700
-@@ -574,10 +574,6 @@
- 
- 
- install-data-local:
--	$(mkinstalldirs) $(ETC)
--	if test ! -f $(ETC)/pool.conf; then \
--		$(INSTALL_DATA) $(srcdir)/pool.conf $(ETC)/pool.conf; \
--	fi
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.

data/ext/patch/dblib-30-char-username.diff

@@ -1,11 +0,0 @@
---- a/src/dblib/dblib.c
-+++ b/src/dblib/dblib.c
-@@ -765,7 +765,7 @@ dbsetlname(LOGINREC * login, const char *value, int which)
- 		return FAIL;
- 	}
- 
--	if (TDS_MAX_LOGIN_STR_SZ < strlen(value)) {
-+	if (login->tds_login->tds_version < 0x700 && TDS_MAX_LOGIN_STR_SZ < strlen(value)) {
- 		dbperror(NULL, SYBENTLL, 0);
- 		return FAIL;
- 	}

data/ext/patch/sspi_w_kerberos.diff

@@ -1,42 +0,0 @@
---- a/src/tds/sspi.c
-+++ b/src/tds/sspi.c
-@@ -172,8 +172,19 @@ tds_sspi_handle_next(TDSSOCKET * tds, struct tds_authentication * tds_auth, size
- 
- 	free(auth_buf);
- 
--	if (status != SEC_E_OK)
-+	switch (status) {
-+	case SEC_I_COMPLETE_AND_CONTINUE:
-+		sec_fn->CompleteAuthToken(&auth->cred_ctx, &out_desc);
-+		break;
-+
-+	case SEC_I_CONTINUE_NEEDED:
-+	case SEC_E_OK:
-+		break;
-+
-+	default:
- 		return TDS_FAIL;
-+	}
-+
- 	if (out_buf.cbBuffer == 0)
- 		return TDS_SUCCEED;
- 
-@@ -275,9 +286,16 @@ tds_sspi_get_auth(TDSSOCKET * tds)
- 		&auth->cred_ctx, &desc,
- 		&attrs, &ts);
- 
--	if (status == SEC_I_COMPLETE_AND_CONTINUE || status == SEC_I_CONTINUE_NEEDED) {
-+	switch (status) {
-+	case SEC_I_COMPLETE_AND_CONTINUE:
- 		sec_fn->CompleteAuthToken(&auth->cred_ctx, &desc);
--	} else if(status != SEC_E_OK) {
-+		break;
-+
-+	case SEC_I_CONTINUE_NEEDED:
-+	case SEC_E_OK:
-+		break;
-+
-+	default:
- 		free(auth->sname);
- 		free(auth->tds_auth.packet);
- 		sec_fn->FreeCredentialsHandle(&auth->cred);

data/tasks/ports.rake

@@ -1,79 +0,0 @@
-require 'mini_portile'
-
-# If your using 0.82, you may have to make a conf file to get it to work. For example:
-# $ export FREETDSCONF='/opt/local/etc/freetds/freetds.conf'
-ICONV_VERSION = "1.14"
-FREETDS_VERSION = ENV['TINYTDS_FREETDS_VERSION'] || "0.91"
-FREETDS_VERSION_INFO = Hash.new { |h,k|
-  h[k] = {:files => "ftp://ftp.astron.com/pub/freetds/stable/freetds-#{k}.tar.gz"}
-}.merge({
-  "0.82" => {:files => "ftp://ftp.astron.com/pub/freetds/old/0.82/freetds-0.82.tar.gz"},
-  "0.91" => {:files => "ftp://ftp.astron.com/pub/freetds/stable/freetds-0.91.tar.gz"},
-  "current" => {:files => "ftp://ftp.astron.com/pub/freetds/current/freetds-current.tgz"}
-})
-
-# all ports depends on this directory to exist
-directory "ports"
-
-def define_libiconv_recipe(platform, host)
-  recipe = MiniPortile.new "libiconv", ICONV_VERSION
-  recipe.files << "http://ftp.gnu.org/pub/gnu/libiconv/libiconv-#{ICONV_VERSION}.tar.gz"
-  recipe.host = host
-
-  desc "Compile libiconv for '#{platform}' (#{host})"
-  task "ports:libiconv:#{platform}" => ["ports"] do
-    checkpoint = "ports/.#{recipe.name}-#{recipe.version}-#{recipe.host}.installed"
-
-    unless File.exist?(checkpoint)
-      # always produce position independent code
-      recipe.configure_options << "CFLAGS='-fPIC'"
-      recipe.cook
-      touch checkpoint
-    end
-  end
-
-  recipe
-end
-
-def define_freetds_recipe(platform, host, libiconv)
-  recipe = MiniPortile.new "freetds", FREETDS_VERSION
-  recipe.files << FREETDS_VERSION_INFO[FREETDS_VERSION][:files]
-  recipe.host = host
-
-  if recipe.respond_to?(:patch_files) && FREETDS_VERSION == "0.91"
-    recipe.patch_files << File.expand_path(File.join('..', '..', 'ext', 'patch', 'sspi_w_kerberos.diff'), __FILE__)
-    recipe.patch_files << File.expand_path(File.join('..', '..', 'ext', 'patch', 'dblib-30-char-username.diff'), __FILE__)
-    unless RUBY_PLATFORM =~ /mswin|mingw/
-      recipe.patch_files << File.expand_path(File.join('..', '..', 'ext', 'patch', 'Makefile.in.diff'), __FILE__)
-    end
-  end
-
-  desc "Compile freetds for '#{platform}' (#{host})"
-  task "ports:freetds:#{platform}" => ["ports", "ports:libiconv:#{platform}"] do
-    checkpoint = "ports/.#{recipe.name}-#{recipe.version}-#{recipe.host}.installed"
-
-    unless File.exist?(checkpoint)
-      with_tdsver = ENV['TINYTDS_FREETDS_VERSION'] =~ /0\.8/ ? "--with-tdsver=8.0" : "--with-tdsver=7.1"
-      for_windows = recipe.host =~ /mswin|mingw/i
-      recipe.configure_options << '--with-pic'
-      recipe.configure_options << "--with-libiconv-prefix=#{libiconv.path}"
-      recipe.configure_options << '--sysconfdir="C:/Sites"' if for_windows
-      recipe.configure_options << '--enable-sspi' if for_windows
-      recipe.configure_options << "--disable-odbc"
-      recipe.configure_options << with_tdsver
-      recipe.cook
-      touch checkpoint
-    end
-  end
-
-  recipe
-end
-
-# native compilation of ports
-host = RbConfig::CONFIG["host"]
-libiconv = define_libiconv_recipe(RUBY_PLATFORM, host)
-freetds  = define_freetds_recipe(RUBY_PLATFORM, host, libiconv)
-
-# compile native FreeTDS
-desc "Compile native freetds"
-task "ports:freetds" => ["ports:freetds:#{RUBY_PLATFORM}"]