tiny_tds 1.1.0 → 1.2.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c6ebe14945fb3158078d43e1d5ddea21d796985
-  data.tar.gz: f7d810a55c416e50a45ba9600f512d06c2d7cc90
+  metadata.gz: 73739198ed720ce62bb4155a3ff62fa57c2f253e
+  data.tar.gz: bd23c3eaf52c14526f74bbee4540f43694967c83
 SHA512:
-  metadata.gz: d466970838b8a143d961a28ca553f0ef1c1cd7b152c4bd408e8cea2f811d1c59441debf2496413b418f320fba311eef215f981e4529abd31b84f837b0ff9725e
-  data.tar.gz: f2b783a226c06af4eaac3a4f33d4462b5af0fbeb6d8e37ab6127b86c2fd6528bf927637505ff7d264a6fe8da5592c6e29dfaf39550db0d3505b47365ad083e86
+  metadata.gz: 7491d68d7a71c70882652b3898ea57d77e6e63eeddfcafb8e2a219017df99c8a3c9c099d097766769533dda4f5fa1219f0631d96be29990f08b9fb0cfbceaa79
+  data.tar.gz: bf3971e242f4054f9e8d27fc470f5992da70c0116b3a13136dee1e00bfdd7a42bbf7d73d4d6fcfa3432ad32a658b897818704e1b33792f59e3a45d16cad87199

data/.gitattributes

@@ -0,0 +1 @@
+*.diff eol=lf

data/README.md

