tiny_tds 2.1.0.pre4 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ae946f0a8582c1105d1a9927d9866e228cce17fe
-  data.tar.gz: 8763fb92c497e4cd0781be3292ad6ea1567cfead
+SHA256:
+  metadata.gz: '009faf9814321046171c7dfe6a0cbf86b137f4295ae079c1b8ae47067a940d10'
+  data.tar.gz: 6a20fcde7f6863f3e876f3484c4c93ded56511d93ac76de355c43f365758539d
 SHA512:
-  metadata.gz: 3038107c41dc1aefc11dfaef02b1a9608b97bcb3b0f3ce4a243d209335bab85e00c5ffb0f982c5da145286000c9d9f0c7c931166c732d2f84192250917ed4bc1
-  data.tar.gz: 1cca1065fd05681606e5a5eb24aaa3ed02d2e3a17bcf9352255b068a9d354e36e0a6a31683c4fc1cd0bc678bc9dfa509d4694a9a33fb987882b070d9c92e091a
+  metadata.gz: 6572f896cf1a4812b652417d1b353487d49998df7dac8518de7310123cce5c295d775e102a184355b8501a3fa3b1f9f66f892026a33fc97bfde56e3cb9912a36
+  data.tar.gz: d05b4c50dbbe86f920a34cc6a6fc9bd20b9b27564d75b2e05f214b1600504898e22f5935ba1183f82646095a95d8bbbcba3f1fcc2548920e35d87b11c7bf0cd4

data/.travis.yml

@@ -8,9 +8,10 @@ env:
     - TESTOPTS="-v"
     - TINYTDS_UNIT_HOST=localhost
 rvm:
-  - 2.1.9
-  - 2.2.5
-  - 2.3.1
+  - 2.4.5
+  - 2.5.3
+  - 2.6.1
+  - 2.7.0
 before_install:
   - docker info
   - sudo ./test/bin/install-openssl.sh

data/CHANGELOG.md

@@ -1,3 +1,22 @@
+## (unreleased)
+
+## 2.1.3
+
+* Removed old/unused appveyor config
+* Remove old Rubies from CI & cross compile list
+* Add Ruby 2.6 and 2.7 to the cross compile list
+
+## 2.1.2
+
+* Use Kernel.BigDecimal vs BigDecimal.new. Fixes #409.
+* Change `DBSETUTF16` abscence warning message. Fixes #410.
+* Add Windows binary for Ruby-2.5. Fixes #408.
+
+## 2.1.1
+
+* Move message_handler from a shared value to userdata.
+
+
 ## 2.1.0
 
 * Support RubyInstaller2 for Windows. Fixes #365.

data/ISSUE_TEMPLATE.md

@@ -1,12 +1,38 @@
-Having problems? Have you checked these first:
+## Before submitting an issue please check these first!
 
