tiny_tds 0.6.0.rc1 → 0.6.0

data/CHANGELOG

@@ -1,6 +1,18 @@
 
 * 0.6.0 *
 
+* Use dbsetversion() vs. dbsetlversion. Fixes #62.
+
+* Remove Ruby 1.8 and 32-bit support.
+
+* Implement misc rb_thread_blocking_region support. Fixes #121. Thanks @lepfhty.
+
+* Test FreeTDS v0.91.89 patch release.
+
+* Fix lost connection handling. Fixes #124. Thanks @krzcho.
+
+* Remove unused variable. Fixes #103. Thanks @jeremyevans.
+
 * Remove need to specify username for Windows Authentication.
 
 * Use proper SQL for returning IDENTITY with Sybase. Fixes #95.

data/Gemfile

@@ -1,6 +1,3 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gemspec
-
-gem 'm', :platform => :ruby_19
-

data/README.md

@@ -13,7 +13,7 @@ The API is simple and consists of these classes:
 
 ## Install
 
-Installing with rubygems should just work. TinyTDS is tested on ruby version 1.8.6, 1.8.7, 1.9.1, 1.9.2, 1.9.3 as well as REE & JRuby.
+Installing with rubygems should just work. TinyTDS is tested on ruby version 1.9 and upward. Older versions are tested with 1.8.x. We also test everynow and then on JRuby and RBX.
 
 ```
 $ gem install tiny_tds
@@ -66,7 +66,7 @@ Creating a new client takes a hash of options. For valid iconv encoding options,
 * :port - Defaults to 1433. Only used if :host is used.
 * :database - The default database to use.
 * :appname - Short string seen in SQL Servers process/activity window.
-* :tds_version - TDS version. Defaults to 71 (7.1) and is not recommended to change!
+* :tds_version - TDS version. Defaults to "71" (7.1) and is not recommended to change!
 * :login_timeout - Seconds to wait for login. Default to 60 seconds.
 * :timeout - Seconds to wait for a response to a SQL command. Default 5 seconds.
 * :encoding - Any valid iconv value like CP1251 or ISO-8859-1. Default UTF-8.
@@ -111,7 +111,6 @@ result.each do |row|
   # By default each row is a hash.
   # The keys are the fields, as you'd expect.
   # The values are pre-built ruby primitives mapped from their corresponding types.
-  # Here's an leemer: http://is.gd/g61xo
 end
 ```
 
@@ -161,7 +160,7 @@ result.insert # => 420
 The result object can handle multiple result sets form batched SQL or stored procedures. It is critical to remember that when calling each with a block for the first time will return each "row" of each result set. Calling each a second time with a block will yield each "set".
 
 ```ruby
-sql = ["SELECT TOP (1) [id] FROM [datatypes]", 
+sql = ["SELECT TOP (1) [id] FROM [datatypes]",
        "SELECT TOP (2) [bigint] FROM [datatypes] WHERE [bigint] IS NOT NULL"].join(' ')
 
 set1, set2 = client.execute(sql).each
@@ -215,6 +214,7 @@ It is possible to get the return code after executing a stored procedure from ei
 client.return_code  # => nil
 
 result = client.execute("EXEC tinytds_TestReturnCodes")
+result.do
 result.return_code  # => 420
 client.return_code  # => 420
 ```
@@ -278,7 +278,7 @@ MiniPortile is a minimalistic, simplistic and stupid implementation of a port/re
 
 The TinyTDS project uses MiniPortile so that we can easily install a local "project specific" version of FreeTDS and supporting libraries to link against when building a test version of TinyTDS. MiniPortile is a great tool that even allows us to build statically linked components that TinyTDS relies on. Hence this allows us to publish native gems for any platform. We use this feature for gems targeted at Windows.
 
-You too can use MiniPortile to build TinyTDS and build your own gems for your own package management needs. Here is a few simple steps that assume you have cloned a fresh copy of this repository. 1) Bundling will install all the development dependencies. 2) Running `rake compile` will basically download and install a supported version of FreeTDS in our `ports.rake` file and supporting libraries. These will all be installed into the projects tmp directory. 3) The final `rake native gem` command will build a native gem for your specific platform. 4) The native gem can be found in the `pkg` directory. The last command assumes "X" is version numbers and #{platform} will be your platform.
+You too can use MiniPortile to build TinyTDS and build your own gems for your own package management needs. Here is a few simple steps that assume you have cloned a fresh copy of this repository. 1) Bundling will install all the development dependencies. 2) Running `rake compile` will basically download and install a supported version of FreeTDS in our `ports.rake` file and supporting libraries. These will all be installed into the projects tmp directory. 3) The final `rake native gem` command will build a native gem for your specific platform. 4) The native gem can be found in the `pkg` directory. The last command assumes "X" is version numbers and #{platform} will be your platform. Note that if you're using Windows make sure you are running these rake tasks with a Unix-style command line tool like [MSYS](http://www.mingw.org/wiki/MSYS).
 
 ```
 $ bundle install
@@ -294,7 +294,7 @@ It is also possible to build a specific version of FreeTDS for your own gem or d
 ```
 $ rake TINYTDS_FREETDS_VERSION="0.82"
 $ rake TINYTDS_FREETDS_VERSION="0.91"
