tiny_tds 2.1.7 → 3.0.0

data/Rakefile

@@ -8,13 +8,9 @@ require_relative './ext/tiny_tds/extconsts'
 SPEC = Gem::Specification.load(File.expand_path('../tiny_tds.gemspec', __FILE__))
 
 ruby_cc_ucrt_versions = "3.3.0:3.2.0:3.1.0".freeze
-ruby_cc_mingw32_versions = "3.0.0:2.7.0:2.6.0:2.5.0:2.4.0".freeze
+ruby_cc_mingw32_versions = "3.0.0:2.7.0".freeze
 
 GEM_PLATFORM_HOSTS = {
-  'x86-mingw32' => {
-    host: 'i686-w64-mingw32',
-    ruby_versions: ruby_cc_mingw32_versions
-  },
   'x64-mingw32' => {
     host: 'x86_64-w64-mingw32',
     ruby_versions: ruby_cc_mingw32_versions

data/VERSION

@@ -1 +1 @@
-2.1.7
+3.0.0

data/docker-compose.yml

@@ -5,11 +5,11 @@ networks:
 
 services:
   mssql:
-    image: metaskills/mssql-server-linux-tinytds:2017-GA
+    image: mcr.microsoft.com/mssql/server:${MSSQL_VERSION:-2017}-latest
     container_name: sqlserver
     environment:
       ACCEPT_EULA: Y
-      SA_PASSWORD: super01S3cUr3
+      MSSQL_SA_PASSWORD: super01S3cUr3
     ports:
       - "1433:1433"
     network_mode: "host"

data/ext/tiny_tds/client.c

@@ -299,8 +299,7 @@ static VALUE rb_tinytds_execute(VALUE self, VALUE sql) {
   REQUIRE_OPEN_CLIENT(cwrap);
   dbcmd(cwrap->client, StringValueCStr(sql));
   if (dbsqlsend(cwrap->client) == FAIL) {
-    rb_warn("TinyTds: dbsqlsend() returned FAIL.\n");
-    return Qfalse;
+    rb_raise(cTinyTdsError, "failed dbsqlsend() function");
   }
   cwrap->userdata->dbsql_sent = 1;
   result = rb_tinytds_new_result_obj(cwrap);
@@ -404,17 +403,15 @@ static VALUE rb_tinytds_connect(VALUE self, VALUE opts) {
       #endif
     }
   }
-  #ifdef DBSETUTF16
-    if (use_utf16 == Qtrue)  { DBSETLUTF16(cwrap->login, 1); }
-    if (use_utf16 == Qfalse) { DBSETLUTF16(cwrap->login, 0); }
-  #else
-    if (use_utf16 == Qtrue || use_utf16 == Qfalse) {
-      rb_warning("TinyTds: Please consider upgrading to FreeTDS 0.99 or higher for better unicode support.\n");
-    }
-  #endif
+  if (use_utf16 == Qtrue)  { DBSETLUTF16(cwrap->login, 1); }
+  if (use_utf16 == Qfalse) { DBSETLUTF16(cwrap->login, 0); }
 
   cwrap->client = dbopen(cwrap->login, StringValueCStr(dataserver));
   if (cwrap->client) {
+    if (dbtds(cwrap->client) < 11) {
+      rb_raise(cTinyTdsError, "connecting with a TDS version older than 7.3!");
+    }
+
     VALUE transposed_encoding, timeout_string;
 
     cwrap->closed = 0;
@@ -435,11 +432,7 @@ static VALUE rb_tinytds_connect(VALUE self, VALUE opts) {
     }
     transposed_encoding = rb_funcall(cTinyTdsClient, intern_transpose_iconv_encoding, 1, charset);
     cwrap->encoding = rb_enc_find(StringValueCStr(transposed_encoding));
-    if (dbtds(cwrap->client) <= 7) {
-      cwrap->identity_insert_sql = "SELECT CAST(@@IDENTITY AS bigint) AS Ident";
-    } else {
-      cwrap->identity_insert_sql = "SELECT CAST(SCOPE_IDENTITY() AS bigint) AS Ident";
-    }
+    cwrap->identity_insert_sql = "SELECT CAST(SCOPE_IDENTITY() AS bigint) AS Ident";
   }
   return self;
 }

data/ext/tiny_tds/extconf.rb

@@ -22,7 +22,6 @@ do_help if arg_config('--help')
 
 # Make sure to check the ports path for the configured host
 architecture = RbConfig::CONFIG['arch']
-architecture = "x86-mingw32" if architecture == "i386-mingw32"
 
 project_dir = File.expand_path("../../..", __FILE__)
 freetds_ports_dir = File.join(project_dir, 'ports', architecture, 'freetds', FREETDS_VERSION)
@@ -84,7 +83,7 @@ have_dependencies = [
 end
 
 unless have_dependencies
-  abort 'Failed! Do you have FreeTDS 0.95.80 or higher installed?'
+  abort 'Failed! Do you have FreeTDS 1.0.0 or higher installed?'
 end
 
 create_makefile('tiny_tds/tiny_tds')

data/ext/tiny_tds/extconsts.rb

@@ -1,15 +1,9 @@
 
-ICONV_VERSION = ENV['TINYTDS_ICONV_VERSION'] || "1.15"
+ICONV_VERSION = ENV['TINYTDS_ICONV_VERSION'] || "1.17"
 ICONV_SOURCE_URI = "http://ftp.gnu.org/pub/gnu/libiconv/libiconv-#{ICONV_VERSION}.tar.gz"
 
-OPENSSL_VERSION = ENV['TINYTDS_OPENSSL_VERSION'] || '1.1.1s'
+OPENSSL_VERSION = ENV['TINYTDS_OPENSSL_VERSION'] || '3.4.0'
 OPENSSL_SOURCE_URI = "https://www.openssl.org/source/openssl-#{OPENSSL_VERSION}.tar.gz"
 
-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"}
-}
-FREETDS_VERSION_INFO['1.00'] = {files: 'http://www.freetds.org/files/stable/freetds-1.00.tar.bz2'}
-FREETDS_VERSION_INFO['0.99'] = {files: 'http://www.freetds.org/files/current/freetds-dev.0.99.678.tar.gz'}
-FREETDS_VERSION_INFO['0.95'] = {files: 'http://www.freetds.org/files/stable/freetds-0.95.92.tar.gz'}
-FREETDS_SOURCE_URI = FREETDS_VERSION_INFO[FREETDS_VERSION][:files]
+FREETDS_VERSION = ENV['TINYTDS_FREETDS_VERSION'] || '1.4.23'
+FREETDS_SOURCE_URI = "http://www.freetds.org/files/stable/freetds-#{FREETDS_VERSION}.tar.bz2"

data/ext/tiny_tds/result.c

@@ -298,42 +298,34 @@ static VALUE rb_tinytds_result_fetch_row(VALUE self, ID timezone, int symbolize_
           }
           break;
         }
