tiny_tds 2.1.0.pre2-x86-mingw32 → 2.1.0.pre3-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8ab6753959f2f2c7b2ad23a83df0ce13b99a095
-  data.tar.gz: f9563f999bed18c08f00b8303d8bbbe3f70324c1
+  metadata.gz: '08eae6e3200b5f32608163ec4387e72d60bb1fa7'
+  data.tar.gz: 148f42c5ea47d801eb9af226cf9f6f6e8a6911b8
 SHA512:
-  metadata.gz: 51e973625c491bc1f5c12e7dacc60756a13cf988893157d162922f0f88faa5ccff4d6df295e37147124135d1c5925d9dacb257f68fe5ea51205212f7004e9ff2
-  data.tar.gz: 001c4a7ee542f88b5bbca7303bd2b9a31073ac943015fa043195f051ff9f2390ce3438158d577ec9d167d52ddec64724a455d8ab4ba20309897fa2b7641390b0
+  metadata.gz: 58d25bea67f36bcd79785fd71e78637addb01572462d3bfbcdb6200c736d93556bfbc182743057d15e3da163ddf85c4c74d7d48b927b2a2197ade281b4d9ddd8
+  data.tar.gz: 253484eadc75693a73c08c861424dc358204139f9bd4e425695007bb736aa9dc47bfc2d2d9c2be2fe5f7a7d0335dc00d0ecb4d935c1c8c453596a7ab6a1be60e

data/CHANGELOG.md

@@ -3,6 +3,7 @@
 * Support RubyInstaller2 for Windows. Fixes #365.
 * Support the FREETDS_DIR environment variable. Fixes #371.
 * Rename binstubs to tsql-ttds and defncopy-ttds
+* Support separate timeout values per connection Fixes #348.
 
 
 ## 2.0.0

data/README.md

@@ -117,7 +117,7 @@ Creating a new client takes a hash of options. For valid iconv encoding options,
 * :appname - Short string seen in SQL Servers process/activity window.
 * :tds_version - TDS version. Defaults to "7.3".
 * :login_timeout - Seconds to wait for login. Default to 60 seconds.
-* :timeout - Seconds to wait for a response to a SQL command. Default 5 seconds.
+* :timeout - Seconds to wait for a response to a SQL command. Default 5 seconds. Prior to 1.0rc5, FreeTDS was unable to set the timeout on a per-client basis, permitting only a global timeout value. This means that if you're using an older version, the timeout values for all clients will be overwritten each time you instantiate a new `TinyTds::Client` object. If you are using 1.0rc5 or later, all clients will have an independent timeout setting as you'd expect.
 * :encoding - Any valid iconv value like CP1251 or ISO-8859-1. Default UTF-8.
 * :azure - Pass true to signal that you are connecting to azure.
 * :contained - Pass true to signal that you are connecting with a contained database user.
@@ -482,5 +482,3 @@ My name is Ken Collins and I currently maintain the SQL Server adapter for Activ
 ## License
 
 TinyTDS is Copyright (c) 2010-2015 Ken Collins, <ken@metaskills.net> and Will Bond (Veracross LLC) <wbond@breuer.com>. It is distributed under the MIT license. Windows binaries contain pre-compiled versions of FreeTDS <http://www.freetds.org/> which is licensed under the GNU LGPL license at <http://www.gnu.org/licenses/lgpl-2.0.html>
-
-

data/VERSION

@@ -1 +1 @@
-2.1.0.pre2
+2.1.0.pre3

data/ext/tiny_tds/client.c

@@ -326,8 +326,6 @@ static VALUE rb_tinytds_connect(VALUE self, VALUE opts) {
     dbsetlapp(cwrap->login, StringValueCStr(app));
   if (!NIL_P(ltimeout))
     dbsetlogintime(NUM2INT(ltimeout));
-  if (!NIL_P(timeout))
-    dbsettime(NUM2INT(timeout));
   if (!NIL_P(charset))
     DBSETLCHARSET(cwrap->login, StringValueCStr(charset));
   if (!NIL_P(database)) {
@@ -354,12 +352,18 @@ static VALUE rb_tinytds_connect(VALUE self, VALUE opts) {
   #endif
   cwrap->client = dbopen(cwrap->login, StringValueCStr(dataserver));
   if (cwrap->client) {
-    VALUE transposed_encoding;
+    VALUE transposed_encoding, timeout_string;
 
     cwrap->closed = 0;
     cwrap->charset = charset;
     if (!NIL_P(version))
       dbsetversion(NUM2INT(version));
+    if (!NIL_P(timeout)) {
+      timeout_string = rb_sprintf("%"PRIsVALUE"", timeout);
+      if (dbsetopt(cwrap->client, DBSETTIME, StringValueCStr(timeout_string), 0) == FAIL) {
+        dbsettime(NUM2INT(timeout));
+      }
+    }
     dbsetuserdata(cwrap->client, (BYTE*)cwrap->userdata);
     cwrap->userdata->closed = 0;
     if (!NIL_P(database) && (azure != Qtrue)) {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tiny_tds
 version: !ruby/object:Gem::Version
-  version: 2.1.0.pre2
+  version: 2.1.0.pre3
 platform: x86-mingw32
 authors:
 - Ken Collins
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-04 00:00:00.000000000 Z
+date: 2017-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_portile2