tiny_tds 0.7.0-x86-mingw32 → 0.9.5.beta.1-x86-mingw32

data/ext/tiny_tds/result.h

@@ -2,10 +2,6 @@
 #ifndef TINYTDS_RESULT_H
 #define TINYTDS_RESULT_H
 
-#ifndef DBSETLDBNAME
-  typedef tds_sysdep_int64_type DBBIGINT;  /* For FreeTDS 0.82 */
-#endif
-
 void init_tinytds_result();
 VALUE rb_tinytds_new_result_obj(tinytds_client_wrapper *cwrap);
 

data/ext/tiny_tds/tiny_tds_ext.h

@@ -1,11 +1,13 @@
 #ifndef TINYTDS_EXT
 #define TINYTDS_EXT
 
-#undef MSDBLIB
-#define SYBDBLIB
+#undef SYBDBLIB
+#define MSDBLIB 1
 
 #include <ruby.h>
 #include <ruby/encoding.h>
+#include <ruby/version.h>
+#include <ruby/thread.h>
 #include <sybfront.h>
 #include <sybdb.h>
 

data/lib/tiny_tds.rb

@@ -1,7 +1,7 @@
 # encoding: UTF-8
 require 'date'
 require 'bigdecimal'
-require 'rational' unless RUBY_VERSION >= '1.9.2'
+require 'rational'
 
 require 'tiny_tds/version'
 require 'tiny_tds/error'
@@ -15,8 +15,7 @@ if RUBY_PLATFORM =~ /mingw|mswin/ && RUBY_VERSION =~ /(\d+.\d+)/
   old_path = ENV['PATH']
   begin
     # Do the same host consolidation as in extconf.rb
-    ports_dir = RbConfig::CONFIG["host"].gsub('i586-mingw32msvc', 'i686-w64-mingw32').
-                                         gsub('i686-pc-mingw32', 'i686-w64-mingw32')
+    ports_dir = RbConfig::CONFIG["host"].gsub('i686-pc-mingw32', 'i686-w64-mingw32')
     ENV['PATH'] = "#{File.expand_path("../../ports/#{ports_dir}/bin", __FILE__)};#{old_path}"
     require "tiny_tds/#{ver}/tiny_tds"
   rescue LoadError
@@ -31,12 +30,7 @@ else
   ports_libs = File.expand_path("../../ports/#{RbConfig::CONFIG["host"]}/lib/*.so", __FILE__)
   Dir[ports_libs].each do |lib|
     require "fiddle"
-    if Fiddle.respond_to?(:dlopen)
-      Fiddle.dlopen(lib)
-    else
-      # For compat with Ruby < 2.0
-      DL.dlopen(lib)
-    end
+    Fiddle.dlopen(lib)
   end
 
   require 'tiny_tds/tiny_tds'

data/lib/tiny_tds/client.rb

@@ -1,39 +1,6 @@
 module TinyTds
   class Client
 
