tiny_tds 2.1.2-x86-mingw32 → 2.1.4-x86-mingw32

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: b3f3db42f5225c5fb96bc70681536f5113257620bcd15fe85d8132739ca40518
4
- data.tar.gz: f8206a4ca4abc5402a4701c59d7838b210e6714b837115026ba079cb12a31c16
3
+ metadata.gz: f4636977a24bb1b48ae9f88cbe8741896c2318accb69f818fd7de9482bf3e127
4
+ data.tar.gz: 05c26b702b0ee94899c26f6c30e9f73335ce83d4228e81ed168037d9a5616d47
5
5
  SHA512:
6
- metadata.gz: 8ccbc94268ea7d24c7da46ab92f0dada3bf40fab69eab9e90f400a599baae84a835253385ad46347acab30d320cc6d7239f3685eebafc885d70c2a2fe731b88b
7
- data.tar.gz: f53428e24b1338cd43aeae307c01da2613914dc623f3763c7f762e7821aab69baa78bd6ebb8f5f48a2eb2f35732b3f827ad389e855f18c66ece65e16a4f66ffd
6
+ metadata.gz: 9276796af730b23fbdeac517e9529b1079d0fb607d810ae15fdb78e88f58277b8a4e23bda85915cddbf22003d0ea837be37d286a09f404294507058f15965231
7
+ data.tar.gz: dce67a8b59d159c5752e95620556b6d5384d798338fde8b684753228d7d237136e7a4f33517d972985880bda395b6f046a7116bd9c107a382480ada19d05f868
data/.travis.yml CHANGED
@@ -8,14 +8,15 @@ env:
8
8
  - TESTOPTS="-v"
9
9
  - TINYTDS_UNIT_HOST=localhost
10
10
  rvm:
11
- - 2.1.9
12
- - 2.2.5
13
- - 2.3.1
11
+ - 2.4.5
12
+ - 2.5.3
13
+ - 2.6.1
14
+ - 2.7.0
14
15
  before_install:
15
16
  - docker info
17
+ - docker-compose up -d
16
18
  - sudo ./test/bin/install-openssl.sh
17
19
  - sudo ./test/bin/install-freetds.sh
18
- - sudo ./test/bin/setup.sh
19
20
  install:
20
21
  - gem install bundler
21
22
  - bundle --version
data/CHANGELOG.md CHANGED
@@ -1,3 +1,16 @@
1
+ ## (unreleased)
2
+
3
+ ## 2.1.4
4
+
5
+ * Improve handling of network related timeouts
6
+ * Fix error reporting when preceded by info message
7
+
8
+ ## 2.1.3
9
+
10
+ * Removed old/unused appveyor config
11
+ * Remove old Rubies from CI & cross compile list
12
+ * Add Ruby 2.6 and 2.7 to the cross compile list
13
+
1
14
  ## 2.1.2
2
15
 
3
16
  * Use Kernel.BigDecimal vs BigDecimal.new. Fixes #409.
@@ -207,6 +220,8 @@ Use both dbsetversion() vs. dbsetlversion. Partially reverts #62.
207
220
  state of the client and the need to use Result#cancel to stop processing active results. It is also
208
221
  safe to call Result#cancel over and over again.
209
222
  * Look for the syb headers only.
223
+ * Fix minitest global matchers warnings.
224
+ * Fix test warnings.
210
225
 
211
226
 
212
227
  ## 0.3.2