-$ rake TINYTDS_FREETDS_VERSION="0.91.49"
+$ rake TINYTDS_FREETDS_VERSION="0.91.89"
 $ rake TINYTDS_FREETDS_VERSION="0.92.405"
 $ rake TINYTDS_FREETDS_VERSION="current"
 ```
@@ -302,7 +302,7 @@ $ rake TINYTDS_FREETDS_VERSION="current"
 To find out more about the FreeTDS release system [visit this thread](http://lists.ibiblio.org/pipermail/freetds/2012q1/027756.html) on their mailing list. You can also browse thier FTP server [ftp://ftp.astron.com/pub/freetds/](ftp://ftp.astron.com/pub/freetds/) for version number strings.
 
 
-## Development & Testing  
+## Development & Testing
 
 We use bundler for development. Simply run `bundle install` then `rake` to build the gem and run the unit tests. The tests assume you have created a database named `tinytdstest` accessible by a database owner named `tinytds`. Before running the test rake task, you may need to define a pair of environment variables that help the client connect to your specific FreeTDS database server name and which schema (2000, 2005, 2008, Azure or Sybase ASE) to use. For example:
 

data/Rakefile

@@ -8,13 +8,12 @@ require 'rubygems/package_task'
 
 # My notes for cross compile native Windows gem.
 # 
-# $ rbenv shell 1.8.7
 # $ git clean -x -d -f
 # $ bundle install
 # $ unalias rake-compiler && unalias rake
 # $ rake compile
-# $ rake cross compile RUBY_CC_VERSION=1.8.7:1.9.3
-# $ rake cross native gem RUBY_CC_VERSION=1.8.7:1.9.3
+# $ rake cross compile RUBY_CC_VERSION=1.9.3
+# $ rake cross native gem RUBY_CC_VERSION=1.9.3
 
 def test_libs
   ['lib','test']

data/ext/tiny_tds/client.c

@@ -1,4 +1,3 @@
-
 #include <tiny_tds_ext.h>
 #include <errno.h>
 
@@ -66,6 +65,7 @@ int tinytds_err_handler(DBPROCESS *dbproc, int severity, int dberr, int oserr, c
    case SYBEFCON:
    case SYBESOCK:
    case SYBECONN:
+   case SYBEREAD:
      return_value = INT_EXIT;
      break;
    case SYBESEOF: {
@@ -91,9 +91,6 @@ int tinytds_err_handler(DBPROCESS *dbproc, int severity, int dberr, int oserr, c
      cancel = 1;
      break;
    }
-   case SYBEREAD:
-     cancel = 1;
-     break;
  }
  rb_tinytds_raise_error(dbproc, cancel, dberrstr, source, severity, dberr, oserr);
  return return_value;
@@ -197,9 +194,7 @@ static VALUE rb_tinytds_execute(VALUE self, VALUE sql) {
   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);
-  #ifdef HAVE_RUBY_ENCODING_H
-    rwrap->encoding = cwrap->encoding;
-  #endif
+  rwrap->encoding = cwrap->encoding;
   return result;  
 }
 
@@ -210,20 +205,14 @@ static VALUE rb_tinytds_charset(VALUE self) {
 
 static VALUE rb_tinytds_encoding(VALUE self) {
   GET_CLIENT_WRAPPER(self);
-  #ifdef HAVE_RUBY_ENCODING_H
-    return rb_enc_from_encoding(cwrap->encoding);
-  #else
-    return Qnil;
-  #endif
+  return rb_enc_from_encoding(cwrap->encoding);
 }
 
 static VALUE rb_tinytds_escape(VALUE self, VALUE string) {
   Check_Type(string, T_STRING);
   GET_CLIENT_WRAPPER(self);
   VALUE new_string = rb_funcall(string, intern_gsub, 2, opt_escape_regex, opt_escape_dblquote);
-  #ifdef HAVE_RUBY_ENCODING_H
-    rb_enc_associate(new_string, cwrap->encoding);
-  #endif
+  rb_enc_associate(new_string, cwrap->encoding);
   return new_string;
 }
 
@@ -281,8 +270,6 @@ static VALUE rb_tinytds_connect(VALUE self, VALUE opts) {
     dbsetlpwd(cwrap->login, StringValuePtr(pass));
   if (!NIL_P(app))
     dbsetlapp(cwrap->login, StringValuePtr(app));
-  if (!NIL_P(version))
-    dbsetlversion(cwrap->login, NUM2INT(version));
   if (!NIL_P(ltimeout))
     dbsetlogintime(NUM2INT(ltimeout));
   if (!NIL_P(timeout))
@@ -300,15 +287,15 @@ static VALUE rb_tinytds_connect(VALUE self, VALUE opts) {
   if (cwrap->client) {
     cwrap->closed = 0;
     cwrap->charset = charset;
+    if (!NIL_P(version))
+      dbsetversion(NUM2INT(version));
     dbsetuserdata(cwrap->client, (BYTE*)cwrap->userdata);
     cwrap->userdata->closed = 0;
     if (!NIL_P(database) && (azure != Qtrue)) {
       dbuse(cwrap->client, StringValuePtr(database));
     }
-    #ifdef HAVE_RUBY_ENCODING_H
-      VALUE transposed_encoding = rb_funcall(cTinyTdsClient, intern_transpose_iconv_encoding, 1, charset);
-      cwrap->encoding = rb_enc_find(StringValuePtr(transposed_encoding));
-    #endif
+    VALUE transposed_encoding = rb_funcall(cTinyTdsClient, intern_transpose_iconv_encoding, 1, charset);
+    cwrap->encoding = rb_enc_find(StringValuePtr(transposed_encoding));
     if (dbtds(cwrap->client) <= 7) {
       cwrap->identity_insert_sql = "SELECT CAST(@@IDENTITY AS bigint) AS Ident";
     } else {

data/ext/tiny_tds/client.h

@@ -21,9 +21,7 @@ typedef struct {
   VALUE charset;
   tinytds_client_userdata *userdata;
   const char *identity_insert_sql;
-  #ifdef HAVE_RUBY_ENCODING_H
-    rb_encoding *encoding;
-  #endif
+  rb_encoding *encoding;
 } tinytds_client_wrapper;
 
 

data/ext/tiny_tds/result.c

@@ -4,39 +4,12 @@
 
 // TINY_TDS_MAX_TIME
 
-#if (SIZEOF_INT < SIZEOF_LONG) || defined(HAVE_RUBY_ENCODING_H)
-  /* On 64bit platforms we can handle dates way outside 2038-01-19T03:14:07 */
-  /* (10000*31557600) + (12*2592000) + (31*86400) + (11*3600) + (59*60) + 59 */
-  #define TINY_TDS_MAX_TIME 315607276799ULL
-#else
-  /* On 32bit platforms the maximum date the Time class can handle is 2038-01-19T03:14:07 */
-  /* 2038 years + 1 month + 19 days + 3 hours + 14 minutes + 7 seconds = 64318634047 seconds */
-  /* (2038*31557600) + (1*2592000) + (19*86400) + (3*3600) + (14*60) + 7 */
-  #define TINY_TDS_MAX_TIME 64318634047ULL
-#endif
+#define TINY_TDS_MAX_TIME 315607276799ULL
 
 
 // TINY_TDS_MIN_TIME
 
-#if defined(HAVE_RUBY_ENCODING_H)
-  /* Ruby 1.9 */
-  /* 0000-1-1 00:00:00 UTC */
-  /* (0*31557600) + (1*2592000) + (1*86400) + (0*3600) + (0*60) + 0 */
-  #define TINY_TDS_MIN_TIME 2678400ULL
-#elif SIZEOF_INT < SIZEOF_LONG
-  /* 64bit Ruby 1.8 */
-  /* 0139-1-1 00:00:00 UTC */
-  /* (139*31557600) + (1*2592000) + (1*86400) + (0*3600) + (0*60) + 0 */
-  #define TINY_TDS_MIN_TIME 4389184800ULL
-#elif defined(NEGATIVE_TIME_T)
-  /* 1901-12-13 20:45:52 UTC : The oldest time in 32-bit signed time_t. */
-  /* (1901*31557600) + (12*2592000) + (13*86400) + (20*3600) + (45*60) + 52 */
-  #define TINY_TDS_MIN_TIME 60023299552ULL
-#else
-  /* 1970-01-01 00:00:01 UTC : The Unix epoch - the oldest time in portable time_t. */
-  /* (1970*31557600) + (1*2592000) + (1*86400) + (0*3600) + (0*60) + 1 */
-  #define TINY_TDS_MIN_TIME 62171150401ULL
-#endif
+#define TINY_TDS_MIN_TIME 2678400ULL
 
 
 // File Types/Vars
@@ -53,24 +26,17 @@ static ID sym_symbolize_keys, sym_as, sym_array, sym_cache_rows, sym_first, sym_
 
 // Lib Macros
 
-#ifdef HAVE_RUBY_ENCODING_H
-  rb_encoding *binaryEncoding;
-  #define ENCODED_STR_NEW(_data, _len) ({ \
-    VALUE _val = rb_str_new((char *)_data, (long)_len); \
-    rb_enc_associate(_val, rwrap->encoding); \
-    _val; \
-  })
-  #define ENCODED_STR_NEW2(_data2) ({ \
-    VALUE _val = rb_str_new2((char *)_data2); \
-    rb_enc_associate(_val, rwrap->encoding); \
-    _val; \
-  })
-#else
-  #define ENCODED_STR_NEW(_data, _len) \
-    rb_str_new((char *)_data, (long)_len)
-  #define ENCODED_STR_NEW2(_data2) \
-    rb_str_new2((char *)_data2)
-#endif
+rb_encoding *binaryEncoding;
+#define ENCODED_STR_NEW(_data, _len) ({ \
+  VALUE _val = rb_str_new((char *)_data, (long)_len); \
+  rb_enc_associate(_val, rwrap->encoding); \
+  _val; \
+})
+#define ENCODED_STR_NEW2(_data2) ({ \
+  VALUE _val = rb_str_new2((char *)_data2); \
+  rb_enc_associate(_val, rwrap->encoding); \
+  _val; \
+})
 
 
 // Lib Backend (Memory Management)
@@ -109,6 +75,40 @@ VALUE rb_tinytds_new_result_obj(tinytds_client_wrapper *cwrap) {
   return obj;
 }
 
+// No GVL Helpers
+
+#define NOGVL_DBCALL(_dbfunction, _client) ( \
+  (RETCODE)rb_thread_blocking_region( \
+    (rb_blocking_function_t*)nogvl_ ## _dbfunction, _client, \
+    (rb_unblock_function_t*)dbcancel_ubf, _client ) \
+)
+
+static RETCODE nogvl_dbsqlok(DBPROCESS *client) {
+  int retcode = FAIL;
+  GET_CLIENT_USERDATA(client);
+  retcode = dbsqlok(client);
+  userdata->dbsqlok_sent = 1;
+  return retcode;
+}
+
+static RETCODE nogvl_dbsqlexec(DBPROCESS *client) {
+  return dbsqlexec(client);
+}
+
+static RETCODE nogvl_dbresults(DBPROCESS *client) {
+  return dbresults(client);
+}
+
+static RETCODE nogvl_dbnextrow(DBPROCESS * client) {
+  return dbnextrow(client);
+}
+
+static void dbcancel_ubf(DBPROCESS *client) {
+  GET_CLIENT_USERDATA(client);
+  dbcancel(client);
+  userdata->dbcancel_sent = 1;
+  userdata->dbsql_sent = 0;
+}
 
 // Lib Backend (Helpers)
 
@@ -118,7 +118,7 @@ static RETCODE rb_tinytds_result_dbresults_retcode(VALUE self) {
   RETCODE db_rc;
   ruby_rc = rb_ary_entry(rwrap->dbresults_retcodes, rwrap->number_of_results);
   if (NIL_P(ruby_rc)) {
-    db_rc = dbresults(rwrap->client);
+    db_rc = NOGVL_DBCALL(dbresults, rwrap->client);
     ruby_rc = INT2FIX(db_rc);
     rb_ary_store(rwrap->dbresults_retcodes, rwrap->number_of_results, ruby_rc);
   } else {
@@ -130,8 +130,7 @@ static RETCODE rb_tinytds_result_dbresults_retcode(VALUE self) {
 static RETCODE rb_tinytds_result_ok_helper(DBPROCESS *client) {
   GET_CLIENT_USERDATA(client);
   if (userdata->dbsqlok_sent == 0) {
-    userdata->dbsqlok_retcode = dbsqlok(client);
-    userdata->dbsqlok_sent = 1;
+    userdata->dbsqlok_retcode = NOGVL_DBCALL(dbsqlok, client);
   }
   return userdata->dbsqlok_retcode;
 }
@@ -298,12 +297,10 @@ static VALUE rb_tinytds_result_fields(VALUE self) {
   VALUE 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, empty_sets = 1;
+    int symbolize_keys = 0;
     VALUE qopts = rb_iv_get(self, "@query_options");
     if (rb_hash_aref(qopts, sym_symbolize_keys) == Qtrue)
        symbolize_keys = 1;
-    if (rb_hash_aref(qopts, sym_empty_sets) == Qfalse)
-      empty_sets = 0;
     /* Set number_of_fields count for this result set. */
     rwrap->number_of_fields = dbnumcols(rwrap->client);
     if (rwrap->number_of_fields > 0) {
@@ -376,7 +373,7 @@ static VALUE rb_tinytds_result_each(int argc, VALUE * argv, VALUE self) {
         /* Create rows for this result set. */
         unsigned long rowi = 0;
         VALUE result = rb_ary_new();
-        while (dbnextrow(rwrap->client) != NO_MORE_ROWS) {
+        while (NOGVL_DBCALL(dbnextrow, rwrap->client) != NO_MORE_ROWS) {
           VALUE row = rb_tinytds_result_fetch_row(self, timezone, symbolize_keys, as_array);
           if (cache_rows)
             rb_ary_store(result, rowi, row);
@@ -409,7 +406,7 @@ static VALUE rb_tinytds_result_each(int argc, VALUE * argv, VALUE self) {
       } else {
         // If we do not find results, side step the rb_tinytds_result_dbresults_retcode helper and 
         // manually populate its memoized array while nullifing any memoized fields too before loop.
-        dbresults_rc = dbresults(rwrap->client);
+        dbresults_rc = NOGVL_DBCALL(dbresults, rwrap->client);
         rb_ary_store(rwrap->dbresults_retcodes, rwrap->number_of_results, INT2FIX(dbresults_rc));
         rb_ary_store(rwrap->fields_processed, rwrap->number_of_results, Qnil);
       }
@@ -469,8 +466,10 @@ static VALUE rb_tinytds_result_insert(VALUE self) {
     rb_tinytds_result_cancel_helper(rwrap->client);
     VALUE identity = Qnil;
     dbcmd(rwrap->client, rwrap->cwrap->identity_insert_sql);
-    if (dbsqlexec(rwrap->client) != FAIL && dbresults(rwrap->client) != FAIL && DBROWS(rwrap->client) != FAIL) {
-      while (dbnextrow(rwrap->client) != NO_MORE_ROWS) {
+    if (NOGVL_DBCALL(dbsqlexec, rwrap->client) != FAIL
+      && NOGVL_DBCALL(dbresults, rwrap->client) != FAIL
+      && DBROWS(rwrap->client) != FAIL) {
+      while (NOGVL_DBCALL(dbnextrow, rwrap->client) != NO_MORE_ROWS) {
         int col = 1;
         BYTE *data = dbdata(rwrap->client, col);
         DBINT data_len = dbdatlen(rwrap->client, col);

data/ext/tiny_tds/result.h

@@ -16,9 +16,7 @@ typedef struct {
   VALUE fields;
   VALUE fields_processed;
   VALUE results;
-  #ifdef HAVE_RUBY_ENCODING_H
-    rb_encoding *encoding;
-  #endif
+  rb_encoding *encoding;
   VALUE dbresults_retcodes;
   unsigned int number_of_results;
   unsigned int number_of_fields;

data/ext/tiny_tds/tiny_tds_ext.h

@@ -5,13 +5,10 @@
 #define SYBDBLIB
 
 #include <ruby.h>
+#include <ruby/encoding.h>
 #include <sybfront.h>
 #include <sybdb.h>
 
-#ifdef HAVE_RUBY_ENCODING_H
-#include <ruby/encoding.h>
-#endif
-
 #include <client.h>
 #include <result.h>
 

data/lib/tiny_tds/client.rb

@@ -1,6 +1,9 @@
 module TinyTds
   class Client
     
+    # From sybdb.h comments:
+    # DBVERSION_xxx are used with dbsetversion()
+    # 
     TDS_VERSIONS_SETTERS = {
       'unknown' => 0,
       '46'      => 1,
@@ -12,19 +15,23 @@ module TinyTds
       '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',     :description => 'Microsoft SQL Server 2000'},
-      10 => {:name => 'DBTDS_7_2',     :description => 'Microsoft SQL Server 2005'}
+      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 = {

data/lib/tiny_tds/version.rb

@@ -1,3 +1,3 @@
 module TinyTds
-  VERSION = '0.6.0.rc1'
+  VERSION = '0.6.0'
 end

data/tasks/ports.rake

@@ -23,7 +23,11 @@ namespace :ports do
 
   $recipes[:freetds] = MiniPortile.new "freetds", FREETDS_VERSION
   $recipes[:freetds].files << FREETDS_VERSION_INFO[FREETDS_VERSION][:files]
-  $recipes[:freetds].patch_files << File.expand_path(File.join('..', '..', 'ext', 'patch', 'sspi_w_kerberos.diff'), __FILE__) if $recipes[:freetds].respond_to?(:patch_files)
+  if $recipes[:freetds].respond_to?(:patch_files)
+    if FREETDS_VERSION == "0.91"
+      $recipes[:freetds].patch_files << File.expand_path(File.join('..', '..', 'ext', 'patch', 'sspi_w_kerberos.diff'), __FILE__) 
+    end
+  end
 
   desc "Compile libiconv support library"
   task :libiconv => ["ports"] do

data/test/client_test.rb

@@ -30,13 +30,13 @@ class ClientTest < TinyTds::TestCase
         assert_equal 'DBTDS_5_0 - 5.0 SQL Server', @client.tds_version_info
       else
         assert_equal 9, @client.tds_version
-        assert_equal 'DBTDS_7_1 - Microsoft SQL Server 2000', @client.tds_version_info
+        assert_equal 'DBTDS_7_1/DBTDS_8_0 - Microsoft SQL Server 2000', @client.tds_version_info
       end
     end
     
     it 'uses UTF-8 client charset/encoding by default' do
       assert_equal 'UTF-8', @client.charset
-      assert_equal Encoding.find('UTF-8'), @client.encoding if ruby19?
+      assert_equal Encoding.find('UTF-8'), @client.encoding
     end
     
     it 'has a #escape method used for quote strings' do
@@ -47,7 +47,7 @@ class ClientTest < TinyTds::TestCase
       ['CP850', 'CP1252', 'ISO-8859-1'].each do |encoding|
         client = new_connection(:encoding => encoding)
         assert_equal encoding, client.charset
-        assert_equal Encoding.find(encoding), client.encoding if ruby19?
+        assert_equal Encoding.find(encoding), client.encoding
       end
     end
     

data/test/result_test.rb

@@ -74,6 +74,15 @@ class ResultTest < TinyTds::TestCase
       assert_instance_of Array, row
       assert_equal [:one], result.fields
     end
+
+    it 'allows sql concat + to work' do
+      rollback_transaction(@client) do
+        @client.execute("DELETE FROM [datatypes]").do
+        @client.execute("INSERT INTO [datatypes] ([char_10], [varchar_50]) VALUES ('1', '2')").do
+        result = @client.execute("SELECT TOP (1) [char_10] + 'test' + [varchar_50] AS [test] FROM [datatypes]").each.first['test']
+        result.must_equal "1         test2"
+      end
+    end
     
     it 'must be able to turn :cache_rows option off' do
       result = @client.execute(@query1)

data/test/schema_test.rb

@@ -8,7 +8,7 @@ class SchemaTest < TinyTds::TestCase
     before do
       @@current_schema_loaded ||= load_current_schema
       @client = new_connection
-      @gif1px = ruby19? ? File.read('test/schema/1px.gif',:mode=>"rb:BINARY") : File.read('test/schema/1px.gif')
+      @gif1px = File.read('test/schema/1px.gif',:mode=>"rb:BINARY")
     end
   
     describe 'for shared types' do
@@ -39,77 +39,40 @@ class SchemaTest < TinyTds::TestCase
       end
       
       it 'casts datetime' do
-        if ruby18? && ruby32bit?
-          # 1753-01-01T00:00:00.000
-          v = find_value 61, :datetime
-          assert_instance_of DateTime, v, 'not in range of Time class'
-          assert_equal 1753, v.year
-          assert_equal 01, v.month
-          assert_equal 01, v.day
-          assert_equal 0, v.hour
-          assert_equal 0, v.min
-          assert_equal 0, v.sec
-          assert_equal 0, v.usec
-          # 9999-12-31T23:59:59.997
-          v = find_value 62, :datetime
-          assert_instance_of DateTime, v, 'not in range of Time class'
-          assert_equal 9999, v.year
-          assert_equal 12, v.month
-          assert_equal 31, v.day
-          assert_equal 23, v.hour
-          assert_equal 59, v.min
-          assert_equal 59, v.sec
-          assert_equal 997000, v.usec unless ruby186?
-          assert_equal local_offset, find_value(62, :datetime, :timezone => :local).offset
-          assert_equal 0, find_value(62, :datetime, :timezone => :utc).offset
-          # 2010-01-01T12:34:56.123
-          v = find_value 63, :datetime
-          assert_instance_of Time, v, 'in range of Time class'
-          assert_equal 2010, v.year
-          assert_equal 01, v.month
-          assert_equal 01, v.day
-          assert_equal 12, v.hour
-          assert_equal 34, v.min
-          assert_equal 56, v.sec
-          assert_equal 123000, v.usec
-          assert_equal utc_offset, find_value(63, :datetime, :timezone => :local).utc_offset
-          assert_equal 0, find_value(63, :datetime, :timezone => :utc).utc_offset
-        else
-          # 1753-01-01T00:00:00.000
-          v = find_value 61, :datetime
-          assert_instance_of Time, v, 'not in range of Time class'
-          assert_equal 1753, v.year
-          assert_equal 01, v.month
-          assert_equal 01, v.day
-          assert_equal 0, v.hour
-          assert_equal 0, v.min
-          assert_equal 0, v.sec
-          assert_equal 0, v.usec
-          # 9999-12-31T23:59:59.997
-          v = find_value 62, :datetime
-          assert_instance_of Time, v, 'not in range of Time class'
-          assert_equal 9999, v.year
-          assert_equal 12, v.month
-          assert_equal 31, v.day
-          assert_equal 23, v.hour
-          assert_equal 59, v.min
-          assert_equal 59, v.sec
-          assert_equal 997000, v.usec unless ruby186?
-          assert_equal utc_offset, find_value(62, :datetime, :timezone => :local).utc_offset
-          assert_equal 0, find_value(62, :datetime, :timezone => :utc).utc_offset
-          # 2010-01-01T12:34:56.123
-          v = find_value 63, :datetime
-          assert_instance_of Time, v, 'in range of Time class'
-          assert_equal 2010, v.year
-          assert_equal 01, v.month
-          assert_equal 01, v.day
-          assert_equal 12, v.hour
-          assert_equal 34, v.min
-          assert_equal 56, v.sec
-          assert_equal 123000, v.usec
-          assert_equal utc_offset, find_value(63, :datetime, :timezone => :local).utc_offset
-          assert_equal 0, find_value(63, :datetime, :timezone => :utc).utc_offset
-        end
+        # 1753-01-01T00:00:00.000
+        v = find_value 61, :datetime
+        assert_instance_of Time, v, 'not in range of Time class'
+        assert_equal 1753, v.year
+        assert_equal 01, v.month
+        assert_equal 01, v.day
+        assert_equal 0, v.hour
+        assert_equal 0, v.min
+        assert_equal 0, v.sec
+        assert_equal 0, v.usec
+        # 9999-12-31T23:59:59.997
+        v = find_value 62, :datetime
+        assert_instance_of Time, v, 'not in range of Time class'
+        assert_equal 9999, v.year
+        assert_equal 12, v.month
+        assert_equal 31, v.day
+        assert_equal 23, v.hour
+        assert_equal 59, v.min
+        assert_equal 59, v.sec
+        assert_equal 997000, v.usec
+        assert_equal utc_offset, find_value(62, :datetime, :timezone => :local).utc_offset
+        assert_equal 0, find_value(62, :datetime, :timezone => :utc).utc_offset
+        # 2010-01-01T12:34:56.123
+        v = find_value 63, :datetime
+        assert_instance_of Time, v, 'in range of Time class'
+        assert_equal 2010, v.year
+        assert_equal 01, v.month
+        assert_equal 01, v.day
+        assert_equal 12, v.hour
+        assert_equal 34, v.min
+        assert_equal 56, v.sec
+        assert_equal 123000, v.usec
+        assert_equal utc_offset, find_value(63, :datetime, :timezone => :local).utc_offset
+        assert_equal 0, find_value(63, :datetime, :timezone => :utc).utc_offset
       end
       
       it 'casts decimal' do
@@ -183,53 +146,28 @@ class SchemaTest < TinyTds::TestCase
       end
       
       it 'casts smalldatetime' do
-        if ruby18? && ruby32bit?
-          # 1901-01-01 15:45:00
-          v = find_value 231, :smalldatetime
-          assert_instance_of DateTime, v
-          assert_equal 1901, v.year
-          assert_equal 01, v.month
-          assert_equal 01, v.day
-          assert_equal 15, v.hour
-          assert_equal 45, v.min
-          assert_equal 00, v.sec
-          assert_equal local_offset, find_value(231, :smalldatetime, :timezone => :local).offset
-          assert_equal 0, find_value(231, :smalldatetime, :timezone => :utc).offset
-          # 2078-06-05 04:20:00
-          v = find_value 232, :smalldatetime
-          assert_instance_of DateTime, v
-          assert_equal 2078, v.year
-          assert_equal 06, v.month
-          assert_equal 05, v.day
-          assert_equal 04, v.hour
-          assert_equal 20, v.min
-          assert_equal 00, v.sec
-          assert_equal local_offset, find_value(232, :smalldatetime, :timezone => :local).offset
-          assert_equal 0, find_value(232, :smalldatetime, :timezone => :utc).offset
-        else
-          # 1901-01-01 15:45:00
-          v = find_value 231, :smalldatetime
-          assert_instance_of Time, v
-          assert_equal 1901, v.year
-          assert_equal 01, v.month
-          assert_equal 01, v.day
-          assert_equal 15, v.hour
-          assert_equal 45, v.min
-          assert_equal 00, v.sec
-          assert_equal Time.local(1901).utc_offset, find_value(231, :smalldatetime, :timezone => :local).utc_offset
-          assert_equal 0, find_value(231, :smalldatetime, :timezone => :utc).utc_offset
-          # 2078-06-05 04:20:00
-          v = find_value 232, :smalldatetime
-          assert_instance_of Time, v
-          assert_equal 2078, v.year
-          assert_equal 06, v.month
-          assert_equal 05, v.day
-          assert_equal 04, v.hour
-          assert_equal 20, v.min
-          assert_equal 00, v.sec
-          assert_equal Time.local(2078,6).utc_offset, find_value(232, :smalldatetime, :timezone => :local).utc_offset
-          assert_equal 0, find_value(232, :smalldatetime, :timezone => :utc).utc_offset
-        end
+        # 1901-01-01 15:45:00
+        v = find_value 231, :smalldatetime
+        assert_instance_of Time, v
+        assert_equal 1901, v.year
+        assert_equal 01, v.month
+        assert_equal 01, v.day
+        assert_equal 15, v.hour
+        assert_equal 45, v.min
+        assert_equal 00, v.sec
+        assert_equal Time.local(1901).utc_offset, find_value(231, :smalldatetime, :timezone => :local).utc_offset
+        assert_equal 0, find_value(231, :smalldatetime, :timezone => :utc).utc_offset
+        # 2078-06-05 04:20:00
+        v = find_value 232, :smalldatetime
+        assert_instance_of Time, v
+        assert_equal 2078, v.year
+        assert_equal 06, v.month
+        assert_equal 05, v.day
+        assert_equal 04, v.hour
+        assert_equal 20, v.min
+        assert_equal 00, v.sec
+        assert_equal Time.local(2078,6).utc_offset, find_value(232, :smalldatetime, :timezone => :local).utc_offset
+        assert_equal 0, find_value(232, :smalldatetime, :timezone => :utc).utc_offset
       end
       
       it 'casts smallint' do

data/test/test_helper.rb

@@ -1,18 +1,11 @@
 # encoding: UTF-8
-require 'rubygems'
-require 'bundler'
-Bundler.setup
+require 'bundler' ; Bundler.require :development, :test
 require 'tiny_tds'
-require 'minitest/spec'
 require 'minitest/autorun'
 
 class DateTime
   def usec
-    if RUBY_VERSION >= '1.9'
-      (sec_fraction * 1_000_000).to_i
-    else
-      (sec_fraction * 60 * 60 * 24 * (10**6)).to_i
-    end
+    (sec_fraction * 1_000_000).to_i
   end
 end
 
@@ -77,6 +70,7 @@ module TinyTds
       { :dataserver    => ENV['TINYTDS_UNIT_DATASERVER'],
         :host          => ENV['TINYTDS_UNIT_HOST'],
         :port          => ENV['TINYTDS_UNIT_PORT'],
+        :tds_version   => ENV['TINYTDS_UNIT_VERSION'],
         :username      => username,
         :password      => password,
         :database      => 'tinytdstest',
@@ -118,31 +112,11 @@ module TinyTds
     end
     
     def assert_binary_encoding(value)
-      assert_equal Encoding.find('BINARY'), value.encoding if ruby19?
+      assert_equal Encoding.find('BINARY'), value.encoding
     end
     
     def assert_utf8_encoding(value)
-      assert_equal Encoding.find('UTF-8'), value.encoding if ruby19?
-    end
-    
-    def ruby18?
-      RUBY_VERSION < '1.9'
-    end
-    
-    def ruby186?
-      RUBY_VERSION == '1.8.6'
-    end
-    
-    def ruby19?
-      RUBY_VERSION >= '1.9'
-    end
-    
-    def ruby192?
-      RUBY_VERSION == '1.9.2'
-    end
-    
-    def ruby32bit?
-      1.size == 4
+      assert_equal Encoding.find('UTF-8'), value.encoding
     end
     
     def rubyRbx?
@@ -152,8 +126,7 @@ module TinyTds
     def load_current_schema
       loader = new_connection
       schema_file = File.expand_path File.join(File.dirname(__FILE__), 'schema', "#{current_schema}.sql")
-      schema_sql = ruby18? ? File.read(schema_file) : File.open(schema_file,"rb:UTF-8") { |f|f.read }
-
+      schema_sql = File.open(schema_file,"rb:UTF-8") { |f|f.read }
       loader.execute(drop_sql).each
       loader.execute(schema_sql).cancel
       loader.execute(sp_sql).cancel

data/test/thread_test.rb

@@ -0,0 +1,44 @@
+require 'test_helper'
+require 'logger'
+require 'benchmark'
+
+class ThreadTest < TinyTds::TestCase
+
+  describe 'Threaded SELECT queries' do
+
+    before do
+      @logger = Logger.new $stdout
+      @logger.level = Logger::WARN
+      @poolsize = 4
+      @numthreads = 10
+      @query = "waitfor delay '00:00:01'"
+      @pool = ConnectionPool.new(:size => @poolsize, :timeout => 5) { new_connection }
+    end
+
+    it 'should finish faster in parallel' do
+      x = Benchmark.realtime do
+        threads = []
+        @numthreads.times do |i|
+          start = Time.new
+          threads << Thread.new do
+            ts = Time.new
+            @pool.with do |client|
+              result = client.execute @query
+              result.each { |r| puts r }
+            end
+            te = Time.new
+            @logger.info "Thread #{i} finished in #{te - ts} thread seconds, #{te - start} real seconds"
+          end
+        end
+        threads.each { |t| t.join }
+      end
+      assert x < @numthreads, "#{x} is not faster than #{@numthreads} seconds"
+      mintime = (1.0*@numthreads/@poolsize).ceil
+      @logger.info "#{@numthreads} queries on #{@poolsize} threads: #{x} sec. Minimum time: #{mintime} sec."
+      assert x > mintime, "#{x} is not slower than #{mintime} seconds"
+    end
+
+  end
+
+end
+

metadata

@@ -1,118 +1,126 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: tiny_tds
-version: !ruby/object:Gem::Version 
-  hash: 911843707
-  prerelease: 6
-  segments: 
-  - 0
-  - 6
-  - 0
-  - rc
-  - 1
-  version: 0.6.0.rc1
+version: !ruby/object:Gem::Version
+  prerelease: 
+  version: 0.6.0
 platform: ruby
-authors: 
+authors:
 - Ken Collins
 - Erik Bryn
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-11-21 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-07-07 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 9
-        - 2
+      - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
   name: mini_portile
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.0
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 5
-        - 0
+      - !ruby/object:Gem::Version
         version: 0.5.0
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
   name: rake-compiler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.8.1
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 61
-        segments: 
-        - 0
-        - 8
-        - 1
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 0.8.1
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
   name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
   name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: connection_pool
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
   type: :development
-  version_requirements: *id005
-description: TinyTDS - A modern, simple and fast FreeTDS library for Ruby using DB-Library. Developed for the ActiveRecord SQL Server adapter.
-email: 
+description: TinyTDS - A modern, simple and fast FreeTDS library for Ruby using DB-Library.
+  Developed for the ActiveRecord SQL Server adapter.
+email:
 - ken@metaskills.net
 executables: []
-
-extensions: 
+extensions:
 - ext/tiny_tds/extconf.rb
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - CHANGELOG
 - Gemfile
 - MIT-LICENSE
-- NOTES
 - README.md
 - Rakefile
 - ext/patch/sspi_w_kerberos.diff
@@ -142,43 +150,33 @@ files:
 - test/schema/sybase_ase.sql
 - test/schema_test.rb
 - test/test_helper.rb
-has_rdoc: true
+- test/thread_test.rb
 homepage: http://github.com/rails-sqlserver/tiny_tds
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      hash: 25
-      segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: TinyTDS - A modern, simple and fast FreeTDS library for Ruby using DB-Library.
-test_files: 
+test_files:
 - test/benchmark/query.rb
 - test/benchmark/query_odbc.rb
 - test/benchmark/query_tinytds.rb
@@ -192,3 +190,4 @@ test_files:
 - test/schema/sybase_ase.sql
 - test/schema_test.rb
 - test/test_helper.rb
+- test/thread_test.rb

data/NOTES

@@ -1,11 +0,0 @@
-
-TODO
-  
-  * Client & Connection
-    - Make a #ping method that does the "SELECT 1" when not closed.
-    - Interrupt handler to cancel a bad SELECT * or long SQL. Maybe use dbsetinterrupt
-    - Integrate rb_thread_blocking_region where we can in your extension for proper threading in 1.9.2
-    
-  * Result Set
-    - See if we can make a binary string of [timestamp] type.
-