@@ -5,6 +5,7 @@
 * [![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
 
 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.
@@ -331,19 +332,38 @@ TinyTDS is fully tested with the Azure platform. You must set the `azure: true`
 
 **IMPORTANT**: Do not use `username@server.database.windows.net` for the username connection option! You must use the shorter `username@server` instead!
 
-We recommend the following settings when using TinyTDS with Azure. These are the same settings used in the ActiveRecord SQL Server adapter.
+Also, please read the [Azure SQL Database General Guidelines and Limitations](https://msdn.microsoft.com/en-us/library/ee336245.aspx) MSDN article to understand the differences. Specifically, the connection constraints section!
+
+## Connection Settings
+
+A DBLIB connection does not have the same default SET options for a standard SMS SQL Server connection. Hence, we recommend the following options post establishing your connection.
+
+#### SQL Server
 
 ```sql
-SET ANSI_NULLS ON
+SET ANSI_DEFAULTS ON
+
+SET QUOTED_IDENTIFIER ON
 SET CURSOR_CLOSE_ON_COMMIT OFF
-SET ANSI_NULL_DFLT_ON ON
 SET IMPLICIT_TRANSACTIONS OFF
+SET TEXTSIZE 2147483647
+SET CONCAT_NULL_YIELDS_NULL ON
+```
+
+#### Azure
+
+```sql
+SET ANSI_NULLS ON
+SET ANSI_NULL_DFLT_ON ON
 SET ANSI_PADDING ON
-SET QUOTED_IDENTIFIER ON
 SET ANSI_WARNINGS ON
-```
 
-Also, please read the [Azure SQL Database General Guidelines and Limitations](https://msdn.microsoft.com/en-us/library/ee336245.aspx) MSDN article to understand the differences. Specifically, the connection constraints section!
+SET QUOTED_IDENTIFIER ON
+SET CURSOR_CLOSE_ON_COMMIT OFF
+SET IMPLICIT_TRANSACTIONS OFF
+SET TEXTSIZE 2147483647
+SET CONCAT_NULL_YIELDS_NULL ON
+```
 
 
 ## Thread Safety

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-#{OPENSSL_VERSION}-#{host}.dll",
-      "ssleay32-#{OPENSSL_VERSION}-#{host}.dll",
+      "libcrypto32-#{OPENSSL_VERSION}-#{host}.dll",
+      "libssl32-#{OPENSSL_VERSION}-#{host}.dll",
       'libiconv-2.dll',
       'libsybdb-5.dll'
     ]

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0.beta1

data/ext/tiny_tds/extconf.rb

@@ -151,6 +151,19 @@ def define_libssl_recipe(host)
         end
       end
 
+      def execute(action, command, options={})
+        prev_path = ENV['PATH']
+        if host=~/mingw/
+          git_perl = 'C:/Program Files/Git/usr/bin'
+          if File.directory?(git_perl)
+            ENV['PATH'] = git_perl + ';' + ENV['PATH']
+            ENV['PERL'] = 'perl'
+          end
+        end
+        super
+        ENV['PATH'] = prev_path
+      end
+
       def configure
         config = if host=~/mingw/
           host=~/x86_64/ ? 'mingw64' : 'mingw'
@@ -181,20 +194,20 @@ def define_libssl_recipe(host)
 
       def compile
         super
-        # OpenSSL DLLs are called "libeay32.dll" and "ssleay32.dll" per default,
+        # OpenSSL DLLs are called "libcrypto32.dll" and "libssl32.dll" per default,
         # regardless to the version. This is best suited to meet the Windows DLL hell.
         # To avoid any conflicts we do a static build and build DLLs afterwards,
         # 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("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")
+        execute "mkdef-crypto32", "(perl util/mkdef.pl crypto 32 >libcrypto32.def)"
+        execute "mkdef-ssl32", "(perl util/mkdef.pl ssl 32 >libssl32.def)"
+        dllwrap("libcrypto32-#{version}-#{host}", "libcrypto.dll.a", "libcrypto32.def", "libcrypto.a -lws2_32 -lgdi32 -lcrypt32")
+        dllwrap("libssl32-#{version}-#{host}", "libssl.dll.a", "libssl32.def", "libssl.a libcrypto.dll.a")
       end
 
       def install
         super
-        FileUtils.cp "#{work_path}/libeay32-#{version}-#{host}.dll", "#{path}/bin/"
-        FileUtils.cp "#{work_path}/ssleay32-#{version}-#{host}.dll", "#{path}/bin/"
+        FileUtils.cp "#{work_path}/libcrypto32-#{version}-#{host}.dll", "#{path}/bin/"
+        FileUtils.cp "#{work_path}/libssl32-#{version}-#{host}.dll", "#{path}/bin/"
         FileUtils.cp "#{work_path}/libcrypto.dll.a", "#{path}/lib/"
         FileUtils.cp "#{work_path}/libssl.dll.a", "#{path}/lib/"
       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.2j'
+OPENSSL_VERSION = ENV['TINYTDS_OPENSSL_VERSION'] || '1.1.0e'
 OPENSSL_SOURCE_URI = "https://www.openssl.org/source/openssl-#{OPENSSL_VERSION}.tar.gz"
 
-FREETDS_VERSION = ENV['TINYTDS_FREETDS_VERSION'] || "1.00.21"
+FREETDS_VERSION = ENV['TINYTDS_FREETDS_VERSION'] || "1.00.27"
 FREETDS_VERSION_INFO = Hash.new { |h,k|
   h[k] = {files: "ftp://ftp.freetds.org/pub/freetds/stable/freetds-#{k}.tar.bz2"}
 }

data/ports/patches/freetds/{1.00.21 → 1.00.27}/0001-mingw_missing_inet_pton.diff

@@ -1,16 +1,16 @@
 diff --git a/src/tds/tls.c b/src/tds/tls.c
-index 0d11a33..b8ab2ba 100644
+index 09e7fa0..1da18f6 100644
 --- a/src/tds/tls.c
 +++ b/src/tds/tls.c
-@@ -72,6 +72,29 @@
- #define SSL_PTR bio->ptr
+@@ -101,6 +101,29 @@
+ #define SSL_PTR BIO_get_data(bio)
  #endif
 
 +/*
 + * Add a workaround for older Mingw versions without inet_pton().
 + * This means RubyInstallers DevKit-4.7.2 in particular.
 + */
-+#if defined(__MINGW64_VERSION_MAJOR) && !defined(InetPtonA)
++#if defined(__MINGW32__) && !defined(InetPtonA)
 +  #include <windows.h>
 +
 +  static HMODULE ws2_32 = NULL;

data/test/bin/install-openssl.sh

@@ -10,7 +10,7 @@ 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
+./config --prefix=/usr/local/openssl --openssldir=/usr/local/openssl
 make
 make install
 cd ..

data/test/bin/setup.sh

@@ -3,15 +3,17 @@
 set -x
 set -e
 
-docker pull metaskills/mssql-server-linux-tinytds
+tag=1.3
 
-container=$(docker ps -a -q --filter ancestor=metaskills/mssql-server-linux-tinytds)
+docker pull metaskills/mssql-server-linux-tinytds:$tag
+
+container=$(docker ps -a -q --filter ancestor=metaskills/mssql-server-linux-tinytds:$tag)
 if [[ -z $container ]]; then
-  docker run -p 1433:1433 -d metaskills/mssql-server-linux-tinytds && sleep 10
+  docker run -p 1433:1433 -d metaskills/mssql-server-linux-tinytds:$tag && sleep 10
   exit
 fi
 
-container=$(docker ps -q --filter ancestor=metaskills/mssql-server-linux-tinytds)
+container=$(docker ps -q --filter ancestor=metaskills/mssql-server-linux-tinytds:$tag)
 if [[ -z $container ]]; then
   docker start $container && sleep 10
 fi

data/test/result_test.rb

@@ -578,7 +578,7 @@ class ResultTest < TinyTds::TestCase
 
       it 'returns nil for NULL' do
         value = @client.execute('SELECT NULL AS [null]').each.first['null']
-        assert_equal nil, value
+        assert_nil value
       end
 
     end

data/test/schema_test.rb

@@ -27,7 +27,7 @@ class SchemaTest < TinyTds::TestCase
       it 'casts bit' do
         assert_equal true, find_value(31, :bit)
         assert_equal false, find_value(32, :bit)
-        assert_equal nil, find_value(21, :bit)
+        assert_nil find_value(21, :bit)
       end
 
       it 'casts char' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tiny_tds
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0.beta1
 platform: ruby
 authors:
 - Ken Collins
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-20 00:00:00.000000000 Z
+date: 2017-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_portile2
@@ -109,6 +109,7 @@ extensions:
 extra_rdoc_files: []
 files:
 - ".codeclimate.yml"
+- ".gitattributes"
 - ".gitignore"
 - ".rubocop.yml"
 - ".travis.yml"
@@ -139,7 +140,7 @@ files:
 - lib/tiny_tds/error.rb
 - lib/tiny_tds/result.rb
 - lib/tiny_tds/version.rb
-- ports/patches/freetds/1.00.21/0001-mingw_missing_inet_pton.diff
+- ports/patches/freetds/1.00.27/0001-mingw_missing_inet_pton.diff
 - test/appveyor/dbsetup.ps1
 - test/appveyor/dbsetup.sql
 - test/benchmark/query.rb
@@ -178,9 +179,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.4