tiny_tds 0.6.2-x86-mingw32 → 0.6.3.rc2-x86-mingw32

data/ext/tiny_tds/client.c

@@ -73,9 +73,9 @@ int tinytds_err_handler(DBPROCESS *dbproc, int severity, int dberr, int oserr, c
       /*
       SYBETIME is the only error that can send INT_TIMEOUT or INT_CONTINUE,
       but we don't ever want to automatically retry. Instead have the app
-      decide what to do. We would use INT_TIMEOUT, however it seems tdserror()
-      in tds/util.c converts INT_TIMEOUT to INT_CONTINUE.
+      decide what to do.
       */
+      return_value = INT_TIMEOUT;
       cancel = 1;
       break;
 
@@ -233,7 +233,7 @@ static VALUE rb_tinytds_execute(VALUE self, VALUE sql) {
   GET_CLIENT_WRAPPER(self);
   rb_tinytds_client_reset_userdata(cwrap->userdata);
   REQUIRE_OPEN_CLIENT(cwrap);
-  dbcmd(cwrap->client, StringValuePtr(sql));
+  dbcmd(cwrap->client, StringValueCStr(sql));
   if (dbsqlsend(cwrap->client) == FAIL) {
     rb_warn("TinyTds: dbsqlsend() returned FAIL.\n");
     return Qfalse;
@@ -316,25 +316,25 @@ static VALUE rb_tinytds_connect(VALUE self, VALUE opts) {
   if (!NIL_P(version))
     dbsetlversion(cwrap->login, NUM2INT(version));
   if (!NIL_P(user))
-    dbsetluser(cwrap->login, StringValuePtr(user));
+    dbsetluser(cwrap->login, StringValueCStr(user));
   if (!NIL_P(pass))
-    dbsetlpwd(cwrap->login, StringValuePtr(pass));
+    dbsetlpwd(cwrap->login, StringValueCStr(pass));
   if (!NIL_P(app))
-    dbsetlapp(cwrap->login, StringValuePtr(app));
+    dbsetlapp(cwrap->login, StringValueCStr(app));
   if (!NIL_P(ltimeout))
     dbsetlogintime(NUM2INT(ltimeout));
   if (!NIL_P(timeout))
     dbsettime(NUM2INT(timeout));
   if (!NIL_P(charset))
-    DBSETLCHARSET(cwrap->login, StringValuePtr(charset));
+    DBSETLCHARSET(cwrap->login, StringValueCStr(charset));
   if (!NIL_P(database) && (azure == Qtrue)) {
     #ifdef DBSETLDBNAME
-      DBSETLDBNAME(cwrap->login, StringValuePtr(database));
+      DBSETLDBNAME(cwrap->login, StringValueCStr(database));
     #else
       rb_warn("TinyTds: Azure connections not supported in this version of FreeTDS.\n");
     #endif
   }
-  cwrap->client = dbopen(cwrap->login, StringValuePtr(dataserver));
+  cwrap->client = dbopen(cwrap->login, StringValueCStr(dataserver));
   if (cwrap->client) {
     cwrap->closed = 0;
     cwrap->charset = charset;
@@ -343,10 +343,10 @@ static VALUE rb_tinytds_connect(VALUE self, VALUE opts) {
     dbsetuserdata(cwrap->client, (BYTE*)cwrap->userdata);
     cwrap->userdata->closed = 0;
     if (!NIL_P(database) && (azure != Qtrue)) {
-      dbuse(cwrap->client, StringValuePtr(database));
+      dbuse(cwrap->client, StringValueCStr(database));
     }
     VALUE transposed_encoding = rb_funcall(cTinyTdsClient, intern_transpose_iconv_encoding, 1, charset);
-    cwrap->encoding = rb_enc_find(StringValuePtr(transposed_encoding));
+    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 {

data/ext/tiny_tds/extconf.rb

@@ -3,10 +3,54 @@ 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"},
+  "current" => {:files => "ftp://ftp.freetds.org/pub/freetds/current/freetds-current.tar.gz"}
+})
+FREETDS_SOURCE_URI = FREETDS_VERSION_INFO[FREETDS_VERSION][:files]
 
 # Shamelessly copied from nokogiri
 #
 
+def do_help
+  print <<HELP
+usage: ruby #{$0} [options]
+
+    --enable-system-freetds / --disable-system-freetds
+    --enable-system-iconv / --disable-system-iconv
+    --enable-system-openssl / --disable-system-openssl
+        Force use of system or builtin freetds/iconv/openssl library.
+        Default is to prefer system libraries and fallback to builtin.
+
+    --with-freetds-dir=DIR
+        Use the freetds library placed under DIR.
+
+    --enable-lookup
+        Search for freetds through all paths in the PATH environment variable.
+
+    --enable-cross-build
+        Do cross-build.
+HELP
+  exit! 0
+end
+
+do_help if arg_config('--help')
+
 FREETDSDIR = ENV['FREETDS_DIR']
 
 if FREETDSDIR.nil? || FREETDSDIR.empty?
@@ -40,6 +84,144 @@ def searchable_paths_with_directories(*directories)
   end.flatten.compact
 end
 
+class BuildRecipe < MiniPortile
+  def initialize(name, version, files)
+    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.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')
+  end
+
+  def configure_defaults
+    [
+      "--host=#{host}",    # build for specific target (host)
+      "--disable-static",
+      "--enable-shared",
+    ]
+  end
+
+  def port_path
+    "#{target}/#{host}"
+  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.
+  def chdir_for_build
+    build_dir = ENV['RCD_HOST_RUBY_PLATFORM'].to_s =~ /mingw|mswin|cygwin/ ? '/tmp' : '.'
+    Dir.chdir(build_dir) do
+      yield
+    end
+  end
+
+  def cook_and_activate
+    checkpoint = File.join(self.target, "#{self.name}-#{self.version}-#{self.host}.installed")
+    unless File.exist?(checkpoint)
+      chdir_for_build do
+        self.cook
+      end
+      FileUtils.touch checkpoint
+    end
+    self.activate
+    self
+  end
+end
+
+def define_libssl_recipe(host)
+  BuildRecipe.new("openssl", OPENSSL_VERSION, [OPENSSL_SOURCE_URI]).tap do |recipe|
+    class << recipe
+      def extract_file(file, target)
+        filename = File.basename(file)
+        FileUtils.mkdir_p target
+
+        message "Extracting #{filename} into #{target}... "
+        result = `#{tar_exe} #{tar_compression_switch(filename)}xf "#{file}" -C "#{target}" 2>&1`
+        if $?.success?
+          output "OK"
+        else
+          # tar on windows returns error exit code, because it can not extract symlinks
+          output "ERROR (ignored)"
+        end
+      end
+
+      def configure
+        config = if host=~/mingw/
+          host=~/x86_64/ ? 'mingw64' : 'mingw'
+        end
+        args = [ "CFLAGS=-DDSO_WIN32",
+            "./Configure",
+            "no-shared",
+            configure_prefix,
+            config,
+          ]
+        args.unshift("CROSS_COMPILE=#{host}-") if enable_config("cross-build")
+
+        execute "configure", "sh -c \"#{args.join(" ")}\""
+      end
+
+      def compile
+        super
+        # OpenSSL DLLs are called "libeay32.dll" and "ssleay32.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 = 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"
+      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}/libcrypto.dll.a", "#{path}/lib/"
+        FileUtils.cp "#{work_path}/libssl.dll.a", "#{path}/lib/"
+      end
+    end
+  end
+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"
+  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"
+    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
+    recipe.configure_options << '--sysconfdir=C:/Sites' if for_windows
+    recipe.configure_options << '--enable-sspi' if for_windows
+    recipe.configure_options << "--disable-odbc"
+    recipe.configure_options << with_tdsver
+    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\""
+    end
+  end
+end
+
 if RbConfig::CONFIG['target_os'] =~ /mswin32|mingw32/
   lib_prefix = 'lib' unless RbConfig::CONFIG['target_os'] =~ /mingw32/
   # There's no default include/lib dir on Windows. Let's just add the Ruby ones
@@ -77,10 +259,8 @@ FREETDS_LIB_DIRS = (searchable_paths_with_directories(['lib'],['lib','freetds'])
 # lookup over searchable paths is great for native compilation, however, when
 # cross compiling we need to specify our own paths.
 if enable_config("lookup", true)
-  dir_config('iconv',   FREETDS_HEADER_DIRS, FREETDS_LIB_DIRS)
   dir_config('freetds', FREETDS_HEADER_DIRS, FREETDS_LIB_DIRS)
 else
-  dir_config('iconv')
   dir_config('freetds')
 
   # remove LDFLAGS
@@ -91,11 +271,28 @@ def asplode(lib)
   abort "-----\n#{lib} is missing.\n-----"
 end
 
-asplode 'libiconv' unless have_func('iconv_open', 'iconv.h') || have_library('iconv', 'iconv_open', 'iconv.h')
-asplode 'freetds'  unless have_header('sybfront.h') && have_header('sybdb.h')
+def freetds_usable?(lib_prefix)
+  have_header('sybfront.h') && have_header('sybdb.h') &&
+    find_library("#{lib_prefix}sybdb", 'tdsdbopen') &&
+    find_library("#{lib_prefix}ct",    'ct_bind')
+end
+
+# We use freetds, when available already, and fallback to compilation of ports
+system_freetds = enable_config('system-freetds', ENV['TINYTDS_SKIP_PORTS'] || freetds_usable?(lib_prefix))
+
+# We expect to have iconv and OpenSSL available on non-Windows systems
+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 )
+
+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
+  dir_config('freetds', freetds.path + "/include", freetds.path + "/lib")
+end
 
-asplode 'freetds'  unless find_library("#{lib_prefix}sybdb", 'tdsdbopen')
-asplode 'freetds'  unless find_library("#{lib_prefix}ct",    'ct_bind')
+asplode 'freetds'  unless freetds_usable?(lib_prefix)
 
 create_makefile('tiny_tds/tiny_tds')
 

data/ext/tiny_tds/result.c

@@ -2,23 +2,12 @@
 #include <tiny_tds_ext.h>
 #include <stdint.h>
 
-// TINY_TDS_MAX_TIME
-
-#define TINY_TDS_MAX_TIME 315607276799ULL
-
-
-// TINY_TDS_MIN_TIME
-
-#define TINY_TDS_MIN_TIME 2678400ULL
-
-
 // File Types/Vars
 
 VALUE cTinyTdsResult;
 extern VALUE mTinyTds, cTinyTdsClient, cTinyTdsError;
-VALUE cBigDecimal, cDate, cDateTime;
+VALUE cBigDecimal, cDate;
 VALUE opt_decimal_zero, opt_float_zero, opt_one, opt_zero, opt_four, opt_19hdr, opt_tenk, opt_onemil;
-int   opt_ruby_186;
 static ID intern_new, intern_utc, intern_local, intern_localtime, intern_merge,
           intern_civil, intern_new_offset, intern_plus, intern_divide, intern_Rational;
 static ID sym_symbolize_keys, sym_as, sym_array, sym_cache_rows, sym_first, sym_timezone, sym_local, sym_utc, sym_empty_sets;
@@ -78,7 +67,7 @@ VALUE rb_tinytds_new_result_obj(tinytds_client_wrapper *cwrap) {
 // No GVL Helpers
 
 #define NOGVL_DBCALL(_dbfunction, _client) ( \
-  (RETCODE)rb_thread_blocking_region( \
+  (RETCODE)rb_thread_call_without_gvl( \
     (rb_blocking_function_t*)_dbfunction, _client, \
     (rb_unblock_function_t*)dbcancel_ubf, _client ) \
 )
@@ -293,25 +282,7 @@ static VALUE rb_tinytds_result_fetch_row(VALUE self, ID timezone, int symbolize_
           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;
-            /* Use DateTime */
-            if (seconds < TINY_TDS_MIN_TIME || seconds > TINY_TDS_MAX_TIME) {
-              VALUE datetime_sec = INT2NUM(sec);
-              if (msec != 0) {
-                if ((opt_ruby_186 == 1 && sec < 59) || (opt_ruby_186 != 1)) {
-                  #ifdef HAVE_RUBY_ENCODING_H
-                    VALUE rational_msec = rb_Rational2(INT2NUM(msec*1000), opt_onemil);
-                  #else
-                    VALUE rational_msec = rb_funcall(rb_cObject, intern_Rational, 2, INT2NUM(msec*1000), opt_onemil);
-                  #endif
-                  datetime_sec = rb_funcall(datetime_sec, intern_plus, 1, rational_msec);
-                }
-              }
-              val = rb_funcall(cDateTime, intern_civil, 7, INT2NUM(year), INT2NUM(month), INT2NUM(day), INT2NUM(hour), INT2NUM(min), datetime_sec, offset);
-              val = rb_funcall(val, intern_new_offset, 1, offset);
-            /* Use Time */
-            } else {
-              val = rb_funcall(rb_cTime, timezone, 7, INT2NUM(year), INT2NUM(month), INT2NUM(day), INT2NUM(hour), INT2NUM(min), INT2NUM(sec), INT2NUM(msec*1000));
-            }
+            val = rb_funcall(rb_cTime, timezone, 7, INT2NUM(year), INT2NUM(month), INT2NUM(day), INT2NUM(hour), INT2NUM(min), INT2NUM(sec), INT2NUM(msec*1000));
           }
           break;
         }
@@ -547,7 +518,6 @@ void init_tinytds_result() {
   /* Data Classes */
   cBigDecimal = rb_const_get(rb_cObject, rb_intern("BigDecimal"));
   cDate = rb_const_get(rb_cObject, rb_intern("Date"));
-  cDateTime = rb_const_get(rb_cObject, rb_intern("DateTime"));
   /* Define TinyTds::Result */
   cTinyTdsResult = rb_define_class_under(mTinyTds, "Result", rb_cObject);
   /* Define TinyTds::Result Public Methods */
@@ -590,8 +560,6 @@ void init_tinytds_result() {
   opt_19hdr = INT2NUM(1900);
   opt_tenk = INT2NUM(10000);
   opt_onemil = INT2NUM(1000000);
-  /* Ruby version flags */
-  opt_ruby_186 = (rb_eval_string("RUBY_VERSION == '1.8.6'") == Qtrue) ? 1 : 0;
   /* Encoding */
   #ifdef HAVE_RUBY_ENCODING_H
     binaryEncoding = rb_enc_find("binary");

data/lib/tiny_tds.rb

@@ -9,11 +9,30 @@ require 'tiny_tds/client'
 require 'tiny_tds/result'
 
 # Support multiple ruby versions, fat binaries under Windows.
-begin
-  RUBY_VERSION =~ /(\d+.\d+)/
-  require "tiny_tds/#{$1}/tiny_tds"
-rescue LoadError
+if RUBY_PLATFORM =~ /mingw|mswin/ && RUBY_VERSION =~ /(\d+.\d+)/
+  ver = $1
+  # Set the PATH environment variable, so that the DLLs can be found.
+  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')
+    ENV['PATH'] = "#{File.expand_path("../../ports/#{ports_dir}/bin", __FILE__)};#{old_path}"
+    require "tiny_tds/#{ver}/tiny_tds"
+  rescue LoadError
+    require 'tiny_tds/tiny_tds'
+  ensure
+    ENV['PATH'] = old_path
+  end
+else
+  # Load dependent shared libraries into the process, so that they are already present,
+  # when tiny_tds.so is loaded. This ensures, that shared libraries are loaded even when
+  # the path is different between build and run time (e.g. Heroku).
+  ports_libs = File.expand_path("../../ports/#{RbConfig::CONFIG["host"]}/lib/*.so", __FILE__)
+  Dir[ports_libs].each do |lib|
+    require "fiddle"
+    Fiddle.dlopen(lib)
+  end
+
   require 'tiny_tds/tiny_tds'
 end
-
-

data/lib/tiny_tds/client.rb

@@ -1,9 +1,9 @@
 module TinyTds
   class Client
-    
+
     # From sybdb.h comments:
     # DBVERSION_xxx are used with dbsetversion()
-    # 
+    #
     TDS_VERSIONS_SETTERS = {
       'unknown' => 0,
       '46'      => 1,
@@ -19,7 +19,7 @@ module TinyTds
     # 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'},
@@ -33,7 +33,7 @@ module TinyTds
       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,
@@ -41,32 +41,29 @@ module TinyTds
       :timezone => :local,
       :empty_sets => true
     }
-    
+
     attr_reader :query_options
-    
+
     class << self
-      
+
       def default_query_options
         @@default_query_options
       end
 
-      # 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 
+      # 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
-      
+
     end
 
 
     def initialize(opts={})
-      if opts[:password] && opts[:password].to_s.strip != ''
-        opts[:password] = opts[:password].to_s
-        warn 'FreeTDS may have issues with passwords longer than 30 characters!' if opts[:password].length > 30
-      end
       raise ArgumentError, 'missing :host option if no :dataserver given' if opts[:dataserver].to_s.empty? && opts[:host].to_s.empty?
       @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[:login_timeout] ||= 60
@@ -76,7 +73,7 @@ module TinyTds
       opts[:dataserver] = "#{opts[:host]}:#{opts[:port]}" if opts[:dataserver].to_s.empty?
       connect(opts)
     end
-    
+
     def tds_version_info
       info = TDS_VERSIONS_GETTERS[tds_version]
       "#{info[:name]} - #{info[:description]}" if info
@@ -86,11 +83,12 @@ module TinyTds
       !closed? && !dead?
     end
 
+
     private
-    
+
     def self.local_offset
       ::Time.local(2010).utc_offset.to_r / 86400
     end
-    
+
   end
 end