tiny_tds 0.7.0 → 0.9.5.beta.1

data/ext/tiny_tds/client.c

@@ -24,7 +24,8 @@ VALUE opt_escape_regex, opt_escape_dblquote;
 
 // Lib Backend (Helpers)
 
-VALUE rb_tinytds_raise_error(DBPROCESS *dbproc, int cancel, char *error, char *source, int severity, int dberr, int oserr) {
+VALUE rb_tinytds_raise_error(DBPROCESS *dbproc, int cancel, const char *error, const char *source, int severity, int dberr, int oserr) {
+  VALUE e;
   GET_CLIENT_USERDATA(dbproc);
   if (cancel && !dbdead(dbproc) && userdata && !userdata->closed) {
     userdata->dbsqlok_sent = 1;
@@ -32,7 +33,7 @@ VALUE rb_tinytds_raise_error(DBPROCESS *dbproc, int cancel, char *error, char *s
     userdata->dbcancel_sent = 1;
     dbcancel(dbproc);
   }
-  VALUE e = rb_exc_new2(cTinyTdsError, error);
+  e = rb_exc_new2(cTinyTdsError, error);
   rb_funcall(e, intern_source_eql, 1, rb_str_new2(source));
   if (severity)
     rb_funcall(e, intern_severity_eql, 1, INT2FIX(severity));
@@ -48,13 +49,13 @@ VALUE rb_tinytds_raise_error(DBPROCESS *dbproc, int cancel, char *error, char *s
 // Lib Backend (Memory Management & Handlers)
 
 int tinytds_err_handler(DBPROCESS *dbproc, int severity, int dberr, int oserr, char *dberrstr, char *oserrstr) {
-  static char *source = "error";
-  GET_CLIENT_USERDATA(dbproc);
-
+  static const char *source = "error";
   /* Everything should cancel by default */
   int return_value = INT_CANCEL;
   int cancel = 0;
 
+  GET_CLIENT_USERDATA(dbproc);
+
   /* These error codes are documented in include/sybdb.h in FreeTDS */
   switch(dberr) {
 
@@ -67,7 +68,7 @@ int tinytds_err_handler(DBPROCESS *dbproc, int severity, int dberr, int oserr, c
 
     case SYBEICONVO:
       dbfreebuf(dbproc);
-      break;
+      return return_value;
 
     case SYBETIME:
       /*
@@ -125,7 +126,7 @@ int tinytds_err_handler(DBPROCESS *dbproc, int severity, int dberr, int oserr, c
 }
 
 int tinytds_msg_handler(DBPROCESS *dbproc, DBINT msgno, int msgstate, int severity, char *msgtext, char *srvname, char *procname, int line) {
-  static char *source = "message";
+  static const char *source = "message";
   GET_CLIENT_USERDATA(dbproc);
   if (severity > 10) {
     // See tinytds_err_handler() for info about why we do this
@@ -230,6 +231,8 @@ static VALUE rb_tinytds_sqlsent(VALUE self) {
 }
 
 static VALUE rb_tinytds_execute(VALUE self, VALUE sql) {
+  VALUE result;
+
   GET_CLIENT_WRAPPER(self);
   rb_tinytds_client_reset_userdata(cwrap->userdata);
   REQUIRE_OPEN_CLIENT(cwrap);
@@ -239,12 +242,14 @@ static VALUE rb_tinytds_execute(VALUE self, VALUE sql) {
     return Qfalse;
   }
   cwrap->userdata->dbsql_sent = 1;
-  VALUE result = rb_tinytds_new_result_obj(cwrap);
+  result = rb_tinytds_new_result_obj(cwrap);
   rb_iv_set(result, "@query_options", rb_funcall(rb_iv_get(self, "@query_options"), intern_dup, 0));
-  GET_RESULT_WRAPPER(result);
-  rwrap->local_offset = rb_funcall(cTinyTdsClient, intern_local_offset, 0);
-  rwrap->encoding = cwrap->encoding;
-  return result;
+  {
+    GET_RESULT_WRAPPER(result);
+    rwrap->local_offset = rb_funcall(cTinyTdsClient, intern_local_offset, 0);
+    rwrap->encoding = cwrap->encoding;
+    return result;
+  }
 }
 
 static VALUE rb_tinytds_charset(VALUE self) {
@@ -258,9 +263,11 @@ static VALUE rb_tinytds_encoding(VALUE self) {
 }
 
 static VALUE rb_tinytds_escape(VALUE self, VALUE string) {
-  Check_Type(string, T_STRING);
+  VALUE new_string;
   GET_CLIENT_WRAPPER(self);
-  VALUE new_string = rb_funcall(string, intern_gsub, 2, opt_escape_regex, opt_escape_dblquote);
+
+  Check_Type(string, T_STRING);
+  new_string = rb_funcall(string, intern_gsub, 2, opt_escape_regex, opt_escape_dblquote);
   rb_enc_associate(new_string, cwrap->encoding);
   return new_string;
 }
@@ -280,13 +287,6 @@ static VALUE rb_tinytds_identity_sql(VALUE self) {
   return rb_str_new2(cwrap->identity_insert_sql);
 }
 
-static VALUE rb_tinytds_freetds_nine_one_or_higher(VALUE self) {
-  #ifdef DBSETLDBNAME
-    return Qtrue;
-  #else
-    return Qfalse;
-  #endif
-}
 
 
 // TinyTds::Client (protected)
@@ -294,6 +294,8 @@ static VALUE rb_tinytds_freetds_nine_one_or_higher(VALUE self) {
 static VALUE rb_tinytds_connect(VALUE self, VALUE opts) {
   /* Parsing options hash to local vars. */
   VALUE user, pass, dataserver, database, app, version, ltimeout, timeout, charset, azure;
+  GET_CLIENT_WRAPPER(self);
+
   user = rb_hash_aref(opts, sym_username);
   pass = rb_hash_aref(opts, sym_password);
   dataserver = rb_hash_aref(opts, sym_dataserver);
@@ -311,7 +313,6 @@ static VALUE rb_tinytds_connect(VALUE self, VALUE opts) {
   }
   dberrhandle(tinytds_err_handler);
   dbmsghandle(tinytds_msg_handler);
-  GET_CLIENT_WRAPPER(self);
   cwrap->login = dblogin();
   if (!NIL_P(version))
     dbsetlversion(cwrap->login, NUM2INT(version));
@@ -336,6 +337,8 @@ static VALUE rb_tinytds_connect(VALUE self, VALUE opts) {
   }
   cwrap->client = dbopen(cwrap->login, StringValueCStr(dataserver));
   if (cwrap->client) {
+    VALUE transposed_encoding;
+
     cwrap->closed = 0;
     cwrap->charset = charset;
     if (!NIL_P(version))
@@ -345,7 +348,7 @@ static VALUE rb_tinytds_connect(VALUE self, VALUE opts) {
     if (!NIL_P(database) && (azure != Qtrue)) {
       dbuse(cwrap->client, StringValueCStr(database));
     }
-    VALUE transposed_encoding = rb_funcall(cTinyTdsClient, intern_transpose_iconv_encoding, 1, charset);
+    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";
@@ -375,7 +378,6 @@ void init_tinytds_client() {
   rb_define_method(cTinyTdsClient, "escape", rb_tinytds_escape, 1);
   rb_define_method(cTinyTdsClient, "return_code", rb_tinytds_return_code, 0);
   rb_define_method(cTinyTdsClient, "identity_sql", rb_tinytds_identity_sql, 0);
-  rb_define_method(cTinyTdsClient, "freetds_091_or_higer?", rb_tinytds_freetds_nine_one_or_higher, 0);
   /* Define TinyTds::Client Protected Methods */
   rb_define_protected_method(cTinyTdsClient, "connect", rb_tinytds_connect, 1);
   /* Symbols For Connect */

data/ext/tiny_tds/client.h

@@ -36,6 +36,7 @@ typedef struct {
   rb_encoding *encoding;
 } tinytds_client_wrapper;
 
+VALUE rb_tinytds_raise_error(DBPROCESS *dbproc, int cancel, const char *error, const char *source, int severity, int dberr, int oserr);
 
 // Lib Macros
 

data/ext/tiny_tds/extconf.rb

@@ -3,27 +3,13 @@ ENV['RC_ARCHS'] = '' if RUBY_PLATFORM =~ /darwin/
 # :stopdoc:
 
 require 'mkmf'
-require 'mini_portile'
 require 'fileutils'
 
-# If your using 0.82, you may have to make a conf file to get it to work. For example:
-# $ export FREETDSCONF='/opt/local/etc/freetds/freetds.conf'
-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.2d'
-OPENSSL_SOURCE_URI = "http://www.openssl.org/source/openssl-#{OPENSSL_VERSION}.tar.gz"
-
-FREETDS_VERSION = ENV['TINYTDS_FREETDS_VERSION'] || "0.91"
-FREETDS_VERSION_INFO = Hash.new { |h,k|
-  h[k] = {:files => "ftp://ftp.freetds.org/pub/freetds/stable/freetds-#{k}.tar.gz"}
-}.merge({
-  "0.82" => {:files => "ftp://ftp.freetds.org/pub/freetds/old/0.82/freetds-0.82.tar.gz"},
-  "0.91" => {:files => "ftp://ftp.freetds.org/pub/freetds/stable/freetds-0.91.112.tar.gz"},
-  "0.92" => {:files => "ftp://ftp.freetds.org/pub/freetds/stable/freetds-0.92.405.tar.gz"},
-  "current" => {:files => "ftp://ftp.freetds.org/pub/freetds/current/freetds-current.tar.gz"}
-})
-FREETDS_SOURCE_URI = FREETDS_VERSION_INFO[FREETDS_VERSION][:files]
+# The gem version constraint in the gemspec is not respected at install time.
+# Keep this version in sync with the one in the gemspec !
+gem 'mini_portile2', '~> 2.0'
+require 'mini_portile2'
+require_relative './extconsts'
 
 # Shamelessly copied from nokogiri
 #
@@ -44,6 +30,12 @@ usage: ruby #{$0} [options]
     --enable-lookup
       Search for freetds through all paths in the PATH environment variable.
 
+    --disable-openssl
+      Disable OpenSSL for freetds build. No effect on system-freetds.
+
+    --enable-gnutls
+      Use GnuTLS instead of OpenSSL for freetds build.
+
     --enable-cross-build
       Do cross-build.
 HELP
@@ -90,17 +82,13 @@ class BuildRecipe < MiniPortile
     super(name, version)
     self.files = files
     self.target = File.expand_path('../../../ports', __FILE__)
-    # Prefer host_alias over host in order to use i586-mingw32msvc as
-    # correct compiler prefix for cross build, but use host if not set.
-    self.host = consolidated_host(RbConfig::CONFIG["host_alias"].empty? ? RbConfig::CONFIG["host"] : RbConfig::CONFIG["host_alias"])
+    self.host = consolidated_host(RbConfig::CONFIG["host"])
     self.patch_files = Dir[File.join(self.target, "patches", self.name, self.version, "*.diff")].sort
   end
 
   def consolidated_host(name)
-    # For ruby-1.9.3 we use newer mingw-w64 (i686-w64-mingw32) to build the shared libraries
-    # and mingw32 (i586-mingw32msvc) to build the extension.
-    name.gsub('i586-mingw32msvc', 'i686-w64-mingw32').
-         gsub('i686-pc-mingw32', 'i686-w64-mingw32')
+     # Host name and prefix of build tools are different on Windows 32 bit.
+    name.gsub('i686-pc-mingw32', 'i686-w64-mingw32')
   end
 
   def configure_defaults
@@ -111,10 +99,16 @@ class BuildRecipe < MiniPortile
     ]
   end
 
+  # Use the same path for all recipes, so that only one include/lib path is required.
   def port_path
     "#{target}/#{host}"
   end
 
+  # We use the same port_path for all recipes. That breaks the standard installed? method.
+  def installed?
+    false
+  end
+
   # When using rake-compiler-dock on Windows, the underlying Virtualbox shared
   # folders don't support symlinks, but libiconv expects it for a build on
   # Linux. We work around this limitation by using the temp dir for cooking.
@@ -195,21 +189,24 @@ def define_libssl_recipe(host)
 end
 
 def define_libiconv_recipe(host)
-  BuildRecipe.new("libiconv", ICONV_VERSION, [ICONV_SOURCE_URI])
-             .tap do |recipe|
+  BuildRecipe.new("libiconv", ICONV_VERSION, [ICONV_SOURCE_URI]).tap do |recipe|
     # always produce position independent code
     recipe.configure_options << "CFLAGS=-fPIC"
   end
 end
 
-def define_freetds_recipe(host, libiconv, libssl)
-  BuildRecipe.new("freetds", FREETDS_VERSION, [FREETDS_SOURCE_URI])
-             .tap do |recipe|
-    with_tdsver = FREETDS_VERSION =~ /0\.8/ ? "--with-tdsver=8.0" : "--with-tdsver=7.1"
+def define_freetds_recipe(host, libiconv, libssl, gnutls)
+  BuildRecipe.new("freetds", FREETDS_VERSION, [FREETDS_SOURCE_URI]).tap do |recipe|
+    with_tdsver = FREETDS_VERSION =~ /0\.91/ ? "--with-tdsver=7.1" : "--with-tdsver=7.3"
     for_windows = recipe.host =~ /mswin|mingw/i
     recipe.configure_options << '--with-pic'
     recipe.configure_options << "--with-libiconv-prefix=#{libiconv.path}" if libiconv
-    recipe.configure_options << "--with-openssl=#{libssl.path}" if libssl
+    if true == libssl
+      recipe.configure_options << "--with-openssl"
+    elsif libssl
+      recipe.configure_options << "--with-openssl=#{libssl.path}"
+    end
+    recipe.configure_options << "--with-gnutls" if gnutls
     recipe.configure_options << '--sysconfdir=C:/Sites' if for_windows
     recipe.configure_options << '--enable-sspi' if for_windows
     recipe.configure_options << "--disable-odbc"
@@ -217,9 +214,31 @@ def define_freetds_recipe(host, libiconv, libssl)
     if libiconv
       # For some reason freetds doesn't honor --with-libiconv-prefix
       # so we have do add it by hand:
-      recipe.configure_options << "\"CFLAGS=-I#{libiconv.path}/include\""
-      recipe.configure_options << "\"LDFLAGS=-L#{libiconv.path}/lib -liconv\""
+      recipe.configure_options << "CFLAGS=-I#{libiconv.path}/include"
+      recipe.configure_options << "LDFLAGS=-L#{libiconv.path}/lib -liconv"
+    end
+
+    class << recipe
+
+      def install
+        super_value = super
+        # Install binstub target binaries.
+        if super_value
+          bin_path = File.expand_path File.join(path, 'bin')
+          exe_path = File.expand_path File.join(target, '..', 'exe')
+          return unless File.directory?(bin_path)
+          ENV['PATH'] = "#{bin_path}#{File::PATH_SEPARATOR}#{ENV['PATH']}" unless ENV['PATH'].include?(bin_path)
+          ['tsql'].each do |bin|
+            path = which(bin)
+            next unless path.include?(bin_path)
+            FileUtils.cp path, exe_path
+          end
+        end
+        super_value
+      end
+
     end
+
   end
 end
 
@@ -285,11 +304,13 @@ system_freetds = enable_config('system-freetds', ENV['TINYTDS_SKIP_PORTS'] || fr
 host = RbConfig::CONFIG["host"]
 system_iconv = enable_config('system-iconv', host =~ /mingw|mswin/ ? false : true)
 system_openssl = enable_config('system-openssl', host =~ /mingw|mswin/ ? false : true )
+enable_gnutls = enable_config('gnutls', false )
+enable_openssl = enable_config('openssl', !enable_gnutls )
 
 unless system_freetds
   libssl = define_libssl_recipe(host).cook_and_activate unless system_openssl
   libiconv = define_libiconv_recipe(host).cook_and_activate unless system_iconv
-  freetds = define_freetds_recipe(host, libiconv, libssl).cook_and_activate
+  freetds = define_freetds_recipe(host, libiconv, libssl || enable_openssl, enable_gnutls).cook_and_activate
   dir_config('freetds', freetds.path + "/include", freetds.path + "/lib")
 end
 

data/ext/tiny_tds/extconsts.rb

@@ -0,0 +1,14 @@
+
+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.2e'
+OPENSSL_SOURCE_URI = "http://www.openssl.org/source/openssl-#{OPENSSL_VERSION}.tar.gz"
+
+FREETDS_VERSION = ENV['TINYTDS_FREETDS_VERSION'] || "0.95.75"
+FREETDS_VERSION_INFO = Hash.new { |h,k|
+  h[k] = {files: "ftp://ftp.freetds.org/pub/freetds/stable/freetds-#{k}.tar.bz2"}
+}
+FREETDS_VERSION_INFO['0.99'] = {files: 'ftp://ftp.freetds.org/pub/freetds/current/freetds-dev.0.99.479.tar.bz2'}
+FREETDS_VERSION_INFO['current'] = {files: 'https://github.com/FreeTDS/freetds/archive/master.zip'}
+FREETDS_SOURCE_URI = FREETDS_VERSION_INFO[FREETDS_VERSION][:files]

data/ext/tiny_tds/result.c

@@ -7,9 +7,9 @@
 VALUE cTinyTdsResult;
 extern VALUE mTinyTds, cTinyTdsClient, cTinyTdsError;
 VALUE cBigDecimal, cDate;
-VALUE opt_decimal_zero, opt_float_zero, opt_one, opt_zero, opt_four, opt_19hdr, opt_tenk, opt_onemil;
+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_Rational;
+          intern_civil, intern_new_offset, intern_plus, intern_divide;
 static ID sym_symbolize_keys, sym_as, sym_array, sym_cache_rows, sym_first, sym_timezone, sym_local, sym_utc, sym_empty_sets;
 
 
@@ -27,6 +27,12 @@ rb_encoding *binaryEncoding;
   _val; \
 })
 
+#ifdef _WIN32
+  #define LONG_LONG_FORMAT "I64d"
+#else
+  #define LONG_LONG_FORMAT "lld"
+#endif
+
 
 // Lib Backend (Memory Management)
 
@@ -42,7 +48,6 @@ static void rb_tinytds_result_mark(void *ptr) {
 }
 
 static void rb_tinytds_result_free(void *ptr) {
-  tinytds_result_wrapper *rwrap = (tinytds_result_wrapper *)ptr;
   xfree(ptr);
 }
 
@@ -67,8 +72,8 @@ VALUE rb_tinytds_new_result_obj(tinytds_client_wrapper *cwrap) {
 // No GVL Helpers
 
 #define NOGVL_DBCALL(_dbfunction, _client) ( \
-  (RETCODE)rb_thread_call_without_gvl( \
-    (rb_blocking_function_t*)_dbfunction, _client, \
+  (RETCODE)(intptr_t)rb_thread_call_without_gvl( \
+    (void *(*)(void *))_dbfunction, _client, \
     (rb_unblock_function_t*)dbcancel_ubf, _client ) \
 )
 
@@ -94,8 +99,8 @@ static void nogvl_cleanup(DBPROCESS *client) {
     userdata->nonblocking_error.is_set = 0;
     rb_tinytds_raise_error(client,
       userdata->nonblocking_error.cancel,
-      &userdata->nonblocking_error.error,
-      &userdata->nonblocking_error.source,
+      userdata->nonblocking_error.error,
+      userdata->nonblocking_error.source,
       userdata->nonblocking_error.severity,
       userdata->nonblocking_error.dberr,
       userdata->nonblocking_error.oserr);
@@ -139,9 +144,9 @@ static RETCODE nogvl_dbnextrow(DBPROCESS * client) {
 // Lib Backend (Helpers)
 
 static RETCODE rb_tinytds_result_dbresults_retcode(VALUE self) {
-  GET_RESULT_WRAPPER(self);
   VALUE ruby_rc;
   RETCODE db_rc;
+  GET_RESULT_WRAPPER(self);
   ruby_rc = rb_ary_entry(rwrap->dbresults_retcodes, rwrap->number_of_results);
   if (NIL_P(ruby_rc)) {
     db_rc = nogvl_dbresults(rwrap->client);
@@ -162,8 +167,8 @@ static RETCODE rb_tinytds_result_ok_helper(DBPROCESS *client) {
 }
 
 static void rb_tinytds_result_exec_helper(DBPROCESS *client) {
-  GET_CLIENT_USERDATA(client);
   RETCODE dbsqlok_rc = rb_tinytds_result_ok_helper(client);
+  GET_CLIENT_USERDATA(client);
   if (dbsqlok_rc == SUCCEED) {
     /*
     This is to just process each result set. Commands such as backup and
@@ -185,12 +190,13 @@ static void rb_tinytds_result_exec_helper(DBPROCESS *client) {
 }
 
 static VALUE rb_tinytds_result_fetch_row(VALUE self, ID timezone, int symbolize_keys, int as_array) {
+  VALUE row;
+  /* Storing Values */
+  unsigned int i;
   /* Wrapper And Local Vars */
   GET_RESULT_WRAPPER(self);
   /* Create Empty Row */
-  VALUE row = as_array ? rb_ary_new2(rwrap->number_of_fields) : rb_hash_new();
-  /* Storing Values */
-  unsigned int i = 0;
+  row = as_array ? rb_ary_new2(rwrap->number_of_fields) : rb_hash_new();
   for (i = 0; i < rwrap->number_of_fields; i++) {
     VALUE val = Qnil;
     int col = i+1;
@@ -238,7 +244,7 @@ static VALUE rb_tinytds_result_fetch_row(VALUE self, ID timezone, int symbolize_
           DBMONEY *money = (DBMONEY *)data;
           char converted_money[25];
           long long money_value = ((long long)money->mnyhigh << 32) | money->mnylow;
-          sprintf(converted_money, "%lld", money_value);
+          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(val, intern_divide, 1, opt_tenk);
           break;
@@ -270,22 +276,50 @@ static VALUE rb_tinytds_result_fetch_row(VALUE self, ID timezone, int symbolize_
           data_len = sizeof(new_data);
         }
         case SYBDATETIME: {
-          DBDATEREC date_rec;
-          dbdatecrack(rwrap->client, &date_rec, (DBDATETIME *)data);
-          int year  = date_rec.dateyear,
-              month = date_rec.datemonth+1,
-              day   = date_rec.datedmonth,
-              hour  = date_rec.datehour,
-              min   = date_rec.dateminute,
-              sec   = date_rec.datesecond,
-              msec  = date_rec.datemsecond;
-          if (year+month+day+hour+min+sec+msec != 0) {
-            VALUE offset = (timezone == intern_local) ? rwrap->local_offset : opt_zero;
-            uint64_t seconds = (year*31557600ULL) + (month*2592000ULL) + (day*86400ULL) + (hour*3600ULL) + (min*60ULL) + sec;
-            val = rb_funcall(rb_cTime, timezone, 7, INT2NUM(year), INT2NUM(month), INT2NUM(day), INT2NUM(hour), INT2NUM(min), INT2NUM(sec), INT2NUM(msec*1000));
+          DBDATEREC dr;
+          dbdatecrack(rwrap->client, &dr, (DBDATETIME *)data);
+          if (dr.year + dr.month + dr.day + dr.hour + dr.minute + dr.second + dr.millisecond != 0) {
+            val = rb_funcall(rb_cTime, timezone, 7, INT2NUM(dr.year), INT2NUM(dr.month), INT2NUM(dr.day), INT2NUM(dr.hour), INT2NUM(dr.minute), INT2NUM(dr.second), INT2NUM(dr.millisecond*1000));
           }
           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
+                  VALUE rational_sec = rb_Rational(INT2NUM(dr2.nanosecond), 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));
+                  break;
+                }
+              }
+            } else {
+              val = ENCODED_STR_NEW(data, data_len);
+            }
+          #else
+            val = ENCODED_STR_NEW(data, data_len);
+          #endif
+          break;
+        }
         case SYBCHAR:
         case SYBTEXT:
           val = ENCODED_STR_NEW(data, data_len);
@@ -314,10 +348,12 @@ static VALUE rb_tinytds_result_fetch_row(VALUE self, ID timezone, int symbolize_
 // TinyTds::Client (public)
 
 static VALUE rb_tinytds_result_fields(VALUE self) {
+  RETCODE dbsqlok_rc, dbresults_rc;
+  VALUE fields_processed;
   GET_RESULT_WRAPPER(self);
-  RETCODE dbsqlok_rc = rb_tinytds_result_ok_helper(rwrap->client);
-  RETCODE dbresults_rc = rb_tinytds_result_dbresults_retcode(self);
-  VALUE fields_processed = rb_ary_entry(rwrap->fields_processed, rwrap->number_of_results);
+  dbsqlok_rc = rb_tinytds_result_ok_helper(rwrap->client);
+  dbresults_rc = rb_tinytds_result_dbresults_retcode(self);
+  fields_processed = rb_ary_entry(rwrap->fields_processed, rwrap->number_of_results);
   if ((dbsqlok_rc == SUCCEED) && (dbresults_rc == SUCCEED) && (fields_processed == Qnil)) {
     /* Default query options. */
     int symbolize_keys = 0;
@@ -353,12 +389,13 @@ static VALUE rb_tinytds_result_fields(VALUE self) {
 }
 
 static VALUE rb_tinytds_result_each(int argc, VALUE * argv, VALUE self) {
-  GET_RESULT_WRAPPER(self);
-  GET_CLIENT_USERDATA(rwrap->client);
   /* Local Vars */
   VALUE qopts, opts, block;
   ID timezone;
   int symbolize_keys = 0, as_array = 0, cache_rows = 0, first = 0, empty_sets = 0;
+  tinytds_client_userdata *userdata;
+  GET_RESULT_WRAPPER(self);
+  userdata = (tinytds_client_userdata *)dbgetuserdata(rwrap->client);
   /* Merge Options Hash To Query Options. Populate Opts & Block Var. */
   qopts = rb_iv_get(self, "@query_options");
   if (rb_scan_args(argc, argv, "01&", &opts, &block) == 1)
@@ -385,9 +422,10 @@ static VALUE rb_tinytds_result_each(int argc, VALUE * argv, VALUE self) {
     empty_sets = 1;
   /* Make The Results Or Yield Existing */
   if (NIL_P(rwrap->results)) {
+    RETCODE dbsqlok_rc, dbresults_rc;
     rwrap->results = rb_ary_new();
-    RETCODE dbsqlok_rc = rb_tinytds_result_ok_helper(rwrap->client);
-    RETCODE dbresults_rc = rb_tinytds_result_dbresults_retcode(self);
+    dbsqlok_rc = rb_tinytds_result_ok_helper(rwrap->client);
+    dbresults_rc = rb_tinytds_result_dbresults_retcode(self);
     while ((dbsqlok_rc == SUCCEED) && (dbresults_rc == SUCCEED)) {
       int has_rows = (DBROWS(rwrap->client) == SUCCEED) ? 1 : 0;
       if (has_rows || empty_sets || (rwrap->number_of_results == 0))
@@ -447,8 +485,9 @@ static VALUE rb_tinytds_result_each(int argc, VALUE * argv, VALUE self) {
 }
 
 static VALUE rb_tinytds_result_cancel(VALUE self) {
+  tinytds_client_userdata *userdata;
   GET_RESULT_WRAPPER(self);
-  GET_CLIENT_USERDATA(rwrap->client);
+  userdata = (tinytds_client_userdata *)dbgetuserdata(rwrap->client);
   if (rwrap->client && !userdata->dbcancel_sent) {
     RETCODE dbsqlok_rc = rb_tinytds_result_ok_helper(rwrap->client);
     dbcancel(rwrap->client);
@@ -490,8 +529,8 @@ static VALUE rb_tinytds_result_return_code(VALUE self) {
 static VALUE rb_tinytds_result_insert(VALUE self) {
   GET_RESULT_WRAPPER(self);
   if (rwrap->client) {
-    rb_tinytds_result_exec_helper(rwrap->client);
     VALUE identity = Qnil;
+    rb_tinytds_result_exec_helper(rwrap->client);
     dbcmd(rwrap->client, rwrap->cwrap->identity_insert_sql);
     if (nogvl_dbsqlexec(rwrap->client) != FAIL
       && nogvl_dbresults(rwrap->client) != FAIL
@@ -538,7 +577,6 @@ void init_tinytds_result() {
   intern_new_offset = rb_intern("new_offset");
   intern_plus = rb_intern("+");
   intern_divide = rb_intern("/");
-  intern_Rational = rb_intern("Rational");
   /* Symbol Helpers */
   sym_symbolize_keys = ID2SYM(rb_intern("symbolize_keys"));
   sym_as = ID2SYM(rb_intern("as"));
@@ -558,8 +596,10 @@ void init_tinytds_result() {
   opt_zero = INT2NUM(0);
   opt_four = INT2NUM(4);
   opt_19hdr = INT2NUM(1900);
+  opt_onek = INT2NUM(1000);
   opt_tenk = INT2NUM(10000);
   opt_onemil = INT2NUM(1000000);
+  opt_onebil = INT2NUM(1000000000);
   /* Encoding */
   #ifdef HAVE_RUBY_ENCODING_H
     binaryEncoding = rb_enc_find("binary");