Skip to content

Commit 4bfe15e

Browse files
committed
[skip ci] add pr link
1 parent 141f26d commit 4bfe15e

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Diff for: README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ Creating a new client takes a hash of options. For valid iconv encoding options,
110110
* :appname - Short string seen in SQL Servers process/activity window.
111111
* :tds_version - TDS version. Defaults to "7.3".
112112
* :login_timeout - Seconds to wait for login. Default to 60 seconds.
113-
* :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. Timeouts caused by network failure will raise a timeout error 1 second after the configured timeout limit is hit.
113+
* :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. Timeouts caused by network failure will raise a timeout error 1 second after the configured timeout limit is hit (see [#481](https://github.com/rails-sqlserver/tiny_tds/pull/481) for details).
114114
* :encoding - Any valid iconv value like CP1251 or ISO-8859-1. Default UTF-8.
115115
* :azure - Pass true to signal that you are connecting to azure.
116116
* :contained - Pass true to signal that you are connecting with a contained database user.

0 commit comments

Comments
 (0)