-* Have you made sure to [enable SQL Server authentication](http://bit.ly/1Kw3set)?
+* On Windows? If so, do you need devkit for your ruby install?
+* Using Ubuntu? If so, you may have forgotten to install FreeTDS first.
 * Are you using FreeTDS 0.95.80 or later? Check `$ tsql -C` to find out.
 * If not, please update then uninstall the TinyTDS gem and re-install it.
-* Using Ubuntu? If so, you may have forgotten to install FreeTDS first.
+* Have you made sure to [enable SQL Server authentication](http://bit.ly/1Kw3set)?
 * Doing work with threads and the raw client? Use the ConnectionPool gem?
 
-If none of these help. Please make sure to report:
+If none of these help. Please fill out the following:
+
+## Environment
+
+**Operating System**
+
+Please describe your operating system and version here.
+If unsure please try the following from the command line:
+
+* For Windows: `systeminfo | findstr /C:OS`
+* For Linux: `lsb_release -a; uname -a`
+* For Mac OSX: `sw_vers`
+
+**TinyTDS Version and Information**
+
+```
+Please paste the full output of `ttds-tsql -C` (or `tsql -C` for older versions
+of TinyTDS) here. If TinyTDS does not install, please provide the gem version.
+```
+
+
+**FreeTDS Version**
+
+Please provide your system's FreeTDS version. If you are using the pre-compiled
+windows gem you may omit this section.
+
+## Description
 
-* What platform you are on. Windows, Mac, Ubuntu, etc.
-* What version of FreeTDS you are using.
+Please describe the bug or feature request here.

data/README.md

@@ -1,17 +1,11 @@
 # TinyTDS - Simple and fast FreeTDS bindings for Ruby using DB-Library.
 
 * [![TravisCI](https://travis-ci.org/rails-sqlserver/tiny_tds.svg?branch=master)](https://travis-ci.org/rails-sqlserver/tiny_tds) - TravisCI
-* [![CircleCI](https://circleci.com/gh/rails-sqlserver/tiny_tds/tree/master.svg?style=svg)](https://circleci.com/gh/rails-sqlserver/tiny_tds/tree/master) - CircleCI
 * [![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
-* [![Code Climate](https://codeclimate.com/github/rails-sqlserver/tiny_tds/badges/gpa.svg)](https://codeclimate.com/github/rails-sqlserver/tiny_tds) - Code Climate
 * [![Gem Version](https://img.shields.io/gem/v/tiny_tds.svg)](https://rubygems.org/gems/tiny_tds) - Gem Version
 * [![Dependency Status](https://dependencyci.com/github/rails-sqlserver/tiny_tds/badge)](https://dependencyci.com/github/rails-sqlserver/tiny_tds) - Dependency Status
 * [![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
 
-## Supporting TinyTDS/Adapter
-
-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).
-
 
 ## About TinyTDS
 
@@ -40,19 +34,19 @@ If you're using RubyInstaller the binary gem will require that devkit is install
 On all other platforms, we will find these dependencies. It is recommended that you install the latest FreeTDS via your method of choice. For example, here is how to install FreeTDS on Ubuntu. You might also need the `build-essential` and possibly the `libc6-dev` packages.
 
 ```shell
-$ apt-get wget
+$ apt-get install wget
 $ apt-get install build-essential
 $ apt-get install libc6-dev
 
-$ wget http://www.freetds.org/files/stable/freetds-1.00.21.tar.gz
-$ tar -xzf freetds-1.00.21.tar.gz
-$ cd freetds-1.00.21
+$ wget http://www.freetds.org/files/stable/freetds-1.1.24.tar.gz
+$ tar -xzf freetds-1.1.24.tar.gz
+$ cd freetds-1.1.24
 $ ./configure --prefix=/usr/local --with-tdsver=7.3
 $ make
 $ make install
 ```
 
-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:
+Please read the MiniPortile and/or Windows sections at the end of this file for advanced configuration options past the following:
 
 ```
 --with-freetds-dir=DIR
@@ -75,11 +69,11 @@ TinyTDS is developed against FreeTDS 0.95, 0.99, and 1.0 current. Our default an
 
 **NOTE:** Windows users of our pre-compiled native gems need not worry about installing FreeTDS and its dependencies.
 
-* **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.
+* **Do I need to install FreeTDS?** Yes! Somehow, someway, you are going to need FreeTDS for TinyTDS to compile against.
 
 * **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.
 
-* **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.
+* **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.
 
 * **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
 
@@ -122,6 +116,17 @@ Creating a new client takes a hash of options. For valid iconv encoding options,
 * :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.
 * :use_utf16 - Instead of using UCS-2 for database wide character encoding use UTF-16. Newer Windows versions use this encoding instead of UCS-2. Default true.
+* :message_handler - Pass in a `call`-able object such as a `Proc` or a method to receive info messages from the database. It should have a single parameter, which will be a `TinyTds::Error` object representing the message. For example:
+
+```ruby
+opts = ... # host, username, password, etc
+opts[:message_handler] = Proc.new { |m| puts m.message }
+client = TinyTds::Client.new opts
+# => Changed database context to 'master'.
+# => Changed language setting to us_english.
+client.execute("print 'hello world!'").do
+# => hello world!
+```
 
 Use the `#active?` method to determine if a connection is good. The implementation of this method may change but it should always guarantee that a connection is good. Current it checks for either a closed or dead connection.
 
@@ -396,7 +401,7 @@ The default is true and since FreeTDS v1.0 would do this as well.
 
 ## Compiling Gems for Windows
 
-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.
+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.
 
 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:
 
@@ -457,6 +462,17 @@ $ rake TINYTDS_UNIT_HOST=mydb.host.net TINYTDS_SCHEMA=sqlserver_azure
 $ rake TINYTDS_UNIT_HOST=mydb.host.net TINYTDS_UNIT_PORT=5000 TINYTDS_SCHEMA=sybase_ase
 ```
 
+## Docker Builds
+
+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
+into another, lighter, container without build tools you will need to make sure you tell the OS how to find dependencies for TinyTDS.
+
+After you have built and installed FreeTDS it will normally place library files in `/usr/local/lib`. When TinyTDS builds native extensions,
+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.
+
+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
+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`.
+
 ## Help & Support
 
 * Github Source: http://github.com/rails-sqlserver/tiny_tds

data/VERSION

@@ -1 +1 @@
-2.1.0.pre4
+2.1.3

data/appveyor.yml

@@ -1,21 +1,27 @@
 init:
   - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
-  - SET PATH=C:\MinGW\msys\1.0\bin;%PATH%
   - SET RAKEOPT=-rdevkit
   - SET TESTOPTS='-v'
-  - SET MAKE=make V=1
+  - SET MAKE=make V=1 -j2
 clone_depth: 5
 skip_tags: true
 skip_branch_with_pr: true
 matrix:
-  fast_finish: true
+  fast_finish: false
 install:
   # Output debugging info
   - ps: Update-AppveyorBuild -Version "$(Get-Content $env:appveyor_build_folder\VERSION).$env:appveyor_build_number"
+  - ps: |
+      if ($env:ruby_version -like "*head*") {
+        $(new-object net.webclient).DownloadFile("https://github.com/oneclick/rubyinstaller2/releases/download/rubyinstaller-head/rubyinstaller-$env:ruby_version.exe", "$pwd/ruby-setup.exe")
+        cmd /c ruby-setup.exe /verysilent /dir=C:/Ruby$env:ruby_version
+      }
   - perl --version
   - ruby --version
   - gem --version
 
+  # prevent freetds to link to wrong ws2_32 lib on i686-w64-mingw32
+  - c:/msys64/usr/bin/rm /usr/lib/w32api/libws2_32.a
   # Set up project prerequisits
   - bundle install
   - bundle exec rake ports
@@ -43,9 +49,10 @@ environment:
   TINYTDS_UNIT_AZURE_PASS:
     secure: fYKSKV4v+36OFQp2nZdX4DfUpgmy5cm0wuR73cgdmEk=
   matrix:
-    - ruby_version: "24-x64"
     - ruby_version: "24"
-    - ruby_version: "22-x64"
-    - ruby_version: "22"
+    - ruby_version: "25-x64"
+    - ruby_version: "26"
+    - ruby_version: "head-x64"
 on_failure:
+  - find -name config.log | xargs cat
   - find -name compile.log | xargs cat

data/ext/tiny_tds/client.c

@@ -7,7 +7,6 @@ static ID sym_username, sym_password, sym_dataserver, sym_database, sym_appname,
 static ID intern_source_eql, intern_severity_eql, intern_db_error_number_eql, intern_os_error_number_eql;
 static ID intern_new, intern_dup, intern_transpose_iconv_encoding, intern_local_offset, intern_gsub, intern_call;
 VALUE opt_escape_regex, opt_escape_dblquote;
-VALUE message_handler;
 
 
 // Lib Macros
@@ -44,6 +43,7 @@ VALUE rb_tinytds_raise_error(DBPROCESS *dbproc, int is_message, int cancel, cons
     rb_funcall(e, intern_os_error_number_eql, 1, INT2FIX(oserr));
 
   if (severity <= 10 && is_message) {
+    VALUE message_handler = userdata && userdata->message_handler ? userdata->message_handler : Qnil;
     if (message_handler && message_handler != Qnil && rb_respond_to(message_handler, intern_call) != 0) {
       rb_funcall(message_handler, intern_call, 1, e);
     }
@@ -322,7 +322,7 @@ static VALUE rb_tinytds_connect(VALUE self, VALUE opts) {
   azure = rb_hash_aref(opts, sym_azure);
   contained = rb_hash_aref(opts, sym_contained);
   use_utf16 = rb_hash_aref(opts, sym_use_utf16);
-  message_handler = rb_hash_aref(opts, sym_message_handler);
+  cwrap->userdata->message_handler = rb_hash_aref(opts, sym_message_handler);
   /* Dealing with options. */
   if (dbinit() == FAIL) {
     rb_raise(cTinyTdsError, "failed dbinit() function");
@@ -362,7 +362,7 @@ static VALUE rb_tinytds_connect(VALUE self, VALUE opts) {
     if (use_utf16 == Qfalse) { DBSETLUTF16(cwrap->login, 0); }
   #else
     if (use_utf16 == Qtrue || use_utf16 == Qfalse) {
-      rb_warn("TinyTds: :use_utf16 option not supported in this version of FreeTDS.\n");
+      rb_warning("TinyTds: Please consider upgrading to FreeTDS 0.99 or higher for better unicode support.\n");
     }
   #endif
 

data/ext/tiny_tds/client.h

@@ -26,6 +26,7 @@ typedef struct {
   short int dbcancel_sent;
   short int nonblocking;
   tinytds_errordata nonblocking_error;
+  VALUE message_handler;
 } tinytds_client_userdata;
 
 typedef struct {

data/ext/tiny_tds/extconf.rb

@@ -22,35 +22,39 @@ do_help if arg_config('--help')
 
 # Make sure to check the ports path for the configured host
 host = RbConfig::CONFIG['host']
-project_dir = File.join(['..']*4)
+project_dir = File.expand_path("../../..", __FILE__)
 freetds_ports_dir = File.join(project_dir, 'ports', host, 'freetds', FREETDS_VERSION)
 freetds_ports_dir = File.expand_path(freetds_ports_dir)
 
 # Add all the special path searching from the original tiny_tds build
-# order is important here! First in, last searched.
+# order is important here! First in, first searched.
 DIRS = %w(
-  /usr/local
   /opt/local
+  /usr/local
 )
 
+# Add the ports directory if it exists for local developer builds
+DIRS.unshift(freetds_ports_dir) if File.directory?(freetds_ports_dir)
+
 # Grab freetds environment variable for use by people on services like
 # Heroku who they can't easily use bundler config to set directories
-DIRS.push(ENV['FREETDS_DIR']) if ENV.has_key?('FREETDS_DIR')
-
-# Add the ports directory if it exists for local developer builds
-DIRS.push(freetds_ports_dir) if File.directory?(freetds_ports_dir)
+DIRS.unshift(ENV['FREETDS_DIR']) if ENV.has_key?('FREETDS_DIR')
 
 # Add the search paths for freetds configured above
-DIRS.each do |path|
-  idir = "#{path}/include"
+ldirs = DIRS.flat_map do |path|
   ldir = "#{path}/lib"
+  [ldir, "#{ldir}/freetds"]
+end
 
-  dir_config('freetds',
-    [idir, "#{idir}/freetds"],
-    [ldir, "#{ldir}/freetds"]
-  )
+idirs = DIRS.flat_map do |path|
+  idir = "#{path}/include"
+  [idir, "#{idir}/freetds"]
 end
 
+puts "looking for freetds headers in the following directories:\n#{idirs.map{|a| " - #{a}\n"}.join}"
+puts "looking for freetds library in the following directories:\n#{ldirs.map{|a| " - #{a}\n"}.join}"
+dir_config('freetds', idirs, ldirs)
+
 have_dependencies = [
   find_header('sybfront.h'),
   find_header('sybdb.h'),

data/ext/tiny_tds/extconsts.rb

@@ -2,10 +2,10 @@
 ICONV_VERSION = ENV['TINYTDS_ICONV_VERSION'] || "1.15"
 ICONV_SOURCE_URI = "http://ftp.gnu.org/pub/gnu/libiconv/libiconv-#{ICONV_VERSION}.tar.gz"
 
-OPENSSL_VERSION = ENV['TINYTDS_OPENSSL_VERSION'] || '1.1.0e'
+OPENSSL_VERSION = ENV['TINYTDS_OPENSSL_VERSION'] || '1.1.1d'
 OPENSSL_SOURCE_URI = "https://www.openssl.org/source/openssl-#{OPENSSL_VERSION}.tar.gz"
 
-FREETDS_VERSION = ENV['TINYTDS_FREETDS_VERSION'] || "1.00.27"
+FREETDS_VERSION = ENV['TINYTDS_FREETDS_VERSION'] || "1.1.24"
 FREETDS_VERSION_INFO = Hash.new { |h,k|
   h[k] = {files: "http://www.freetds.org/files/stable/freetds-#{k}.tar.bz2"}
 }

data/ext/tiny_tds/result.c

@@ -6,10 +6,10 @@
 
 VALUE cTinyTdsResult;
 extern VALUE mTinyTds, cTinyTdsClient, cTinyTdsError;
-VALUE cBigDecimal, cDate;
+VALUE cKernel, cDate;
 VALUE opt_decimal_zero, opt_float_zero, opt_one, opt_zero, opt_four, opt_19hdr, opt_onek, opt_tenk, opt_onemil, opt_onebil;
 static ID intern_new, intern_utc, intern_local, intern_localtime, intern_merge,
-          intern_civil, intern_new_offset, intern_plus, intern_divide;
+          intern_civil, intern_new_offset, intern_plus, intern_divide, intern_bigd;
 static ID sym_symbolize_keys, sym_as, sym_array, sym_cache_rows, sym_first, sym_timezone, sym_local, sym_utc, sym_empty_sets;
 
 
@@ -228,7 +228,7 @@ static VALUE rb_tinytds_result_fetch_row(VALUE self, ID timezone, int symbolize_
           int data_slength = (int)data_info->precision + (int)data_info->scale + 1;
           char converted_decimal[data_slength];
           dbconvert(rwrap->client, coltype, data, data_len, SYBVARCHAR, (BYTE *)converted_decimal, -1);
-          val = rb_funcall(cBigDecimal, intern_new, 1, rb_str_new2((char *)converted_decimal));
+          val = rb_funcall(cKernel, intern_bigd, 1, rb_str_new2((char *)converted_decimal));
           break;
         }
         case SYBFLT8: {
@@ -246,7 +246,7 @@ static VALUE rb_tinytds_result_fetch_row(VALUE self, ID timezone, int symbolize_
           char converted_money[25];
           long long money_value = ((long long)money->mnyhigh << 32) | money->mnylow;
           sprintf(converted_money, "%" LONG_LONG_FORMAT, money_value);
-          val = rb_funcall(cBigDecimal, intern_new, 2, rb_str_new2(converted_money), opt_four);
+          val = rb_funcall(cKernel, intern_bigd, 2, rb_str_new2(converted_money), opt_four);
           val = rb_funcall(val, intern_divide, 1, opt_tenk);
           break;
         }
@@ -254,7 +254,7 @@ static VALUE rb_tinytds_result_fetch_row(VALUE self, ID timezone, int symbolize_
           DBMONEY4 *money = (DBMONEY4 *)data;
           char converted_money[20];
           sprintf(converted_money, "%f", money->mny4 / 10000.0);
-          val = rb_funcall(cBigDecimal, intern_new, 1, rb_str_new2(converted_money));
+          val = rb_funcall(cKernel, intern_bigd, 1, rb_str_new2(converted_money));
           break;
         }
         case SYBBINARY:
@@ -566,7 +566,7 @@ static VALUE rb_tinytds_result_insert(VALUE self) {
 
 void init_tinytds_result() {
   /* Data Classes */
-  cBigDecimal = rb_const_get(rb_cObject, rb_intern("BigDecimal"));
+  cKernel = rb_const_get(rb_cObject, rb_intern("Kernel"));
   cDate = rb_const_get(rb_cObject, rb_intern("Date"));
   /* Define TinyTds::Result */
   cTinyTdsResult = rb_define_class_under(mTinyTds, "Result", rb_cObject);
@@ -588,6 +588,7 @@ void init_tinytds_result() {
   intern_new_offset = rb_intern("new_offset");
   intern_plus = rb_intern("+");
   intern_divide = rb_intern("/");
+  intern_bigd = rb_intern("BigDecimal");
   /* Symbol Helpers */
   sym_symbolize_keys = ID2SYM(rb_intern("symbolize_keys"));
   sym_as = ID2SYM(rb_intern("as"));

data/tasks/native_gem.rake

@@ -8,7 +8,7 @@ task 'gem:windows' => ['ports:cross'] do
   build = ['bundle']
 
   # and finally build the native gem
-  build << 'rake cross native gem RUBY_CC_VERSION=2.4.0:2.3.0:2.2.2:2.1.6:2.0.0 CFLAGS="-Wall"'
+  build << 'rake cross native gem RUBY_CC_VERSION=2.7.0:2.6.0:2.5.0:2.4.0 CFLAGS="-Wall" MAKE="make -j`nproc`"'
 
   RakeCompilerDock.sh build.join(' && ')
 end

data/tasks/ports.rake

@@ -6,14 +6,14 @@ require_relative 'ports/openssl'
 require_relative 'ports/freetds'
 require_relative '../ext/tiny_tds/extconsts'
 
-OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE if defined? OpenSSL
-
 namespace :ports do
   openssl = Ports::Openssl.new(OPENSSL_VERSION)
   libiconv = Ports::Libiconv.new(ICONV_VERSION)
   freetds = Ports::Freetds.new(FREETDS_VERSION)
 
   directory "ports"
+  CLEAN.include "ports/*mingw32*"
+  CLEAN.include "ports/*.installed"
 
   task :openssl, [:host] do |task, args|
     args.with_defaults(host: RbConfig::CONFIG['host'])
@@ -71,15 +71,13 @@ namespace :ports do
   task 'cross' do
     require 'rake_compiler_dock'
 
-    # make sure to install our bundle
-    build = ['bundle']
-
     # build the ports for all our cross compile hosts
     GEM_PLATFORM_HOSTS.each do |gem_platform, host|
-      build << "rake ports:compile[#{host}]"
+      # make sure to install our bundle
+      build = ['bundle']
+      build << "rake ports:compile[#{host}] MAKE='make -j`nproc`'"
+      RakeCompilerDock.sh build.join(' && '), platform: gem_platform
     end
-
-    RakeCompilerDock.sh build.join(' && ')
   end
 end
 

data/tasks/ports/openssl.rb

@@ -27,27 +27,11 @@ module Ports
 
     private
 
-    def execute(action, command, options={})
-      # OpenSSL Requires Perl >= 5.10, while the Ruby devkit uses MSYS1 with Perl 5.8.8.
-      # To overcome this, prepend Git's usr/bin to the PATH.
-      # It has MSYS2 with a recent version of perl.
-      prev_path = ENV['PATH']
-      if host =~ /mingw/ && IO.popen(["perl", "-e", "print($])"], &:read).to_f < 5.010
-        git_perl = 'C:/Program Files/Git/usr/bin'
-        if File.directory?(git_perl)
-          ENV['PATH'] = "#{git_perl}#{File::PATH_SEPARATOR}#{ENV['PATH']}"
-          ENV['PERL'] = 'perl'
-        end
-      end
-
-      super
-      ENV['PATH'] = prev_path
-    end
-
     def configure_defaults
       opts = [
         'shared',
-        target_arch
+        target_arch,
+        "--openssldir=#{path}",
       ]
 
       if cross_build?

data/test/bin/setup.sh

@@ -3,7 +3,7 @@
 set -x
 set -e
 
-tag=2.0
+tag=2017-GA
 
 docker pull metaskills/mssql-server-linux-tinytds:$tag
 

data/test/schema_test.rb

@@ -76,10 +76,10 @@ class SchemaTest < TinyTds::TestCase
 
       it 'casts decimal' do
         assert_instance_of BigDecimal, find_value(91, :decimal_9_2)
-        assert_equal BigDecimal.new('12345.01'), find_value(91, :decimal_9_2)
-        assert_equal BigDecimal.new('1234567.89'), find_value(92, :decimal_9_2)
-        assert_equal BigDecimal.new('0.0'), find_value(93, :decimal_16_4)
-        assert_equal BigDecimal.new('123456789012.3456'), find_value(94, :decimal_16_4)
+        assert_equal BigDecimal('12345.01'), find_value(91, :decimal_9_2)
+        assert_equal BigDecimal('1234567.89'), find_value(92, :decimal_9_2)
+        assert_equal BigDecimal('0.0'), find_value(93, :decimal_16_4)
+        assert_equal BigDecimal('123456789012.3456'), find_value(94, :decimal_16_4)
       end
 
       it 'casts float' do
@@ -102,9 +102,9 @@ class SchemaTest < TinyTds::TestCase
 
       it 'casts money' do
         assert_instance_of BigDecimal, find_value(161, :money)
-        assert_equal BigDecimal.new('4.20'), find_value(161, :money)
-        assert_equal BigDecimal.new('922337203685477.5806'), find_value(163 ,:money)
-        assert_equal BigDecimal.new('-922337203685477.5807'), find_value(162 ,:money)
+        assert_equal BigDecimal('4.20'), find_value(161, :money)
+        assert_equal BigDecimal('922337203685477.5806'), find_value(163 ,:money)
+        assert_equal BigDecimal('-922337203685477.5807'), find_value(162 ,:money)
       end
 
       it 'casts nchar' do
@@ -176,9 +176,9 @@ class SchemaTest < TinyTds::TestCase
 
       it 'casts smallmoney' do
         assert_instance_of BigDecimal, find_value(251, :smallmoney)
-        assert_equal BigDecimal.new("4.20"), find_value(251, :smallmoney)
-        assert_equal BigDecimal.new("-214748.3647"), find_value(252, :smallmoney)
-        assert_equal BigDecimal.new("214748.3646"), find_value(253, :smallmoney)
+        assert_equal BigDecimal("4.20"), find_value(251, :smallmoney)
+        assert_equal BigDecimal("-214748.3647"), find_value(252, :smallmoney)
+        assert_equal BigDecimal("214748.3646"), find_value(253, :smallmoney)
       end
 
       it 'casts text' do

data/test/test_helper.rb

@@ -89,7 +89,7 @@ module TinyTds
     end
 
     def connection_timeout
-      sqlserver_azure? ? 20 : 5
+      sqlserver_azure? ? 20 : 8
     end
 
     def assert_client_works(client)

data/tiny_tds.gemspec

@@ -21,9 +21,9 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 2.0.0'
   s.metadata['msys2_mingw_dependencies'] = 'freetds'
   s.add_development_dependency 'mini_portile2', '~> 2.0'
-  s.add_development_dependency 'rake', '~> 10.4'
+  s.add_development_dependency 'rake', '~> 13.0'
   s.add_development_dependency 'rake-compiler', '~> 1.0'
-  s.add_development_dependency 'rake-compiler-dock', '~> 0.6.0'
+  s.add_development_dependency 'rake-compiler-dock', '~> 1.0'
   s.add_development_dependency 'minitest', '~> 5.6'
   s.add_development_dependency 'connection_pool', '~> 2.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tiny_tds
 version: !ruby/object:Gem::Version
-  version: 2.1.0.pre4
+  version: 2.1.3
 platform: ruby
 authors:
 - Ken Collins
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-22 00:00:00.000000000 Z
+date: 2020-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_portile2
@@ -32,14 +32,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
@@ -60,14 +60,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -113,7 +113,6 @@ files:
 - ".gitignore"
 - ".rubocop.yml"
 - ".travis.yml"
-- BACKERS.md
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -125,7 +124,6 @@ files:
 - appveyor.yml
 - bin/defncopy-ttds
 - bin/tsql-ttds
-- circle.yml
 - exe/.keep
 - ext/tiny_tds/client.c
 - ext/tiny_tds/client.h
@@ -193,35 +191,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: TinyTDS - A modern, simple and fast FreeTDS library for Ruby using DB-Library.
-test_files:
-- test/appveyor/dbsetup.ps1
-- test/appveyor/dbsetup.sql
-- test/benchmark/query.rb
-- test/benchmark/query_odbc.rb
-- test/benchmark/query_tinytds.rb
-- test/bin/install-freetds.sh
-- test/bin/install-openssl.sh
-- test/bin/setup.sh
-- test/client_test.rb
-- test/gem_test.rb
-- test/result_test.rb
-- test/schema/1px.gif
-- test/schema/sqlserver_2000.sql
-- test/schema/sqlserver_2005.sql
-- test/schema/sqlserver_2008.sql
-- test/schema/sqlserver_2014.sql
-- test/schema/sqlserver_2016.sql
-- test/schema/sqlserver_azure.sql
-- test/schema/sybase_ase.sql
-- test/schema_test.rb
-- test/test_helper.rb
-- test/thread_test.rb
+test_files: []

data/BACKERS.md

@@ -1,32 +0,0 @@
-# Backers
-
-You can join in supporting TinyTDS and the Rails SQL Server Adapter development by [pledging on Patreon](https://www.patreon.com/metaskills)! Backers in the same pledge level appear in the order of pledge date.
-
-### $2000
-
-[It could be you!](https://www.patreon.com/bePatron?c=765225&rid=1611218)
-
-
-### $500
-
-[It could be you!](https://www.patreon.com/bePatron?c=765225&rid=1611209)
-
-
-### $250
-
-[It could be you!](https://www.patreon.com/bePatron?c=765225&rid=1611199)
-
-
-### $100
-
-[It could be you!](https://www.patreon.com/bePatron?c=765225&rid=1611196)
-
-
-### $50+
-
-[It could be you!](https://www.patreon.com/bePatron?c=765225&rid=1611186)
-
-
-### $10+
-
-[It could be you!](https://www.patreon.com/bePatron?c=765225&rid=1611149)

data/circle.yml

@@ -1,31 +0,0 @@
-general:
-  branches:
-    ignore:
-      - /dev.*/
-
-machine:
-  environment:
-    PATH: /opt/local/bin:${PATH}
-    TESTOPTS: -v
-    TINYTDS_UNIT_HOST: localhost
-  services:
-    - docker
-
-dependencies:
-  override:
-    - sudo ./test/bin/install-openssl.sh
-    - sudo ./test/bin/install-freetds.sh
-    - rvm-exec 2.1.9 bundle install
-    - rvm-exec 2.2.5 bundle install
-    - rvm-exec 2.3.1 bundle install
-
-database:
-  post:
-    - docker info
-    - ./test/bin/setup.sh
-
-test:
-  override:
-    - rvm-exec 2.1.9 bundle exec rake
-    - rvm-exec 2.2.5 bundle exec rake
-    - rvm-exec 2.3.1 bundle exec rake