tiny_tds 1.0.5-x86-mingw32 → 1.1.0-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0e6112a00a1eddb22fdaf22758750bc19ceb340
-  data.tar.gz: d1fa7d7465dd329c8db1489c31a55ee9109890d1
+  metadata.gz: 0bf04ef6340a6dc30aad6384c704c5e95101b682
+  data.tar.gz: ef17e8402b249c47889a506e13a91354ca284247
 SHA512:
-  metadata.gz: ddfe4a1245fbe78dae33b1fee6625ef3772766726c76d04c6dcf9ae0e2ed720d211182335b7fa7d450c1b95bb1bff2afc0e5a30c659ba334ebd57b4c9705306c
-  data.tar.gz: 504836daa5c88f0ba75ada79cc1b43c29ba2ac8db786f36eee2e472c082e824121207e4ac2e0fb2b6d8a441f4631ba6d918533bd658cd2832918a0ccd1e4952d
+  metadata.gz: 4aefc01958e02f0397549385b999f342e59950ab0461175fa571177e733ba56911487c2166affe5c56f29a9c5def4d1da3309c6b413d1eb58a25c5923878735e
+  data.tar.gz: 51339d4ac6f35626eaa62783054a3965a36dfeb82cbe8ee9503a31c2309daf8273b51c01c717203d09102c7274a95b418a27b9dfd55bca0d05239c7ba504d50b

data/.travis.yml

@@ -0,0 +1,27 @@
+sudo: required
+cache: bundler
+services:
+  - docker
+env:
+  global:
+    - TESTOPTS="-v"
+    - TINYTDS_UNIT_HOST=localhost
+rvm:
+  - 2.1.9
+  - 2.2.5
+  - 2.3.1
+before_install:
+  - export PATH=/opt/local/bin:$PATH
+  - docker info
+  - sudo ./test/bin/setup.sh
+  - sudo ./test/bin/install-openssl.sh
+  - openssl version
+  - sudo ./test/bin/install-freetds.sh
+  - tsql -C
+install:
+  - export PATH=/opt/local/bin:$PATH
+  - gem install bundler
+  - bundle --version
+  - bundle install
+script:
+  - bundle exec rake

data/CHANGELOG

@@ -1,3 +1,14 @@
+* 1.1.0 *
+
+* Use rake-compiler-dock v0.6.0
+* Handle SYBVARIANT types from SQL function. Fixes #317. Fixed #321.
+* Fix `use_utf16` optoin for booleans. Fixes #314
+* Add `-q` check for bin puts. Fixes #318
+* Use FreeTDS 1.00.21.
+* Appveyor tests only 2012, 2014 with one Ruby, 23-x64.
+* CircleCI & TravisCI both test 2016.
+
+
 * 1.0.5 *
 
 * Windows Static Builds - Use FreeTDS 1.00.15, OpenSSL 1.0.2j.
@@ -5,6 +16,7 @@
 * Error messages greater than 1024 chars generates a buffer overflow. Fixes #293.
 * Ensures numeric options are treated numerically Fixes #303.
 * New `:contained` login option. May deprecate `:azure`. Fixes #292.
+* New `:use_utf16` login option. Toggle UCS-2 or UTF-16. Default true.
 
 
 * 1.0.4 *

data/Gemfile

@@ -2,5 +2,6 @@ source 'https://rubygems.org'
 gemspec
 
 group :development do
+  gem 'rake-compiler-dock', github: 'rake-compiler/rake-compiler-dock'
   gem 'byebug'
 end

data/ISSUE_TEMPLATE.md

@@ -1,5 +1,6 @@
 Having problems? Have you checked these first:
 
