tiny_tds 0.6.2 → 0.6.3.rc1

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.rc1
 platform: ruby
 authors:
 - Ken Collins
@@ -10,92 +10,78 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-19 00:00:00.000000000 Z
+date: 2015-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '10.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '10.4'
 - !ruby/object:Gem::Dependency
   name: mini_portile
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.6.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.6.2
 - !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
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 0.9.5
 - !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:
@@ -106,7 +92,7 @@ extensions:
 - ext/tiny_tds/extconf.rb
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - CHANGELOG
 - Gemfile
 - MIT-LICENSE
@@ -115,7 +101,6 @@ files:
 - compile/rake-compiler-dev-box.patch
 - ext/patch/Makefile.in.diff
 - ext/patch/dblib-30-char-username.diff
-- ext/patch/sspi_w_kerberos.diff
 - ext/tiny_tds/client.c
 - ext/tiny_tds/client.h
 - ext/tiny_tds/extconf.rb
@@ -138,33 +123,50 @@ 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.6
 signing_key: 
 specification_version: 4
 summary: TinyTDS - A modern, simple and fast FreeTDS library for Ruby using DB-Library.
-test_files: []
+test_files:
+- test/benchmark/query.rb
+- test/benchmark/query_odbc.rb
+- test/benchmark/query_tinytds.rb
+- test/client_test.rb
+- test/result_test.rb
+- test/schema/1px.gif
+- 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

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);