-    # From sybdb.h comments:
-    # DBVERSION_xxx are used with dbsetversion()
-    #
-    TDS_VERSIONS_SETTERS = {
-      'unknown' => 0,
-      '46'      => 1,
-      '100'     => 2,
-      '42'      => 3,
-      '70'      => 4,
-      '71'      => 5,
-      '80'      => 5,
-      '72'      => 6,
-      '90'      => 6
-    }.freeze
-
-    # From sybdb.h comments:
-    # DBTDS_xxx are returned by DBTDS()
-    # The integer values of the constants are poorly chosen.
-    #
-    TDS_VERSIONS_GETTERS = {
-      0  => {:name => 'DBTDS_UNKNOWN',        :description => 'Unknown'},
-      1  => {:name => 'DBTDS_2_0',            :description => 'Pre 4.0 SQL Server'},
-      2  => {:name => 'DBTDS_3_4',            :description => 'Microsoft SQL Server (3.0)'},
-      3  => {:name => 'DBTDS_4_0',            :description => '4.0 SQL Server'},
-      4  => {:name => 'DBTDS_4_2',            :description => '4.2 SQL Server'},
-      5  => {:name => 'DBTDS_4_6',            :description => '2.0 OpenServer and 4.6 SQL Server.'},
-      6  => {:name => 'DBTDS_4_9_5',          :description => '4.9.5 (NCR) SQL Server'},
-      7  => {:name => 'DBTDS_5_0',            :description => '5.0 SQL Server'},
-      8  => {:name => 'DBTDS_7_0',            :description => 'Microsoft SQL Server 7.0'},
-      9  => {:name => 'DBTDS_7_1/DBTDS_8_0',  :description => 'Microsoft SQL Server 2000'},
-      10 => {:name => 'DBTDS_7_2/DBTDS_9_0',  :description => 'Microsoft SQL Server 2005'}
-    }.freeze
-
     @@default_query_options = {
       :as => :hash,
       :symbolize_keys => false,
@@ -53,6 +20,7 @@ module TinyTds
       # Most, if not all, iconv encoding names can be found by ruby. Just in case, you can
       # overide this method to return a string name that Encoding.find would work with. Default
       # is to return the passed encoding.
+      #
       def transpose_iconv_encoding(encoding)
         encoding
       end
@@ -62,10 +30,11 @@ module TinyTds
 
     def initialize(opts={})
       raise ArgumentError, 'missing :host option if no :dataserver given' if opts[:dataserver].to_s.empty? && opts[:host].to_s.empty?
+      opts[:username] = parse_username(opts)
       @query_options = @@default_query_options.dup
       opts[:password] = opts[:password].to_s if opts[:password] && opts[:password].to_s.strip != ''
       opts[:appname] ||= 'TinyTds'
-      opts[:tds_version] = TDS_VERSIONS_SETTERS[opts[:tds_version].to_s] || TDS_VERSIONS_SETTERS['71']
+      opts[:tds_version] = tds_versions_setter(opts)
       opts[:login_timeout] ||= 60
       opts[:timeout] ||= 5
       opts[:encoding] = (opts[:encoding].nil? || opts[:encoding].downcase == 'utf8') ? 'UTF-8' : opts[:encoding].upcase
@@ -74,6 +43,10 @@ module TinyTds
       connect(opts)
     end
 
+    def tds_73?
+      tds_version >= 11
+    end
+
     def tds_version_info
       info = TDS_VERSIONS_GETTERS[tds_version]
       "#{info[:name]} - #{info[:description]}" if info
@@ -90,5 +63,59 @@ module TinyTds
       ::Time.local(2010).utc_offset.to_r / 86400
     end
 
+    def parse_username(opts)
+      username = opts[:username]
+      return username if username.nil? || !opts[:azure] || !username.include?("@")
+      user, domain = username.split("@")
+      "#{user}@#{domain.split('.').first}"
+    end
+
+    def tds_versions_setter(opts={})
+      v = opts[:tds_version] || ENV['TDSVER'] || '7.1'
+      TDS_VERSIONS_SETTERS[v.to_s]
+    end
+
+    # From sybdb.h comments:
+    # DBVERSION_xxx are used with dbsetversion()
+    #
+    TDS_VERSIONS_SETTERS = {
+      'unknown' => 0,
+      '46'      => 1,
+      '100'     => 2,
+      '42'      => 3,
+      '70'      => 4,
+      '7.0'     => 4,
+      '71'      => 5,
+      '7.1'     => 5,
+      '80'      => 5,
+      '8.0'     => 5,
+      '72'      => 6,
+      '7.2'     => 6,
+      '90'      => 6,
+      '9.0'     => 6,
+      '73'      => 7,
+      '7.3'     => 7
+    }.freeze
+
+    # From sybdb.h comments:
+    # DBTDS_xxx are returned by DBTDS()
+    # The integer values of the constants are poorly chosen.
+    #
+    TDS_VERSIONS_GETTERS = {
+      0  => {:name => 'DBTDS_UNKNOWN',        :description => 'Unknown'},
+      1  => {:name => 'DBTDS_2_0',            :description => 'Pre 4.0 SQL Server'},
+      2  => {:name => 'DBTDS_3_4',            :description => 'Microsoft SQL Server (3.0)'},
+      3  => {:name => 'DBTDS_4_0',            :description => '4.0 SQL Server'},
+      4  => {:name => 'DBTDS_4_2',            :description => '4.2 SQL Server'},
+      5  => {:name => 'DBTDS_4_6',            :description => '2.0 OpenServer and 4.6 SQL Server.'},
+      6  => {:name => 'DBTDS_4_9_5',          :description => '4.9.5 (NCR) SQL Server'},
+      7  => {:name => 'DBTDS_5_0',            :description => '5.0 SQL Server'},
+      8  => {:name => 'DBTDS_7_0',            :description => 'Microsoft SQL Server 7.0'},
+      9  => {:name => 'DBTDS_7_1/DBTDS_8_0',  :description => 'Microsoft SQL Server 2000'},
+      10 => {:name => 'DBTDS_7_2/DBTDS_9_0',  :description => 'Microsoft SQL Server 2005'},
+      11 => {:name => 'DBTDS_7_3',            :description => 'Microsoft SQL Server 2008'},
+      12 => {:name => 'DBTDS_7_4',            :description => 'Microsoft SQL Server 2012/2014'}
+    }.freeze
+
   end
 end

data/lib/tiny_tds/version.rb

@@ -1,3 +1,3 @@
 module TinyTds
-  VERSION = '0.7.0'
+  VERSION = File.read(File.expand_path("../../../VERSION", __FILE__)).chomp
 end

data/ports/patches/freetds/0.91.112/Makefile.in.diff

@@ -0,0 +1,29 @@
+--- a/Makefile.in	2011-08-17 18:57:36.000000000 -0700
++++ b/Makefile.in	2014-05-02 10:27:01.275813000 -0700
+@@ -772,13 +772,6 @@
+ 
+ 
+ install-data-local:
+-	$(mkinstalldirs) $(ETC)
+-	if test ! -f $(ETC)/freetds.conf; then \
+-		$(INSTALL_DATA) $(srcdir)/freetds.conf $(ETC)/freetds.conf; \
+-	fi
+-	if test ! -f $(ETC)/locales.conf; then \
+-		$(INSTALL_DATA) $(srcdir)/locales.conf $(ETC)/locales.conf; \
+-	fi
+ 
+ clean-local:
+ 	find . \( -name \*.test_output -o -name \*.bb -o -name \*.bbg -o -name \*.da -o -name \*.gc\* \) -exec rm -f {} \;
+--- a/src/pool/Makefile.in	2011-08-17 18:57:36.000000000 -0700
++++ b/src/pool/Makefile.in	2014-05-02 10:32:39.628347600 -0700
+@@ -574,10 +574,6 @@
+ 
+ 
+ install-data-local:
+-	$(mkinstalldirs) $(ETC)
+-	if test ! -f $(ETC)/pool.conf; then \
+-		$(INSTALL_DATA) $(srcdir)/pool.conf $(ETC)/pool.conf; \
+-	fi
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.

data/ports/patches/freetds/0.91.112/dblib-30-char-username.diff

@@ -0,0 +1,11 @@
+--- a/src/dblib/dblib.c
++++ b/src/dblib/dblib.c
+@@ -765,7 +765,7 @@ dbsetlname(LOGINREC * login, const char *value, int which)
+ 		return FAIL;
+ 	}
+ 
+-	if (TDS_MAX_LOGIN_STR_SZ < strlen(value)) {
++	if (login->tds_login->tds_version < 0x700 && TDS_MAX_LOGIN_STR_SZ < strlen(value)) {
+ 		dbperror(NULL, SYBENTLL, 0);
+ 		return FAIL;
+ 	}

data/ports/patches/freetds/0.95.75/0001-mingw_missing_inet_pton.diff

@@ -0,0 +1,34 @@
+diff --git a/src/tds/tls.c b/src/tds/tls.c
+index 0d11a33..b8ab2ba 100644
+--- a/src/tds/tls.c
++++ b/src/tds/tls.c
+@@ -72,6 +72,29 @@
+ #define SSL_PTR bio->ptr
+ #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)
++  #include <windows.h>
++
++  static HMODULE ws2_32 = NULL;
++  typedef INT (WINAPI * __inet_pton)(INT Family, LPCWSTR pStringBuf, PVOID pAddr);
++  static __inet_pton _inet_pton = NULL;
++
++  INT WINAPI inet_pton(INT Family, LPCWSTR pStringBuf, PVOID pAddr)
++  {
++    if (_inet_pton == NULL) {
++      ws2_32 = LoadLibraryEx("Ws2_32.dll", NULL, 0);
++
++      _inet_pton = (__inet_pton)GetProcAddress(ws2_32, "inet_pton");
++    }
++
++    return (_inet_pton)(Family, pStringBuf, pAddr);
++  }
++#endif
++
+ static SSL_RET
+ tds_pull_func_login(SSL_PULL_ARGS)
+ {

data/test/client_test.rb

@@ -28,6 +28,9 @@ class ClientTest < TinyTds::TestCase
       if sybase_ase?
         assert_equal 7, @client.tds_version
         assert_equal 'DBTDS_5_0 - 5.0 SQL Server', @client.tds_version_info
+      elsif @client.tds_73?
+        assert_equal 11, @client.tds_version
+        assert_equal 'DBTDS_7_3 - Microsoft SQL Server 2008', @client.tds_version_info
       else
         assert_equal 9, @client.tds_version
         assert_equal 'DBTDS_7_1/DBTDS_8_0 - Microsoft SQL Server 2000', @client.tds_version_info
@@ -48,6 +51,7 @@ class ClientTest < TinyTds::TestCase
         client = new_connection(:encoding => encoding)
         assert_equal encoding, client.charset
         assert_equal Encoding.find(encoding), client.encoding
+        client.close
       end
     end
 
@@ -55,6 +59,7 @@ class ClientTest < TinyTds::TestCase
       host = ENV['TINYTDS_UNIT_HOST_TEST'] || ENV['TINYTDS_UNIT_HOST']
       port = ENV['TINYTDS_UNIT_PORT_TEST'] || ENV['TINYTDS_UNIT_PORT'] || 1433
       client = new_connection dataserver: nil, host: host, port: port
+      client.close
     end unless sqlserver_azure?
 
   end
@@ -89,6 +94,7 @@ class ClientTest < TinyTds::TestCase
         assert_match %r{timed out}i, e.message, 'ignore if non-english test run'
       end
       assert_client_works(client)
+      close_client(client)
       assert_new_connections_work
     end
 
@@ -97,6 +103,7 @@ class ClientTest < TinyTds::TestCase
       client.execute("WaitFor Delay '00:00:01'").do
       client.execute("WaitFor Delay '00:00:01'").do
       client.execute("WaitFor Delay '00:00:01'").do
+      close_client(client)
     end
 
     it 'must not timeout per sql batch when under transaction' do
@@ -108,6 +115,7 @@ class ClientTest < TinyTds::TestCase
         client.execute("WaitFor Delay '00:00:01'").do
       ensure
         client.execute("COMMIT TRANSACTION").do
+        close_client(client)
       end
     end
 
@@ -134,6 +142,7 @@ class ClientTest < TinyTds::TestCase
           assert_equal 1, e.severity
           assert_match %r{dead or not enabled}i, e.message, 'ignore if non-english test run'
         end
+        close_client(client)
         assert_new_connections_work
       end
     end
@@ -143,7 +152,9 @@ class ClientTest < TinyTds::TestCase
       action = lambda { new_connection(options) }
       assert_raise_tinytds_error(action) do |e|
         if sqlserver_azure?
-          assert_match %r{server name cannot be determined}i, e.message, 'ignore if non-english test run'
+          assert_equal 40532, e.db_error_number
+          assert_equal 20, e.severity
+          assert_match %r{login failed}i, e.message, 'ignore if non-english test run'
         else
           assert_equal sybase_ase? ? 4002 : 18456, e.db_error_number
           assert_equal 14, e.severity
@@ -153,19 +164,28 @@ class ClientTest < TinyTds::TestCase
       assert_new_connections_work
     end
 
-    it 'fails miserably with unknown encoding option' do
-      options = connection_options :encoding => 'ISO-WTF'
-      action = lambda { new_connection(options) }
-      assert_raise_tinytds_error(action) do |e|
-        assert_equal 20002, e.db_error_number
-        assert_equal 9, e.severity
-        assert_match %r{connection failed}i, e.message, 'ignore if non-english test run'
-      end
-      assert_new_connections_work
-    end unless sybase_ase?
-
   end
 
+  describe 'Private methods' do
+
+    let(:client) { @client = new_connection }
+
+    it '#parse_username returns username if azure is not true' do
+      username = 'user@long.domain.name.com'
+      client.send(:parse_username, username: username).must_equal username
+    end
+
+    it '#parse_username returns short username if azure is true' do
+      username = 'user@long.domain.name.com'
+      client.send(:parse_username, username: username, azure: true).must_equal 'user@long'
+    end
+
+    it '#parse_username returns short username if passed and azure is true' do
+      username = 'user@short'
+      client.send(:parse_username, username: username, azure: true).must_equal 'user@short'
+    end
+
+  end
 
 
 end

data/test/result_test.rb

@@ -397,6 +397,7 @@ class ResultTest < TinyTds::TestCase
       describe 'using :empty_sets TRUE' do
 
         before do
+          close_client
           @old_query_option_value = TinyTds::Client.default_query_options[:empty_sets]
           TinyTds::Client.default_query_options[:empty_sets] = true
           @client = new_connection
@@ -477,6 +478,7 @@ class ResultTest < TinyTds::TestCase
       describe 'using :empty_sets FALSE' do
 
         before do
+          close_client
           @old_query_option_value = TinyTds::Client.default_query_options[:empty_sets]
           TinyTds::Client.default_query_options[:empty_sets] = false
           @client = new_connection
@@ -668,12 +670,14 @@ class ResultTest < TinyTds::TestCase
       end
 
       it 'must not error at all from reading non-convertable charcters and just use ? marks' do
+        close_client
         @client = new_connection :encoding => 'ASCII'
         @client.charset.must_equal 'ASCII'
         find_value(202, :nvarchar_50).must_equal 'test nvarchar_50 ??'
       end
 
       it 'must error gracefully from writing non-convertable characters' do
+        close_client
         @client = new_connection :encoding => 'ASCII'
         @client.charset.must_equal 'ASCII'
         rollback_transaction(@client) do
@@ -681,26 +685,22 @@ class ResultTest < TinyTds::TestCase
           @client.execute("DELETE FROM [datatypes] WHERE [nvarchar_50] IS NOT NULL").do
           action = lambda { @client.execute("INSERT INTO [datatypes] ([nvarchar_50]) VALUES ('#{text}')").do }
           assert_raise_tinytds_error(action) do |e|
-            e.message.must_match %r{Error converting characters into server's character set}i
-            e.severity.must_equal 4
-            e.db_error_number.must_equal 2402
+            e.message.must_match %r{Unclosed quotation mark}i
+            e.severity.must_equal 15
+            e.db_error_number.must_equal 105
           end
           assert_followup_query
         end
       end
 
       it 'errors gracefully with incorrect syntax in sp_executesql' do
-        if @client.freetds_091_or_higer?
-          action = lambda { @client.execute("EXEC sp_executesql N'this will not work'").each }
-          assert_raise_tinytds_error(action) do |e|
-            assert_match %r|incorrect syntax|i, e.message
-            assert_equal 15, e.severity
-            assert_equal 156, e.db_error_number
-          end
-          assert_followup_query
-        else
-          skip 'FreeTDS 0.91 and higher can only pass this test.'
+        action = lambda { @client.execute("EXEC sp_executesql N'this will not work'").each }
+        assert_raise_tinytds_error(action) do |e|
+          assert_match %r|incorrect syntax|i, e.message
+          assert_equal 15, e.severity
+          assert_equal 156, e.db_error_number
         end
+        assert_followup_query
       end unless sybase_ase?
 
     end