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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f79710a81230b8f6dd74e2050a39a38c25064d44
-  data.tar.gz: b915ab41287503dfa7d8b8034fee3e12a295b7f8
+  metadata.gz: 93e0eb01b0d797e9f3e1266a0be08158e4b761c1
+  data.tar.gz: 6671c344c84c8bbdb1911b042652227292b198fd
 SHA512:
-  metadata.gz: c85aad8b2ede2194d98665779414815bf8a7a60b08939a9a3097b72043d3d8785dcae5b90e550197da1b1ae14d22cf934913c260b72d86a48aa8e3834b3bfff6
-  data.tar.gz: 17a78414f918f0a6fc62b4642d1921c1a0dc47de3ac5a7248c0c51521e5632304a870328e09af3e6b89d2a1aa6ebab67c0f976af957ed3bfe4730c372209a050
+  metadata.gz: 32165a0fd2f22b0652894313b513e41c0e087528fa8e077338ea55d850e004452160fe4685cf73639c95480efe4f2e7d7c6065f67a7ae939f97194594c6ad21e
+  data.tar.gz: 7a145ce24108ee06536767427416ffedb7ff6c5ff1ff540bd07ab422c430c4dabbdc630571232da950555e4b1d28c0eda848dea4c5621e75b689e350ebca28a6

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