tiny_tds 2.1.4 → 2.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1b3c5584f282850876f00b66df7ffda7c42bcb32ad89f8c74ebe4aa116567d9
-  data.tar.gz: 3d99f342d5964ee82580ce424fe7ac3be3b6128a247ae8e10bbb9463c57203ce
+  metadata.gz: 68f96f7fe4be98e8165b7a9716e116dc3989a42511e0d9a5115bcf8e69fe6582
+  data.tar.gz: 96cbb636206ff15c987dba8759abe644e62168ed9afa5286acf57b18b95bf6ce
 SHA512:
-  metadata.gz: 1eabe9f662404dd47f3e1faac8cc9ffcad7c32b890e73154e7478f0f84f0a7cecf312e21d44fce7e1988db2a8d54ca24eed53109d60489abd04e0f1dfd8cbf63
-  data.tar.gz: bc7cc00ff8f3d36a066d0d6f2087454a9e2918a0d0439a846b08c34b58eb274b72afa3cc2940a5842a9fd802d6c51e0d8332efa13786fbd45b397d5a954bef98
+  metadata.gz: 8679ca4bc997fab7528f8ec2bce4f754b92319835157d08c017a20cf6561bae6638da077300cdd361302935b384a1b5ec00c05e014e7c12700e31bc5fd160d06
+  data.tar.gz: d35162380fec76c36ddff7f2407a1715105aa264be7c18ee2b078acfab6aab9a22a24854e815c9da389c295a4d6348668900752623f49fa222d31fd6e5b647a7

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## (unreleased)
 
+## 2.1.5
+
+* Fix compilation errors for Amazon Linux 1. Fixes #495.
+* Fix segfault for login timeouts
+
 ## 2.1.4
 
 * Improve handling of network related timeouts
@@ -267,4 +272,3 @@ Use both dbsetversion() vs. dbsetlversion. Partially reverts #62.
 
 
 ## 0.1.0 Initial release!
-

data/VERSION

@@ -1 +1 @@
-2.1.4
+2.1.5

data/ext/tiny_tds/client.c

@@ -96,13 +96,14 @@ int tinytds_err_handler(DBPROCESS *dbproc, int severity, int dberr, int oserr, c
       but we don't ever want to automatically retry. Instead have the app
       decide what to do.
       */
-      if (userdata->timing_out) {
+      if (userdata && userdata->timing_out) {
         return INT_CANCEL;
       }
-      else {
+      // userdata will not be set if hitting timeout during login so check for it first
+      if (userdata) {
         userdata->timing_out = 1;
-        return_value = INT_TIMEOUT;
       }
+      return_value = INT_TIMEOUT;
       cancel = 1;
       break;
 

data/ext/tiny_tds/result.c

@@ -99,12 +99,14 @@ static void nogvl_cleanup(DBPROCESS *client) {
   Now that the blocking operation is done, we can finally throw any
   exceptions based on errors from SQL Server.
   */
-  for (short int i = 0; i < userdata->nonblocking_errors_length; i++) {
+  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) {
-      for (short int j = i; j < userdata->nonblocking_errors_length; j++) {
+      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);

data/test/client_test.rb

@@ -176,6 +176,24 @@ class ClientTest < TinyTds::TestCase
       end
     end
 
+    it 'raises TinyTds exception with login timeout' do
+      skip if ENV['CI'] && ENV['APPVEYOR_BUILD_FOLDER'] # only CI using docker
+      begin
+        action = lambda do
+          Toxiproxy[:sqlserver_test].toxic(:timeout, timeout: 0).apply do
+            new_connection login_timeout: 1, port: 1234
+          end
+        end
+        assert_raise_tinytds_error(action) do |e|
+          assert_equal 20003, e.db_error_number
+          assert_equal 6, e.severity
+          assert_match %r{timed out}i, e.message, 'ignore if non-english test run'
+        end
+      ensure
+        assert_new_connections_work
+      end
+    end
+
     it 'raises TinyTds exception with wrong :username' do
       skip if ENV['CI'] && sqlserver_azure? # Some issue with db_error_number.
       options = connection_options :username => 'willnotwork'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tiny_tds
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 2.1.5
 platform: ruby
 authors:
 - Ken Collins
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-10 00:00:00.000000000 Z
+date: 2021-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_portile2