+* Have you made sure to [enable SQL Server authentication](http://bit.ly/1Kw3set)?
 * 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.

data/README.md

@@ -1,6 +1,11 @@
 # TinyTDS - Simple and fast FreeTDS bindings for Ruby using DB-Library.
 
-[![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) [![Gem Version](https://img.shields.io/gem/v/tiny_tds.svg)](https://rubygems.org/gems/tiny_tds) [![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) <a href="https://codeclimate.com/github/rails-sqlserver/tiny_tds"><img src="https://codeclimate.com/github/rails-sqlserver/tiny_tds/badges/gpa.svg" /></a>
+* [![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
+* [![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
 
 The TinyTDS gem is meant to serve the extremely common use-case of connecting, querying and iterating over results to Microsoft SQL Server or Sybase databases from Ruby using the FreeTDS's DB-Library API.
 
@@ -21,7 +26,22 @@ Installing with rubygems should just work. TinyTDS is currently tested on Ruby v
 $ gem install tiny_tds
 ```
 
-If you use Windows, we pre-compile TinyTDS with static versions of FreeTDS, libiconv, and OpenSSL. On all other platforms, we will find these dependencies. 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:
+If you use Windows, we pre-compile TinyTDS with static versions of FreeTDS and supporting libraries. 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 build-essential
+$ apt-get install libc6-dev
+
+$ wget ftp://ftp.freetds.org/pub/freetds/stable/freetds-1.00.21.tar.gz
+$ tar -xzf freetds-1.00.21.tar.gz
+$ cd freetds-1.00.21
+$ ./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:
 
 ```
 --enable-system-freetds / --disable-system-freetds
@@ -375,34 +395,51 @@ The compiled gems will exist in `./pkg` directory.
 
 ## Development & Testing
 
-First make sure your local database has a `[tinytdstest]` database with a owner login named `[tinytds]` having no password. The following SQL run via the `sa` account should set that up for you.
+First, clone the repo using the command line or your Git GUI of choice.
 
-```bash
-$ tsql -H <host> -p 1433 -U sa -P <pass>
-$ sqsh -H <host> -p 1433 -U sa -P <pass>
+```shell
+$ git clone git@github.com:rails-sqlserver/tiny_tds.git
 ```
 
+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.
+
+```shell
+$ ./test/bin/setup.sh
+```
+
+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.
+
+```shell
+$ docker pull metaskills/mssql-server-linux-tinytds
+$ docker run -p 1433:1433 -d metaskills/mssql-server-linux-tinytds
+```
+
+If you are using your own database. Make sure to run these SQL commands as SA to get the test database and user installed.
+
 ```sql
 CREATE DATABASE [tinytdstest];
-GO
+```
+
+```sql
 CREATE LOGIN [tinytds] WITH PASSWORD = '', CHECK_POLICY = OFF, DEFAULT_DATABASE = [tinytdstest];
-GO
 USE [tinytdstest];
 CREATE USER [tinytds] FOR LOGIN [tinytds];
-GO
 EXEC sp_addrolemember N'db_owner', N'tinytds';
-GO
 ```
 
-We use bundler for development. Simply run `bundle install` then `rake` to build the gem and run the unit tests. Before running the test rake task, you may need to define a pair of environment variables that help the client connect to your specific FreeTDS database server name and which schema (2000, 2005, 2008, 2014, Azure or Sybase ASE) to use. For example:
+From here you can now run the tests. This assumes you have both Ruby & the needed FreeTDS installed.
+
+```shell
+$ bundle install
+$ bundle exec rake
+```
+
+Examples us using enviornment variables to customize the test task.
 
 ```
 $ rake TINYTDS_UNIT_DATASERVER=mydbserver
-  or
 $ rake TINYTDS_UNIT_DATASERVER=mydbserver TINYTDS_SCHEMA=sqlserver_2008
-  or
 $ rake TINYTDS_UNIT_HOST=mydb.host.net TINYTDS_SCHEMA=sqlserver_azure
-  or
 $ rake TINYTDS_UNIT_HOST=mydb.host.net TINYTDS_UNIT_PORT=5000 TINYTDS_SCHEMA=sybase_ase
 ```
 
@@ -417,7 +454,7 @@ $ rake TINYTDS_SKIP_PORTS=1
 
 * Github Source: http://github.com/rails-sqlserver/tiny_tds
 * Github Issues: http://github.com/rails-sqlserver/tiny_tds/issues
-* Google Group: http://groups.google.com/group/rails-sqlserver-adapter
+* Gitter Chat: https://gitter.im/rails-sqlserver/activerecord-sqlserver-adapter
 * IRC Room: #rails-sqlserver on irc.freenode.net
 
 

data/Rakefile

@@ -68,8 +68,8 @@ Rake::ExtensionTask.new('tiny_tds', gemspec) do |ext|
     gemplat = spec.platform.to_s
     host = platform_host_map[gemplat]
     dlls = [
-      "libeay32-1.0.2g-#{host}.dll",
-      "ssleay32-1.0.2g-#{host}.dll",
+      "libeay32-#{OPENSSL_VERSION}-#{host}.dll",
+      "ssleay32-#{OPENSSL_VERSION}-#{host}.dll",
       'libiconv-2.dll',
       'libsybdb-5.dll'
     ]
@@ -77,11 +77,6 @@ Rake::ExtensionTask.new('tiny_tds', gemspec) do |ext|
     spec.files = spec.files.reject { |f| f =~ %r{^ports\/archives/} }
     spec.files += dlls.map { |dll| "ports/#{host}/bin/#{File.basename(dll)}" }
     spec.files += Dir.glob('exe/*')
-    dlls.each do |dll|
-      file "ports/#{host}/bin/#{dll}" do |t|
-        sh 'x86_64-w64-mingw32-strip', t.name
-      end
-    end
   end
 end
 
@@ -94,7 +89,7 @@ desc 'Build the windows binary gems per rake-compiler-dock'
 task 'gem:windows' do
   require 'rake_compiler_dock'
   RakeCompilerDock.sh <<-EOT
-    bundle && rake cross native gem RUBY_CC_VERSION=2.0.0:2.1.6:2.2.2:2.3.0 CFLAGS="-Wall"
+    bundle && rake cross native gem RUBY_CC_VERSION=2.4.0:2.3.0:2.2.2:2.1.6:2.0.0 CFLAGS="-Wall"
   EOT
 end
 

data/VERSION

@@ -1 +1 @@
-1.0.5
+1.1.0

data/appveyor.yml

@@ -5,6 +5,7 @@ init:
   - SET TESTOPTS='-v'
 clone_depth: 5
 skip_tags: true
+skip_branch_with_pr: true
 matrix:
   fast_finish: true
 install:
@@ -22,12 +23,6 @@ test_script:
   - timeout /t 4 /nobreak > NUL
   - powershell -File "%APPVEYOR_BUILD_FOLDER%\test\appveyor\dbsetup.ps1"
   - timeout /t 4 /nobreak > NUL
-  - ps: Start-Service 'MSSQL$SQL2016'
-  - timeout /t 4 /nobreak > NUL
-  - sqlcmd -S ".\SQL2016" -U sa -P Password12! -i %APPVEYOR_BUILD_FOLDER%\test\appveyor\dbsetup.sql
-  - bundle exec rake TINYTDS_UNIT_HOST_TEST=localhost TINYTDS_UNIT_DATASERVER="localhost\SQL2016" TINYTDS_SCHEMA=sqlserver_2014 TDSVER=7.1
-  - bundle exec rake TINYTDS_UNIT_HOST_TEST=localhost TINYTDS_UNIT_DATASERVER="localhost\SQL2016" TINYTDS_SCHEMA=sqlserver_2014
-  - ps: Stop-Service 'MSSQL$SQL2016'
   - ps: Start-Service 'MSSQL$SQL2014'
   - timeout /t 4 /nobreak > NUL
   - sqlcmd -S ".\SQL2014" -U sa -P Password12! -i %APPVEYOR_BUILD_FOLDER%\test\appveyor\dbsetup.sql
@@ -46,6 +41,7 @@ environment:
   matrix:
     - ruby_version: "23-x64"
     - ruby_version: "23"
-    - ruby_version: "200"
+    - ruby_version: "22-x64"
+    - ruby_version: "22"
 on_failure:
   - find -name compile.log | xargs cat

data/circle.yml

@@ -0,0 +1,33 @@
+general:
+  branches:
+    ignore:
+      - /dev.*/
+
+machine:
+  environment:
+    PATH: /opt/local/bin:${PATH}
+    TESTOPTS: -v
+    TINYTDS_UNIT_HOST: localhost
+  services:
+    - docker
+
+dependencies:
+  override:
+    - rvm-exec 2.1.9 bundle install
+    - rvm-exec 2.2.5 bundle install
+    - rvm-exec 2.3.1 bundle install
+    - sudo ./test/bin/install-openssl.sh
+    - openssl version
+    - sudo ./test/bin/install-freetds.sh
+    - tsql -C
+
+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

data/ext/tiny_tds/client.c

@@ -409,6 +409,7 @@ void init_tinytds_client() {
   sym_encoding = ID2SYM(rb_intern("encoding"));
   sym_azure = ID2SYM(rb_intern("azure"));
   sym_contained = ID2SYM(rb_intern("contained"));
+  sym_use_utf16 = ID2SYM(rb_intern("use_utf16"));
   /* Intern TinyTds::Error Accessors */
   intern_source_eql = rb_intern("source=");
   intern_severity_eql = rb_intern("severity=");

data/ext/tiny_tds/extconf.rb

@@ -166,6 +166,19 @@ def define_libssl_recipe(host)
         execute "configure", "sh -c \"#{args.join(" ")}\""
       end
 
+      def dllwrap(dllname, outputlib, deffile, linkto)
+        gcc = consolidated_host(RbConfig::CONFIG["CC"])
+
+        #RbConfig does not provide dlltool, but it should exist where dllwrap lives
+        dlltool = consolidated_host(RbConfig::CONFIG["DLLWRAP"]).sub('dllwrap','dlltool')
+
+        execute "gcc-#{dllname}-compile", "#{gcc} -Wl,--base-file,#{dllname}.base -mdll -o #{dllname}.dll --leading-underscore #{linkto}"
+        execute "dlltool-#{dllname}-exp", "#{dlltool} --base-file #{dllname}.base --output-exp #{dllname}.exp --dllname #{dllname}.dll --def #{deffile}"
+        execute "gcc-#{dllname}-dll", "#{gcc} -Wl,--base-file,#{dllname}.base #{dllname}.exp -mdll -o #{dllname}.dll --leading-underscore #{linkto}"
+        execute "dlltool-#{dllname}-outputlib", "#{dlltool} --base-file #{dllname}.base --output-exp #{dllname}.exp --dllname #{dllname}.dll --def #{deffile} --output-lib #{outputlib}"
+        execute "gcc-#{dllname}-link", "#{gcc} #{dllname}.exp -mdll -o #{dllname}.dll --leading-underscore #{linkto}"
+      end
+
       def compile
         super
         # OpenSSL DLLs are called "libeay32.dll" and "ssleay32.dll" per default,
@@ -174,9 +187,8 @@ def define_libssl_recipe(host)
         # with our own naming scheme.
         execute "mkdef-libeay32", "(perl util/mkdef.pl 32 libeay >libeay32.def)"
         execute "mkdef-ssleay32", "(perl util/mkdef.pl 32 ssleay >ssleay32.def)"
-        dllwrap = consolidated_host(RbConfig::CONFIG["DLLWRAP"])
-        execute "dllwrap-libeay32", "#{dllwrap} --dllname libeay32-#{version}-#{host}.dll --output-lib libcrypto.dll.a --def libeay32.def libcrypto.a -lwsock32 -lgdi32 -lcrypt32"
-        execute "dllwrap-ssleay32", "#{dllwrap} --dllname ssleay32-#{version}-#{host}.dll --output-lib libssl.dll.a --def ssleay32.def libssl.a libcrypto.dll.a"
+        dllwrap("libeay32-#{version}-#{host}", "libcrypto.dll.a", "libeay32.def", "libcrypto.a -lws2_32 -lgdi32 -lcrypt32")
+        dllwrap("ssleay32-#{version}-#{host}", "libssl.dll.a", "ssleay32.def", "libssl.a libcrypto.dll.a")
       end
 
       def install
@@ -193,7 +205,9 @@ end
 def define_libiconv_recipe(host)
   BuildRecipe.new("libiconv", ICONV_VERSION, [ICONV_SOURCE_URI]).tap do |recipe|
     # always produce position independent code
-    recipe.configure_options << "CFLAGS=-fPIC"
+    # and set an explicit optimization to avoid inline functions being optimized
+    # out of libiconv
+    recipe.configure_options << "CFLAGS=-fPIC -O2"
   end
 end
 

data/ext/tiny_tds/extconsts.rb

@@ -2,10 +2,10 @@
 ICONV_VERSION = ENV['TINYTDS_ICONV_VERSION'] || "1.14"
 ICONV_SOURCE_URI = "http://ftp.gnu.org/pub/gnu/libiconv/libiconv-#{ICONV_VERSION}.tar.gz"
 
-OPENSSL_VERSION = ENV['TINYTDS_OPENSSL_VERSION'] || '1.0.2g'
+OPENSSL_VERSION = ENV['TINYTDS_OPENSSL_VERSION'] || '1.0.2j'
 OPENSSL_SOURCE_URI = "https://www.openssl.org/source/openssl-#{OPENSSL_VERSION}.tar.gz"
 
-FREETDS_VERSION = ENV['TINYTDS_FREETDS_VERSION'] || "1.00.15"
+FREETDS_VERSION = ENV['TINYTDS_FREETDS_VERSION'] || "1.00.21"
 FREETDS_VERSION_INFO = Hash.new { |h,k|
   h[k] = {files: "ftp://ftp.freetds.org/pub/freetds/stable/freetds-#{k}.tar.bz2"}
 }

data/ext/tiny_tds/result.c

@@ -325,6 +325,15 @@ static VALUE rb_tinytds_result_fetch_row(VALUE self, ID timezone, int symbolize_
         case SYBTEXT:
           val = ENCODED_STR_NEW(data, data_len);
           break;
+        case 98: { // SYBVARIANT
+          if (data_len == 4) {
+            val = INT2NUM(*(DBINT *)data);
+            break;
+          } else {
+            val = ENCODED_STR_NEW(data, data_len);
+            break;
+          }
+        }
         default:
           val = ENCODED_STR_NEW(data, data_len);
           break;

data/lib/tiny_tds/bin.rb

@@ -14,7 +14,7 @@ module TinyTds
 
       def exe(name, *args)
         bin = new(name)
-        puts bin.info
+        puts bin.info unless args.any? { |x| x == '-q' }
         bin.run(*args)
       end
 

data/lib/tiny_tds/client.rb

@@ -42,7 +42,7 @@ module TinyTds
       opts[:password] = opts[:password].to_s if opts[:password] && opts[:password].to_s.strip != ''
       opts[:appname] ||= 'TinyTds'
       opts[:tds_version] = tds_versions_setter(opts)
-      opts[:use_utf16] ||= true
+      opts[:use_utf16] = opts[:use_utf16].nil? || ["true", "1", "yes"].include?(opts[:use_utf16].to_s)
       opts[:login_timeout] ||= 60
       opts[:timeout] ||= 5
       opts[:encoding] = opts[:encoding].nil? || opts[:encoding].casecmp('utf8').zero? ? 'UTF-8' : opts[:encoding].upcase

data/test/bin/install-freetds.sh

@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+set -x
+set -e
+
+if [ -z "$FREETDS_VERSION" ]; then
+  FREETDS_VERSION=$(ruby -r "./ext/tiny_tds/extconsts.rb" -e "puts FREETDS_VERSION")
+fi
+
+wget ftp://ftp.freetds.org/pub/freetds/stable/freetds-$FREETDS_VERSION.tar.gz
+tar -xzf freetds-$FREETDS_VERSION.tar.gz
+cd freetds-$FREETDS_VERSION
+./configure --prefix=/opt/local \
+            --with-openssl=/opt/local \
+            --with-tdsver=7.3
+make
+make install
+cd ..
+rm -rf freetds-$FREETDS_VERSION
+rm freetds-$FREETDS_VERSION.tar.gz

data/test/bin/install-openssl.sh

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+set -x
+set -e
+
+if [ -z "$OPENSSL_VERSION" ]; then
+  OPENSSL_VERSION=$(ruby -r "./ext/tiny_tds/extconsts.rb" -e "puts OPENSSL_VERSION")
+fi
+
+wget https://www.openssl.org/source/openssl-$OPENSSL_VERSION.tar.gz
+tar -xzf openssl-$OPENSSL_VERSION.tar.gz
+cd openssl-$OPENSSL_VERSION
+./config --prefix=/opt/local
+make
+make install
+cd ..
+rm -rf openssl-$OPENSSL_VERSION
+rm openssl-$OPENSSL_VERSION.tar.gz

data/test/bin/setup.sh

@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+set -x
+set -e
+
+docker pull metaskills/mssql-server-linux-tinytds
+
+container=$(docker ps -a -q --filter ancestor=metaskills/mssql-server-linux-tinytds)
+if [[ -z $container ]]; then
+  docker run -p 1433:1433 -d metaskills/mssql-server-linux-tinytds && sleep 10
+  exit
+fi
+
+container=$(docker ps -q --filter ancestor=metaskills/mssql-server-linux-tinytds)
+if [[ -z $container ]]; then
+  docker start $container && sleep 10
+fi

data/test/client_test.rb

@@ -84,9 +84,16 @@ class ClientTest < TinyTds::TestCase
       options = connection_options :login_timeout => 1, :dataserver => 'DOESNOTEXIST'
       action = lambda { new_connection(options) }
       assert_raise_tinytds_error(action) do |e|
-        assert_equal 20012, e.db_error_number
-        assert_equal 2, e.severity
-        assert_match %r{server name not found in configuration files}i, e.message, 'ignore if non-english test run'
+        # Not sure why tese are different.
+        if ruby_darwin?
+          assert_equal 20009, e.db_error_number
+          assert_equal 9, e.severity
+          assert_match %r{is unavailable or does not exist}i, e.message, 'ignore if non-english test run'
+        else
+          assert_equal 20012, e.db_error_number
+          assert_equal 2, e.severity
+          assert_match %r{server name not found in configuration files}i, e.message, 'ignore if non-english test run'
+        end
       end
       assert_new_connections_work
     end

data/test/result_test.rb

@@ -335,6 +335,11 @@ class ResultTest < TinyTds::TestCase
       assert_nil result.return_code
     end
 
+    it 'with LOGINPROPERTY function' do
+      v = @client.execute("SELECT LOGINPROPERTY('sa', 'IsLocked') as v").first['v']
+      v.must_equal 0
+    end
+
     describe 'with multiple result sets' do
 
       before do

data/test/test_helper.rb

@@ -142,6 +142,10 @@ module TinyTds
       RbConfig::CONFIG['host_os'] =~ /ming/
     end
 
+    def ruby_darwin?
+      RbConfig::CONFIG['host_os'] =~ /darwin/
+    end
+
     def load_current_schema
       loader = new_connection
       schema_file = File.expand_path File.join(File.dirname(__FILE__), 'schema', "#{current_schema}.sql")

data/tiny_tds.gemspec

@@ -19,10 +19,10 @@ Gem::Specification.new do |s|
   s.extensions    = ['ext/tiny_tds/extconf.rb']
   s.license       = 'MIT'
   s.required_ruby_version = '>= 2.0.0'
-  s.add_runtime_dependency     'mini_portile2', '~> 2.0' # Keep this version in sync with the one in extconf.rb !
+  s.add_runtime_dependency     'mini_portile2', '~> 2.0'
   s.add_development_dependency 'rake', '~> 10.4'
   s.add_development_dependency 'rake-compiler', '0.9.5'
-  s.add_development_dependency 'rake-compiler-dock', '~> 0.5.1'
+  s.add_development_dependency 'rake-compiler-dock', '~> 0.6.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: 1.0.5
+  version: 1.1.0
 platform: x86-mingw32
 authors:
 - Ken Collins
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-09 00:00:00.000000000 Z
+date: 2016-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_portile2
@@ -60,14 +60,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -110,6 +110,7 @@ files:
 - ".codeclimate.yml"
 - ".gitignore"
 - ".rubocop.yml"
+- ".travis.yml"
 - CHANGELOG
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -121,6 +122,7 @@ files:
 - appveyor.yml
 - bin/defncopy
 - bin/tsql
+- circle.yml
 - exe/.keep
 - exe/defncopy.exe
 - exe/tsql.exe
@@ -137,21 +139,25 @@ files:
 - lib/tiny_tds/2.1/tiny_tds.so
 - lib/tiny_tds/2.2/tiny_tds.so
 - lib/tiny_tds/2.3/tiny_tds.so
+- lib/tiny_tds/2.4/tiny_tds.so
 - lib/tiny_tds/bin.rb
 - lib/tiny_tds/client.rb
 - lib/tiny_tds/error.rb
 - lib/tiny_tds/result.rb
 - lib/tiny_tds/version.rb
-- ports/i686-w64-mingw32/bin/libeay32-1.0.2g-i686-w64-mingw32.dll
+- ports/i686-w64-mingw32/bin/libeay32-1.0.2j-i686-w64-mingw32.dll
 - ports/i686-w64-mingw32/bin/libiconv-2.dll
 - ports/i686-w64-mingw32/bin/libsybdb-5.dll
-- ports/i686-w64-mingw32/bin/ssleay32-1.0.2g-i686-w64-mingw32.dll
-- ports/patches/freetds/1.00.15/0001-mingw_missing_inet_pton.diff
+- ports/i686-w64-mingw32/bin/ssleay32-1.0.2j-i686-w64-mingw32.dll
+- ports/patches/freetds/1.00.21/0001-mingw_missing_inet_pton.diff
 - 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/result_test.rb
 - test/schema/1px.gif
@@ -187,7 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: TinyTDS - A modern, simple and fast FreeTDS library for Ruby using DB-Library.