tiny_tds 2.1.0.pre2 → 2.1.0.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2d676319d7afa209a0eaaf878ce2606fa275daf
-  data.tar.gz: 12360c67d76881fa42f24f798b1e31f68828d534
+  metadata.gz: 5566589ac540ec491cbe2d0f81179f6d714405c2
+  data.tar.gz: 8ea41365b260d809a232f8b9c57ff73a8abb7b57
 SHA512:
-  metadata.gz: 265e162c230eaedabae443fb8ca341999827d2af2633cc271a56a3c450bfd900c7bea31b97f2230affce62988932e519379791d43d738c134f435fb7544eb8cb
-  data.tar.gz: 8fce1c49005186b3c322904be62068a6d8d910de43c689be2a28f574a76b5f3d374546b7bc28493f6648fcacb9dfc424b3b8caa980054d8198c7d3801c2a316f
+  metadata.gz: 217443bc1c04781d1939e0f1c6cf07b1c684eec870cabe8d9d578ea76014f63b0812b5ffb88b58f2832fedb72326c723e8999df49b5db5b2e1c4b8110f2af0e7
+  data.tar.gz: bf338a99275e6592cf4a166c7dad14f38d3c6782ecae0146b3822283c593c32f82b8cb5d97b66e550266b2a60e9071dc097264cda4a58c39437779600dcdcbc8

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: ruby
 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