data/README.md CHANGED
@@ -3,13 +3,8 @@
3
3
  * [![TravisCI](https://travis-ci.org/rails-sqlserver/tiny_tds.svg?branch=master)](https://travis-ci.org/rails-sqlserver/tiny_tds) - TravisCI
4
4
  * [![Build Status](https://ci.appveyor.com/api/projects/status/g2bhhbsdkx0mal55/branch/master?svg=true)](https://ci.appveyor.com/project/rails-sqlserver/tiny-tds/branch/master) - Appveyor
5
5
  * [![Gem Version](https://img.shields.io/gem/v/tiny_tds.svg)](https://rubygems.org/gems/tiny_tds) - Gem Version
6
- * [![Dependency Status](https://dependencyci.com/github/rails-sqlserver/tiny_tds/badge)](https://dependencyci.com/github/rails-sqlserver/tiny_tds) - Dependency Status
7
6
  * [![Gitter chat](https://img.shields.io/badge/%E2%8A%AA%20GITTER%20-JOIN%20CHAT%20%E2%86%92-brightgreen.svg?style=flat)](https://gitter.im/rails-sqlserver/activerecord-sqlserver-adapter) - Community
8
7
 
9
- ## Supporting TinyTDS/Adapter
10
-
11
- Both TinyTDS and the Rails SQL Server Adapter are MIT-licensed open source projects. Its ongoing development is made possible thanks to the support by these awesome [backers](https://github.com/rails-sqlserver/tiny_tds/blob/master/BACKERS.md). If you'd like to join them, check out our [Patreon Campaign](https://www.patreon.com/metaskills).
12
-
13
8
 
14
9
  ## About TinyTDS
15
10
 
@@ -42,15 +37,15 @@ $ apt-get install wget
42
37
  $ apt-get install build-essential
43
38
  $ apt-get install libc6-dev
44
39
 
45
- $ wget http://www.freetds.org/files/stable/freetds-1.00.21.tar.gz
46
- $ tar -xzf freetds-1.00.21.tar.gz
47
- $ cd freetds-1.00.21
40
+ $ wget http://www.freetds.org/files/stable/freetds-1.1.24.tar.gz
41
+ $ tar -xzf freetds-1.1.24.tar.gz
42
+ $ cd freetds-1.1.24
48
43
  $ ./configure --prefix=/usr/local --with-tdsver=7.3
49
44
  $ make
50
45
  $ make install
51
46
  ```
52
47
 
53
- If none exist, our native extension will use MiniPortile to install any missing dependencies listed above for your specific platform. These dependencies will be built and linked within the installed TinyTDS gem. Please read the MiniPortile and/or Windows sections at the end of this file for advanced configuration options past the following:
48
+ Please read the MiniPortile and/or Windows sections at the end of this file for advanced configuration options past the following:
54
49
 
55
50
  ```
56
51
  --with-freetds-dir=DIR
@@ -73,11 +68,11 @@ TinyTDS is developed against FreeTDS 0.95, 0.99, and 1.0 current. Our default an
73
68
 
74
69
  **NOTE:** Windows users of our pre-compiled native gems need not worry about installing FreeTDS and its dependencies.
75
70
 
76
- * **Do I need to install FreeTDS?** Yes! Somehow, someway, you are going to need FreeTDS for TinyTDS to compile against. You can avoid installing FreeTDS on your system by using our projects usage of rake-compiler and mini_portile to compile and package a native gem just for you. See the "Using MiniPortile" section below.
71
+ * **Do I need to install FreeTDS?** Yes! Somehow, someway, you are going to need FreeTDS for TinyTDS to compile against.
77
72
 
78
73
  * **OK, I am installing FreeTDS, how do I configure it?** Contrary to what most people think, you do not need to specially configure FreeTDS in any way for client libraries like TinyTDS to use it. About the only requirement is that you compile it with libiconv for proper encoding support. FreeTDS must also be compiled with OpenSSL (or the like) to use it with Azure. See the "Using TinyTDS with Azure" section below for more info.
79
74
 
80
- * **Do I need to configure `--with-tdsver` equal to anything?** Most likely! Technically you should not have too. This is only a default for clients/configs that do not specify what TDS version they want to use. We are currently having issues with passing down a TDS version with the login bit. Till we get that fixed, if you are not using a freetds.conf or a TDSVER environment variable, then make sure to use 7.1.
75
+ * **Do I need to configure `--with-tdsver` equal to anything?** Most likely! Technically you should not have to. This is only a default for clients/configs that do not specify what TDS version they want to use. We are currently having issues with passing down a TDS version with the login bit. Till we get that fixed, if you are not using a freetds.conf or a TDSVER environment variable, then make sure to use 7.1.
81
76
 
82
77
  * **But I want to use TDS version 7.2 for SQL Server 2005 and up!** TinyTDS uses TDS version 7.1 (previously named 8.0) and fully supports all the data types supported by FreeTDS, this includes `varchar(max)` and `nvarchar(max)`. Technically compiling and using TDS version 7.2 with FreeTDS is not supported. But this does not mean those data types will not work. I know, it's confusing If you want to learn more, read this thread. http://lists.ibiblio.org/pipermail/freetds/2011q3/027306.html
83
78
 
@@ -115,7 +110,7 @@ Creating a new client takes a hash of options. For valid iconv encoding options,
115
110
  * :appname - Short string seen in SQL Servers process/activity window.
116
111
  * :tds_version - TDS version. Defaults to "7.3".
117
112
  * :login_timeout - Seconds to wait for login. Default to 60 seconds.
118
- * :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.
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).
119
114
  * :encoding - Any valid iconv value like CP1251 or ISO-8859-1. Default UTF-8.
120
115
  * :azure - Pass true to signal that you are connecting to azure.
121
116
  * :contained - Pass true to signal that you are connecting with a contained database user.
@@ -327,9 +322,13 @@ By default row caching is turned on because the SQL Server adapter for ActiveRec
327
322
  TinyTDS takes an opinionated stance on how we handle encoding errors. First, we treat errors differently on reads vs. writes. Our opinion is that if you are reading bad data due to your client's encoding option, you would rather just find `?` marks in your strings vs being blocked with exceptions. This is how things wold work via ODBC or SMS. On the other hand, writes will raise an exception. In this case we raise the SYBEICONVO/2402 error message which has a description of `Error converting characters into server's character set. Some character(s) could not be converted.`. Even though the severity of this message is only a `4` and TinyTDS will automatically strip/ignore unknown characters, we feel you should know that you are inserting bad encodings. In this way, a transaction can be rolled back, etc. Remember, any database write that has bad characters due to the client encoding will still be written to the database, but it is up to you rollback said write if needed. Most ORMs like ActiveRecord handle this scenario just fine.
328
323
 
329
324
 
325
+ ## Timeout Error Handling
326
+
327
+ TinyTDS will raise a `TinyTDS::Error` when a timeout is reached based on the options supplied to the client. Depending on the reason for the timeout, the connection could be dead or alive. When db processing is the cause for the timeout, the connection should still be usable after the error is raised. When network failure is the cause of the timeout, the connection will be dead. If you attempt to execute another command batch on a dead connection you will see a `DBPROCESS is dead or not enabled` error. Therefore, it is recommended to check for a `dead?` connection before trying to execute another command batch.
328
+
330
329
  ## Binstubs
331
330
 
332
- The TinyTDS gem uses binstub wrappers which mirror compiled [FreeTDS Utilities](http://www.freetds.org/userguide/usefreetds.htm) binaries. These native executables are usually installed at the system level when installing FreeTDS. However, when using MiniPortile to install TinyTDS as we do with Windows binaries, these binstubs will find and prefer local gem `exe` directory executables. These are the following binstubs we wrap.
331
+ The TinyTDS gem uses binstub wrappers which mirror compiled [FreeTDS Utilities](https://www.freetds.org/userguide/usefreetds.html) binaries. These native executables are usually installed at the system level when installing FreeTDS. However, when using MiniPortile to install TinyTDS as we do with Windows binaries, these binstubs will find and prefer local gem `exe` directory executables. These are the following binstubs we wrap.
333
332
 
334
333
  * tsql - Used to test connections and debug compile time settings.
335
334
  * defncopy - Used to dump schema structures.
@@ -405,7 +404,7 @@ The default is true and since FreeTDS v1.0 would do this as well.
405
404
 
406
405
  ## Compiling Gems for Windows
407
406
 
408
- For the convenience of Windows users, TinyTDS ships pre-compiled gems for Ruby 2.0, 2.1, 2.2, and 2.3 on Windows. In order to generate these gems, [rake-compiler-dock](https://github.com/rake-compiler/rake-compiler-dock) is used. This project provides a [Docker image](https://registry.hub.docker.com/u/larskanis/rake-compiler-dock/) with rvm, cross-compilers and a number of different target versions of Ruby.
407
+ For the convenience of Windows users, TinyTDS ships pre-compiled gems for supported versions of Ruby on Windows. In order to generate these gems, [rake-compiler-dock](https://github.com/rake-compiler/rake-compiler-dock) is used. This project provides several [Docker images](https://registry.hub.docker.com/u/larskanis/) with rvm, cross-compilers and a number of different target versions of Ruby.
409
408
 
410
409
  Run the following rake task to compile the gems for Windows. This will check the availability of [Docker](https://www.docker.com/) (and boot2docker on Windows or OS-X) and will give some advice for download and installation. When docker is running, it will download the docker image (once-only) and start the build:
411
410
 
@@ -424,17 +423,20 @@ First, clone the repo using the command line or your Git GUI of choice.
424
423
  $ git clone git@github.com:rails-sqlserver/tiny_tds.git
425
424
  ```
426
425
 
427
- After that, the quickest way to get setup for development is to use [Docker](https://www.docker.com/). Assuming you have [downloaded docker](https://www.docker.com/products/docker) for your platform and you have , you can run our test setup script.
426
+ After that, the quickest way to get setup for development is to use [Docker](https://www.docker.com/). Assuming you have [downloaded docker](https://www.docker.com/products/docker) for your platform, you can use [docker-compose](https://docs.docker.com/compose/install/) to run the necessary containers for testing.
428
427
 
429
428
  ```shell
430
- $ ./test/bin/setup.sh
429
+ $ docker-compose up -d
431
430
  ```
432
431
 
433
- This will download our SQL Server for Linux Docker image based from [microsoft/mssql-server-linux/](https://hub.docker.com/r/microsoft/mssql-server-linux/). Our image already has the `[tinytdstest]` DB and `tinytds` users created. Basically, it does the following.
432
+ This will download our SQL Server for Linux Docker image based from [microsoft/mssql-server-linux/](https://hub.docker.com/r/microsoft/mssql-server-linux/). Our image already has the `[tinytdstest]` DB and `tinytds` users created. This will also download a [toxiproxy](https://github.com/shopify/toxiproxy) Docker image which we can use to simulate network failures for tests. Basically, it does the following.
434
433
 
435
434
  ```shell
435
+ $ docker network create main-network
436
436
  $ docker pull metaskills/mssql-server-linux-tinytds
437
- $ docker run -p 1433:1433 -d metaskills/mssql-server-linux-tinytds
437
+ $ docker run -p 1433:1433 -d --name sqlserver --network main-network metaskills/mssql-server-linux-tinytds
438
+ $ docker pull shopify/toxiproxy
439
+ $ docker run -p 8474:8474 -p 1234:1234 -d --name toxiproxy --network main-network shopify/toxiproxy
438
440
  ```
439
441
 
440
442
  If you are using your own database. Make sure to run these SQL commands as SA to get the test database and user installed.
@@ -466,6 +468,17 @@ $ rake TINYTDS_UNIT_HOST=mydb.host.net TINYTDS_SCHEMA=sqlserver_azure
466
468
  $ rake TINYTDS_UNIT_HOST=mydb.host.net TINYTDS_UNIT_PORT=5000 TINYTDS_SCHEMA=sybase_ase
467
469
  ```
468
470
 
471
+ ## Docker Builds
472
+
473
+ If you use a [multi stage](https://docs.docker.com/develop/develop-images/multistage-build/) Docker build to assemble your gems in one phase and then copy your app and gems
474
+ into another, lighter, container without build tools you will need to make sure you tell the OS how to find dependencies for TinyTDS.
475
+
476
+ After you have built and installed FreeTDS it will normally place library files in `/usr/local/lib`. When TinyTDS builds native extensions,
477
+ it [already knows to look here](https://github.com/rails-sqlserver/tiny_tds/blob/master/ext/tiny_tds/extconf.rb#L31) but if you copy your app to a new container that link will be broken.
478
+
479
+ Set the LD_LIBRARY_PATH environment variable `export LD_LIBRARY_PATH=/usr/local/lib:${LD_LIBRARY_PATH}` and run `ldconfig`. If you run `ldd tiny_tds.so` you should not see any broken links. Make
480
+ sure you also copied in the library dependencies from your build container with a command like `COPY --from=builder /usr/local/lib /usr/local/lib`.
481
+
469
482
  ## Help & Support
470
483
 
471
484
  * Github Source: http://github.com/rails-sqlserver/tiny_tds
data/VERSION CHANGED
@@ -1 +1 @@
1
- 2.1.2
1
+ 2.1.4
data/appveyor.yml CHANGED
@@ -1,21 +1,41 @@
1
1
  init:
2
2
  - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
3
- - SET PATH=C:\MinGW\msys\1.0\bin;%PATH%
4
3
  - SET RAKEOPT=-rdevkit
5
4
  - SET TESTOPTS='-v'
6
- - SET MAKE=make V=1
5
+ - SET MAKE=make V=1 -j2
7
6
  clone_depth: 5
8
7
  skip_tags: true
9
8
  skip_branch_with_pr: true
10
9
  matrix:
11
- fast_finish: true
10
+ fast_finish: false
12
11
  install:
13
12
  # Output debugging info
14
13
  - ps: Update-AppveyorBuild -Version "$(Get-Content $env:appveyor_build_folder\VERSION).$env:appveyor_build_number"
14
+ - ps: |
15
+ if ($env:ruby_version -like "*head*") {
16
+ $(new-object net.webclient).DownloadFile("https://github.com/oneclick/rubyinstaller2/releases/download/rubyinstaller-head/rubyinstaller-$env:ruby_version.exe", "$pwd/ruby-setup.exe")
17
+ cmd /c ruby-setup.exe /verysilent /dir=C:/Ruby$env:ruby_version
18
+ }
15
19
  - perl --version
16
20
  - ruby --version
17
21
  - gem --version
18
-
22
+ # Update keyring according to https://www.msys2.org/news/#2020-06-29-new-packagers
23
+ - C:\msys64\usr\bin\curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz
24
+ - C:\msys64\usr\bin\curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig
25
+ - ridk exec bash -c "pacman-key --verify msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig"
26
+ - ridk exec bash -c "pacman -U --noconfirm --config <(echo) msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz"
27
+ # Update zstd and pacman first https://github.com/msys2/MSYS2-packages/issues/2300
28
+ - C:\msys64\usr\bin\pacman --noconfirm --upgrade https://repo.msys2.org/msys/x86_64/zstd-1.4.7-1-x86_64.pkg.tar.xz # Must come First, or else pacman will install 1.4.8
29
+ - C:\msys64\usr\bin\pacman --noconfirm --upgrade https://repo.msys2.org/msys/x86_64/pacman-5.2.2-5-x86_64.pkg.tar.xz
30
+ # update packages
31
+ - C:\msys64\usr\bin\pacman --noconfirm --ask 20 --sync --refresh --refresh --sysupgrade --sysupgrade
32
+ # Kill all running msys2 binaries to avoid error "size of shared memory region changed".
33
+ # See https://github.com/msys2/MSYS2-packages/issues/258
34
+ - powershell -Command "Get-Process | Where-Object {$_.path -like 'C:\msys64*'} | Stop-Process"
35
+ # refresh the package list to avoid "error: failed to prepare transaction (could not find database)"
36
+ - ridk exec bash -c "pacman --noconfirm -Sy"
37
+ # prevent freetds to link to wrong ws2_32 lib on i686-w64-mingw32
38
+ - c:/msys64/usr/bin/rm /usr/lib/w32api/libws2_32.a
19
39
  # Set up project prerequisits
20
40
  - bundle install
21
41
  - bundle exec rake ports
@@ -43,9 +63,10 @@ environment:
43
63
  TINYTDS_UNIT_AZURE_PASS:
44
64
  secure: fYKSKV4v+36OFQp2nZdX4DfUpgmy5cm0wuR73cgdmEk=
45
65
  matrix:
46
- - ruby_version: "24-x64"
47
66
  - ruby_version: "24"
48
- - ruby_version: "22-x64"
49
- - ruby_version: "22"
67
+ - ruby_version: "25-x64"
68
+ - ruby_version: "26"
69
+ - ruby_version: "head-x64"
50
70
  on_failure:
71
+ - find -name config.log | xargs cat
51
72
  - find -name compile.log | xargs cat
@@ -0,0 +1,22 @@
1
+ version: '3'
2
+
3
+ networks:
4
+ main-network:
5
+
6
+ services:
7
+ mssql:
8
+ image: metaskills/mssql-server-linux-tinytds:2017-GA
9
+ container_name: sqlserver
10
+ ports:
11
+ - "1433:1433"
12
+ networks:
13
+ - main-network
14
+
15
+ toxiproxy:
16
+ image: shopify/toxiproxy
17
+ container_name: toxiproxy
18
+ ports:
19
+ - "8474:8474"
20
+ - "1234:1234"
21
+ networks:
22
+ - main-network
@@ -24,25 +24,25 @@ VALUE opt_escape_regex, opt_escape_dblquote;
24
24
 
25
25
  // Lib Backend (Helpers)
26
26
 
27
- VALUE rb_tinytds_raise_error(DBPROCESS *dbproc, int is_message, int cancel, const char *error, const char *source, int severity, int dberr, int oserr) {
27
+ VALUE rb_tinytds_raise_error(DBPROCESS *dbproc, tinytds_errordata error) {
28
28
  VALUE e;
29
29
  GET_CLIENT_USERDATA(dbproc);
30
- if (cancel && !dbdead(dbproc) && userdata && !userdata->closed) {
30
+ if (error.cancel && !dbdead(dbproc) && userdata && !userdata->closed) {
31
31
  userdata->dbsqlok_sent = 1;
32
32
  dbsqlok(dbproc);
33
33
  userdata->dbcancel_sent = 1;
34
34
  dbcancel(dbproc);
35
35
  }
36
- e = rb_exc_new2(cTinyTdsError, error);
37
- rb_funcall(e, intern_source_eql, 1, rb_str_new2(source));
38
- if (severity)
39
- rb_funcall(e, intern_severity_eql, 1, INT2FIX(severity));
40
- if (dberr)
41
- rb_funcall(e, intern_db_error_number_eql, 1, INT2FIX(dberr));
42
- if (oserr)
43
- rb_funcall(e, intern_os_error_number_eql, 1, INT2FIX(oserr));
44
-
45
- if (severity <= 10 && is_message) {
36
+ e = rb_exc_new2(cTinyTdsError, error.error);
37
+ rb_funcall(e, intern_source_eql, 1, rb_str_new2(error.source));
38
+ if (error.severity)
39
+ rb_funcall(e, intern_severity_eql, 1, INT2FIX(error.severity));
40
+ if (error.dberr)
41
+ rb_funcall(e, intern_db_error_number_eql, 1, INT2FIX(error.dberr));
42
+ if (error.oserr)
43
+ rb_funcall(e, intern_os_error_number_eql, 1, INT2FIX(error.oserr));
44
+
45
+ if (error.severity <= 10 && error.is_message) {
46
46
  VALUE message_handler = userdata && userdata->message_handler ? userdata->message_handler : Qnil;
47
47
  if (message_handler && message_handler != Qnil && rb_respond_to(message_handler, intern_call) != 0) {
48
48
  rb_funcall(message_handler, intern_call, 1, e);
@@ -57,6 +57,16 @@ VALUE rb_tinytds_raise_error(DBPROCESS *dbproc, int is_message, int cancel, cons
57
57
 
58
58
 
59
59
  // Lib Backend (Memory Management & Handlers)
60
+ static void push_userdata_error(tinytds_client_userdata *userdata, tinytds_errordata error) {
61
+ // reallocate memory for the array as needed
62
+ if (userdata->nonblocking_errors_size == userdata->nonblocking_errors_length) {
63
+ userdata->nonblocking_errors_size *= 2;
64
+ userdata->nonblocking_errors = realloc(userdata->nonblocking_errors, userdata->nonblocking_errors_size * sizeof(tinytds_errordata));
65
+ }
66
+
67
+ userdata->nonblocking_errors[userdata->nonblocking_errors_length] = error;
68
+ userdata->nonblocking_errors_length++;
69
+ }
60
70
 
61
71
  int tinytds_err_handler(DBPROCESS *dbproc, int severity, int dberr, int oserr, char *dberrstr, char *oserrstr) {
62
72
  static const char *source = "error";
@@ -86,7 +96,13 @@ int tinytds_err_handler(DBPROCESS *dbproc, int severity, int dberr, int oserr, c
86
96
  but we don't ever want to automatically retry. Instead have the app
87
97
  decide what to do.
88
98
  */
89
- return_value = INT_TIMEOUT;
99
+ if (userdata->timing_out) {
100
+ return INT_CANCEL;
101
+ }
102
+ else {
103
+ userdata->timing_out = 1;
104
+ return_value = INT_TIMEOUT;
105
+ }
90
106
  cancel = 1;
91
107
  break;
92
108
 
@@ -99,6 +115,16 @@ int tinytds_err_handler(DBPROCESS *dbproc, int severity, int dberr, int oserr, c
99
115
  break;
100
116
  }
101
117
 
118
+ tinytds_errordata error_data = {
119
+ .is_message = 0,
120
+ .cancel = cancel,
121
+ .severity = severity,
122
+ .dberr = dberr,
123
+ .oserr = oserr
124
+ };
125
+ strncpy(error_data.error, dberrstr, ERROR_MSG_SIZE);
126
+ strncpy(error_data.source, source, ERROR_MSG_SIZE);
127
+
102
128
  /*
103
129
  When in non-blocking mode we need to store the exception data to throw it
104
130
  once the blocking call returns, otherwise we will segfault ruby since part
@@ -110,27 +136,9 @@ int tinytds_err_handler(DBPROCESS *dbproc, int severity, int dberr, int oserr, c
110
136
  dbcancel(dbproc);
111
137
  userdata->dbcancel_sent = 1;
112
138
  }
113
-
114
- /*
115
- If we've already captured an error message, don't overwrite it. This is
116
- here because FreeTDS sends a generic "General SQL Server error" message
117
- that will overwrite the real message. This is not normally a problem
118
- because a ruby exception is normally thrown and we bail before the
119
- generic message can be sent.
120
- */
121
- if (!userdata->nonblocking_error.is_set) {
122
- userdata->nonblocking_error.is_message = 0;
123
- userdata->nonblocking_error.cancel = cancel;
124
- strncpy(userdata->nonblocking_error.error, dberrstr, ERROR_MSG_SIZE);
125
- strncpy(userdata->nonblocking_error.source, source, ERROR_MSG_SIZE);
126
- userdata->nonblocking_error.severity = severity;
127
- userdata->nonblocking_error.dberr = dberr;
128
- userdata->nonblocking_error.oserr = oserr;
129
- userdata->nonblocking_error.is_set = 1;
130
- }
131
-
139
+ push_userdata_error(userdata, error_data);
132
140
  } else {
133
- rb_tinytds_raise_error(dbproc, 0, cancel, dberrstr, source, severity, dberr, oserr);
141
+ rb_tinytds_raise_error(dbproc, error_data);
134
142
  }
135
143
 
136
144
  return return_value;
@@ -142,36 +150,72 @@ int tinytds_msg_handler(DBPROCESS *dbproc, DBINT msgno, int msgstate, int severi
142
150
 
143
151
  int is_message_an_error = severity > 10 ? 1 : 0;
144
152
 
153
+ tinytds_errordata error_data = {
154
+ .is_message = !is_message_an_error,
155
+ .cancel = is_message_an_error,
156
+ .severity = severity,
157
+ .dberr = msgno,
158
+ .oserr = msgstate
159
+ };
160
+ strncpy(error_data.error, msgtext, ERROR_MSG_SIZE);
161
+ strncpy(error_data.source, source, ERROR_MSG_SIZE);
162
+
145
163
  // See tinytds_err_handler() for info about why we do this
146
164
  if (userdata && userdata->nonblocking) {
147
- if (!userdata->nonblocking_error.is_set) {
148
- userdata->nonblocking_error.is_message = !is_message_an_error;
149
- userdata->nonblocking_error.cancel = is_message_an_error;
150
- strncpy(userdata->nonblocking_error.error, msgtext, ERROR_MSG_SIZE);
151
- strncpy(userdata->nonblocking_error.source, source, ERROR_MSG_SIZE);
152
- userdata->nonblocking_error.severity = severity;
153
- userdata->nonblocking_error.dberr = msgno;
154
- userdata->nonblocking_error.oserr = msgstate;
155
- userdata->nonblocking_error.is_set = 1;
156
- }
165
+ /*
166
+ In the case of non-blocking command batch execution we can receive multiple messages
167
+ (including errors). We keep track of those here so they can be processed once the
168
+ non-blocking call returns.
169
+ */
170
+ push_userdata_error(userdata, error_data);
157
171
 
158
172
  if (is_message_an_error && !dbdead(dbproc) && !userdata->closed) {
159
173
  dbcancel(dbproc);
160
174
  userdata->dbcancel_sent = 1;
161
175
  }
162
176
  } else {
163
- rb_tinytds_raise_error(dbproc, !is_message_an_error, is_message_an_error, msgtext, source, severity, msgno, msgstate);
177
+ rb_tinytds_raise_error(dbproc, error_data);
164
178
  }
165
179
  return 0;
166
180
  }
167
181
 
182
+ /*
183
+ Used by dbsetinterrupt -
184
+ This gets called periodically while waiting on a read from the server
185
+ Right now, we only care about cases where a read from the server is
186
+ taking longer than the specified timeout and dbcancel is not working.
187
+ In these cases we decide that we actually want to handle the interrupt
188
+ */
189
+ static int check_interrupt(void *ptr) {
190
+ GET_CLIENT_USERDATA((DBPROCESS *)ptr);
191
+ return userdata->timing_out;
192
+ }
193
+
194
+ /*
195
+ Used by dbsetinterrupt -
196
+ This gets called if check_interrupt returns TRUE.
197
+ Right now, this is only used in cases where a read from the server is
198
+ taking longer than the specified timeout and dbcancel is not working.
199
+ Return INT_CANCEL to abort the current command batch.
200
+ */
201
+ static int handle_interrupt(void *ptr) {
202
+ GET_CLIENT_USERDATA((DBPROCESS *)ptr);
203
+ if (userdata->timing_out) {
204
+ return INT_CANCEL;
205
+ }
206
+ return INT_CONTINUE;
207
+ }
208
+
168
209
  static void rb_tinytds_client_reset_userdata(tinytds_client_userdata *userdata) {
169
210
  userdata->timing_out = 0;
170
211
  userdata->dbsql_sent = 0;
171
212
  userdata->dbsqlok_sent = 0;
172
213
  userdata->dbcancel_sent = 0;
173
214
  userdata->nonblocking = 0;
174
- userdata->nonblocking_error.is_set = 0;
215
+ // the following is mainly done for consistency since the values are reset accordingly in nogvl_setup/cleanup.
216
+ // the nonblocking_errors array does not need to be freed here. That is done as part of nogvl_cleanup.
217
+ userdata->nonblocking_errors_length = 0;
218
+ userdata->nonblocking_errors_size = 0;
175
219
  }
176
220
 
177
221
  static void rb_tinytds_client_mark(void *ptr) {
@@ -381,6 +425,7 @@ static VALUE rb_tinytds_connect(VALUE self, VALUE opts) {
381
425
  }
382
426
  }
383
427
  dbsetuserdata(cwrap->client, (BYTE*)cwrap->userdata);
428
+ dbsetinterrupt(cwrap->client, check_interrupt, handle_interrupt);
384
429
  cwrap->userdata->closed = 0;
385
430
  if (!NIL_P(database) && (azure != Qtrue)) {
386
431
  dbuse(cwrap->client, StringValueCStr(database));