-        case 40:   // SYBMSDATE
-        case 41:   // SYBMSTIME
-        case 42:   // SYBMSDATETIME2
-        case 43: { // SYBMSDATETIMEOFFSET
-          #ifdef DBVERSION_73
-            if (dbtds(rwrap->client) >= DBTDS_7_3) {
-              DBDATEREC2 dr2;
-              dbanydatecrack(rwrap->client, &dr2, coltype, data);
-              switch(coltype) {
-                case 40: { // SYBMSDATE
-                  val = rb_funcall(cDate, intern_new, 3, INT2NUM(dr2.year), INT2NUM(dr2.month), INT2NUM(dr2.day));
-                  break;
-                }
-                case 41: { // SYBMSTIME
-                  VALUE rational_nsec = rb_Rational(INT2NUM(dr2.nanosecond), opt_onek);
-                  val = rb_funcall(rb_cTime, timezone, 7, INT2NUM(1900), INT2NUM(1), INT2NUM(1), INT2NUM(dr2.hour), INT2NUM(dr2.minute), INT2NUM(dr2.second), rational_nsec);
-                  break;
-                }
-                case 42: { // SYBMSDATETIME2
-                  VALUE rational_nsec = rb_Rational(INT2NUM(dr2.nanosecond), opt_onek);
-                  val = rb_funcall(rb_cTime, timezone, 7, INT2NUM(dr2.year), INT2NUM(dr2.month), INT2NUM(dr2.day), INT2NUM(dr2.hour), INT2NUM(dr2.minute), INT2NUM(dr2.second), rational_nsec);
-                  break;
-                }
-                case 43: { // SYBMSDATETIMEOFFSET
-                  long long numerator = ((long)dr2.second * (long long)1000000000) + (long long)dr2.nanosecond;
-                  VALUE rational_sec = rb_Rational(LL2NUM(numerator), opt_onebil);
-                  val = rb_funcall(rb_cTime, intern_new, 7, INT2NUM(dr2.year), INT2NUM(dr2.month), INT2NUM(dr2.day), INT2NUM(dr2.hour), INT2NUM(dr2.minute), rational_sec, INT2NUM(dr2.tzone*60));
-                  break;
-                }
-              }
-            } else {
-              val = ENCODED_STR_NEW(data, data_len);
+        case SYBMSDATE:
+        case SYBMSTIME:
+        case SYBMSDATETIME2:
+        case SYBMSDATETIMEOFFSET: {
+          DBDATEREC2 dr2;
+          dbanydatecrack(rwrap->client, &dr2, coltype, data);
+          switch(coltype) {
+            case SYBMSDATE: {
+              val = rb_funcall(cDate, intern_new, 3, INT2NUM(dr2.year), INT2NUM(dr2.month), INT2NUM(dr2.day));
+              break;
             }
-          #else
-            val = ENCODED_STR_NEW(data, data_len);
-          #endif
+            case SYBMSTIME: {
+              VALUE rational_nsec = rb_Rational(INT2NUM(dr2.nanosecond), opt_onek);
+              val = rb_funcall(rb_cTime, timezone, 7, INT2NUM(1900), INT2NUM(1), INT2NUM(1), INT2NUM(dr2.hour), INT2NUM(dr2.minute), INT2NUM(dr2.second), rational_nsec);
+              break;
+            }
+            case SYBMSDATETIME2: {
+              VALUE rational_nsec = rb_Rational(INT2NUM(dr2.nanosecond), opt_onek);
+              val = rb_funcall(rb_cTime, timezone, 7, INT2NUM(dr2.year), INT2NUM(dr2.month), INT2NUM(dr2.day), INT2NUM(dr2.hour), INT2NUM(dr2.minute), INT2NUM(dr2.second), rational_nsec);
+              break;
+            }
+            case SYBMSDATETIMEOFFSET: {
+              long long numerator = ((long)dr2.second * (long long)1000000000) + (long long)dr2.nanosecond;
+              VALUE rational_sec = rb_Rational(LL2NUM(numerator), opt_onebil);
+              val = rb_funcall(rb_cTime, intern_new, 7, INT2NUM(dr2.year), INT2NUM(dr2.month), INT2NUM(dr2.day), INT2NUM(dr2.hour), INT2NUM(dr2.minute), rational_sec, INT2NUM(dr2.tzone*60));
+              break;
+            }
+          }
           break;
         }
         case SYBCHAR:

data/ext/tiny_tds/tiny_tds_ext.c

@@ -1,6 +1,9 @@
-
 #include <tiny_tds_ext.h>
 
+#ifndef DBVERSION_73
+  #error "DBVERSION_73 is not defined. Aborting compilation."
+#endif
+
 VALUE mTinyTds, cTinyTdsError;
 
 void Init_tiny_tds() {

data/tasks/ports/freetds.rb

@@ -15,12 +15,7 @@ module Ports
 
       opts << '--with-pic'
       opts << '--disable-odbc'
-
-      if version =~ /0\.91/
-        opts << '--with-tdsver=7.1'
-      else
-        opts << '--with-tdsver=7.3'
-      end
+      opts << '--with-tdsver=7.3'
 
       if windows?
         opts << '--sysconfdir=C:/Sites'

data/tasks/ports.rake

@@ -48,10 +48,10 @@ namespace :ports do
     if libraries_to_compile[:openssl]
       # freetds doesn't have an option that will provide an rpath
       # so we do it manually
-      ENV['OPENSSL_CFLAGS'] = "-Wl,-rpath -Wl,#{libraries_to_compile[:openssl].path}/lib"
+      ENV['OPENSSL_CFLAGS'] = "-Wl,-rpath -Wl,#{libraries_to_compile[:openssl].path}/lib64"
       # Add the pkgconfig file with MSYS2'ish path, to prefer our ports build
       # over MSYS2 system OpenSSL.
-      ENV['PKG_CONFIG_PATH'] = "#{libraries_to_compile[:openssl].path.gsub(/^(\w):/i) { "/" + $1.downcase }}/lib/pkgconfig:#{ENV['PKG_CONFIG_PATH']}"
+      ENV['PKG_CONFIG_PATH'] = "#{libraries_to_compile[:openssl].path.gsub(/^(\w):/i) { "/" + $1.downcase }}/lib64/pkgconfig:#{ENV['PKG_CONFIG_PATH']}"
       libraries_to_compile[:freetds].configure_options << "--with-openssl=#{libraries_to_compile[:openssl].path}"
     end
 

data/test/bin/install-mssql.ps1

@@ -1,15 +1,27 @@
+param ([int] $Version)
+
 $ProgressPreference = 'SilentlyContinue'
 
-if (-not(Test-path "C:\Downloads"))
-{
+$DownloadLinkTable = @{
+    2017 = "https://go.microsoft.com/fwlink/?linkid=829176";
+    2019 = "https://download.microsoft.com/download/7/c/1/7c14e92e-bdcb-4f89-b7cf-93543e7112d1/SQLEXPR_x64_ENU.exe";
+    2022 = "https://download.microsoft.com/download/3/8/d/38de7036-2433-4207-8eae-06e247e17b25/SQLEXPR_x64_ENU.exe";
+}
+
+$MajorVersionTable = @{
+    2017 = 14;
+    2019 = 15;
+    2022 = 16;
+}
+
+if (-not(Test-path "C:\Downloads")) {
     mkdir "C:\Downloads"
 }
 
 $sqlInstallationFile = "C:\Downloads\sqlexpress.exe"
-if (-not(Test-path $sqlInstallationFile -PathType leaf))
-{
+if (-not(Test-path $sqlInstallationFile -PathType leaf)) {
     Write-Host "Downloading SQL Express ..."
-    Invoke-WebRequest -Uri "https://go.microsoft.com/fwlink/?linkid=829176" -OutFile "C:\Downloads\sqlexpress.exe"
+    Invoke-WebRequest -Uri $DownloadLinkTable[$Version] -OutFile "C:\Downloads\sqlexpress.exe"
 }
 
 Write-Host "Installing SQL Express ..."
@@ -18,14 +30,13 @@ C:\Downloads\setup\setup.exe /q /ACTION=Install /INSTANCENAME=SQLEXPRESS /FEATUR
 
 Write-Host "Configuring SQL Express ..."
 stop-service MSSQL`$SQLEXPRESS
-set-itemproperty -path 'HKLM:\software\microsoft\microsoft sql server\mssql14.SQLEXPRESS\mssqlserver\supersocketnetlib\tcp\ipall' -name tcpdynamicports -value ''
-set-itemproperty -path 'HKLM:\software\microsoft\microsoft sql server\mssql14.SQLEXPRESS\mssqlserver\supersocketnetlib\tcp\ipall' -name tcpport -value 1433
-set-itemproperty -path 'HKLM:\software\microsoft\microsoft sql server\mssql14.SQLEXPRESS\mssqlserver\' -name LoginMode -value 2
+set-itemproperty -path "HKLM:\software\microsoft\microsoft sql server\mssql$($MajorVersionTable[$Version]).SQLEXPRESS\mssqlserver\supersocketnetlib\tcp\ipall" -name tcpdynamicports -value ''
+set-itemproperty -path "HKLM:\software\microsoft\microsoft sql server\mssql$($MajorVersionTable[$Version]).SQLEXPRESS\mssqlserver\supersocketnetlib\tcp\ipall" -name tcpport -value 1433
+set-itemproperty -path "HKLM:\software\microsoft\microsoft sql server\mssql$($MajorVersionTable[$Version]).SQLEXPRESS\mssqlserver\" -name LoginMode -value 2
 
 Write-Host "Starting SQL Express ..."
 start-service MSSQL`$SQLEXPRESS
 
 Write-Host "Configuring MSSQL for TinyTDS ..."
-& sqlcmd -Q "CREATE DATABASE [tinytdstest];"
-& sqlcmd -Q "CREATE LOGIN [tinytds] WITH PASSWORD = '', CHECK_POLICY = OFF, DEFAULT_DATABASE = [tinytdstest];"
-& sqlcmd -Q "USE [tinytdstest]; CREATE USER [tinytds] FOR LOGIN [tinytds]; EXEC sp_addrolemember N'db_owner', N'tinytds';"
+& sqlcmd -i './test/sql/db-create.sql'
+& sqlcmd -i './test/sql/db-login.sql'

data/test/client_test.rb

@@ -24,10 +24,7 @@ class ClientTest < TinyTds::TestCase
     end
 
     it 'has getters for the tds version information (brittle since conf takes precedence)' do
-      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?
+      if @client.tds_73?
         assert_equal 11, @client.tds_version
         assert_equal 'DBTDS_7_3 - Microsoft SQL Server 2008', @client.tds_version_info
       else
@@ -199,7 +196,7 @@ class ClientTest < TinyTds::TestCase
       options = connection_options :username => 'willnotwork'
       action = lambda { new_connection(options) }
       assert_raise_tinytds_error(action) do |e|
-        assert_equal sybase_ase? ? 4002 : 18456, e.db_error_number
+        assert_equal 18456, e.db_error_number
         assert_equal 14, e.severity
         assert_match %r{login failed}i, e.message, 'ignore if non-english test run'
       end

data/test/gem_test.rb

@@ -158,7 +158,6 @@ class GemTest < MiniTest::Spec
       {
         'x64-mingw-ucrt' => 'x64-mingw-ucrt',
         'x64-mingw32' => 'x64-mingw32',
-        'x86-mingw32' => 'x86-mingw32',
         'x86_64-linux' => 'x86_64-linux',
       }.each do |host,expected|
         describe "on a #{host} architecture" do