tiny_tds 0.4.5 → 0.5.0.rc1

data/.gitignore

@@ -11,6 +11,7 @@ tmp
 vendor
 lib/tiny_tds/tiny_tds.rb
 .rvmrc
+.rbenv-version
 Gemfile.lock
 misc
 *.gem

data/CHANGELOG

@@ -1,4 +1,24 @@
 
+* 0.5.0 *
+
+* Copy mysql2s handling of Time and Datetime so 64bit systems are leveraged. Fixes #46 and #47. Thanks @lsylvester!
+
+* Add CFLAGS='-fPIC' for libtool. Fix TDS version configs in our ports file. Document. Fixes #45
+
+* Update our TDS version constants to reflect changed 8.0/9.0 to 7.1/7.2 DBLIB versions in FreeTDS 
+  while making it backward compatible, again like FreeTDS. Even tho you can not configure FreeTDS with
+  TDS version 7.2 or technically even use it, I added tests to prove that we correctly handle both
+  varchar(max) and nvarchar(max) with large amounts of data.
+
+* FreeTDS 0.91 has been released. Update our port scripts.
+
+* Add test for 0.91 and higher to handle incorrect syntax in sp_executesql.
+
+* Returning empty result sets with a command batch that has multiple statements is now the default. Use :empty_sets => false to override.
+
+* Do not raise a TinyTds::Error with our message handler unless the severity is greater than 10.
+
+
 * 0.4.5 *
 
 * Includes precompiled Windows binaries for FreeTDS 0.91rc2 & LibIconv. No precompiled OpenSSL yet for Windows to SQL Azure.
@@ -28,7 +48,8 @@
 
 * 0.4.2 *
 
-* Iconv is a dep only when compiling locally. However, left in the ability to configure it for native gem installation but you must use --enable-iconv before using --with-iconv-dir=/some/dir
+* Iconv is a dep only when compiling locally. However, left in the ability to configure it for native gem installation 
+  but you must use --enable-iconv before using --with-iconv-dir=/some/dir
 
 * Really fix what 0.4.1 was supposed to do, force SYBDBLIB compile.
 

data/Gemfile

@@ -4,18 +4,11 @@ source :rubygems
 group :development do
   gem 'rake', '0.8.7'
   gem 'mini_portile', '0.2.2'
-  gem 'rake-compiler', '0.7.8'
+  gem 'rake-compiler', '0.7.9'
 end
 
 group :test do
   gem 'mini_shoulda', '0.3.0'
   gem 'activesupport', '2.3.5'
   gem 'bench_press', '0.3.1'
-  platforms :mri_18 do
-    gem 'ruby-prof', '0.9.1'
-    gem 'ruby-debug', '0.10.3'
-  end
-  platforms :mri_19 do
-    gem 'ruby-debug19', '0.11.6'
-  end
 end

data/README.rdoc

@@ -1,7 +1,6 @@
-
 = TinyTDS - A modern, simple and fast FreeTDS library for Ruby using DB-Library.
 
-The TinyTDS gem is meant to serve the extremely common use-case of connecting, querying and iterating over results to Microsoft SQL Server databases from ruby. Even though it uses FreeTDS's DB-Library, it is NOT meant to serve as direct 1:1 mapping of that complex C API.
+The TinyTDS gem is meant to serve the extremely common use-case of connecting, querying and iterating over results to Microsoft SQL Server databases from ruby. Even though it uses FreeTDS's DB-Library, it is NOT meant to serve as direct 1:1 mapping of that C API.
 
 The benefits are speed, automatic casting to ruby primitives, and proper encoding support. It converts all SQL Server datatypes to native ruby objects supporting :utc or :local time zones for time-like types. To date it is the only ruby client library that allows client encoding options, defaulting to UTF-8, while connecting to SQL Server. It also  properly encodes all string and binary data. The motivation for TinyTDS is to become the de-facto low level connection mode for the SQL Server adapter for ActiveRecord. For further details see the special thanks section at the bottom
 
@@ -12,6 +11,7 @@ The API is simple and consists of these classes:
 * TinyTds::Error - A wrapper for all FreeTDS exceptions.
 
 
+
 == New & Noteworthy
 
 * Works with FreeTDS 0.91
@@ -19,9 +19,10 @@ The API is simple and consists of these classes:
 * New :host/:port connection options. Removes need for freetds.conf file.
 
 
+
 == 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 as well as REE & JRuby.
+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.
 
     $ gem install tiny_tds
 
@@ -29,9 +30,19 @@ Although we search for FreeTDS's libraries and headers, you may have to specify
 
 
 
-== FreeTDS Compatibility
+== FreeTDS Compatibility & Configuration
+
+TinyTDS is developed against FreeTDS 0.82 & 0.91, the latest is recommended. It is tested with SQL Server 2000, 2005, 2008 and Azure. Below are a few QA style notes about installing FreeTDS.
+
+* <b>Do I need to install FreeTDS?</b> Yes! Somehow, someway, your are going to need FreeTDS for TinyTDS to compile against. You can avoid installing FreeTDS on your system by using our projects usage of rake-compiler and mini_portile to compile and package a native gem just for you. See the "Using MiniPortile" section below.
+
+* <b>OK, I am installing FreeTDS, how do I configure it?</b> Contrary to what most people think, you do not need to specially configure FreeTDS in any way for client libraries like TinyTDS to use it. About the only requirement is that you compile it with libiconv for proper encoding support. FreeTDS must also be compiled with OpenSSL (or the like) to use it with Azure. See the "Using TinyTDS with Azure" section below for more info.
 
-TinyTDS is developed for FreeTDS 0.82 & 0.91. It is tested with SQL Server 2000, 2005, 2008 and Azure using TDS Version 8.0. We utilize FreeTDS's db-lib client library. We compile against sybdb.h, undefine MSDBLIB and define SYBDBLIB which means that internally we conform to sybase API to db-lib. TinyTDS will work for both Sybase & Miscrosoft SQL Server. You do NOT need to compile FreeTDS with the "--enable-msdblib" option for our client to work properly. However, please make sure to compile FreeTDS with libiconv support for encodings to work at their best. Run "tsql -C" in your console and check for "iconv library: yes".
+* <b>Do I need to configure "--with-tdsver" equal to anything?</b> Maybe! Technically you should not have too. This is only a default for clients/configs that do not specify what TDS version they want to use. We are currently having issues with passing down a TDS version with the login bit. Till we get that fixed, if you are not using a freetds.conf or a TDSVER environment variable, the make sure to use 7.1 for FreeTDS 0.91 and 8.0 for FreeTDS 0.82.
+
+* <b>But I want to use TDS version 7.2 for SQL Server 2005 and up!</b> TinyTDS uses TDS version 7.1 (previously named 8.0) and fully supports all the data types supported by FreeTDS, this includes varchar(max) and nvarchar(max). Technically compiling and using TDS version 7.2 with FreeTDS is not supported. But this does not mean those data types will not work. I know, it's confusing If you want to learn more, read this thread. http://lists.ibiblio.org/pipermail/freetds/2011q3/027306.html
+
+* <b>I want to configure FreeTDS using "--enable-msdblib" and/or "--enable-sybase-compat" so it works for my database. Cool?</b> It's a waste of time and totally moot! Client libraries like TinyTDS define their own C structure names where they diverge from Sybase to SQL Server. Technically we use the Sybase structures which does not mean we only work with that database vs SQL Server. These configs are just a low level default for C libraries that do not define what they want. So I repeat, you do not NEED to use any of these, nor will they hurt anything since we control what C structure names we use and this has no affect on what database you use!
 
 
 
@@ -63,7 +74,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 80, 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.
@@ -202,6 +213,7 @@ Every TinyTds::Result object can pass query options to the #each method. The def
 * :symbolize_keys => false - Row hash keys. Defaults to shared/frozen string keys.
 * :cache_rows => true - Successive calls to #each returns the cached rows.
 * :timezone => :local - Local to the ruby client or :utc for UTC.
+* :empty_sets => true - Include empty results set in queries that return multiple result sets.
 
 Each result gets a copy of the default options you specify at the client level and can be overridden by passing an options hash to the #each method. For example
   
@@ -227,7 +239,8 @@ By default row caching is turned on because the SQL Server adapter for ActiveRec
 
 As of version 2.3.11 & 3.0.3 of the adapter, you can specify a :dblib mode in database.yml and use TinyTDS as the low level connection mode. The SQL Server adapter can be found using the link below. Also included is a direct link to the wiki article covering common questions when using TinyTDS as the low level connection mode for the adapter.
 
-http://github.com/rails-sqlserver/activerecord-sqlserver-adapter/wiki/Using-TinyTds
+* ActiveRecord SQL Server Adapter: http://github.com/rails-sqlserver/activerecord-sqlserver-adapter
+* Using TinyTDS: http://github.com/rails-sqlserver/activerecord-sqlserver-adapter/wiki/Using-TinyTds
 
 
 
@@ -237,6 +250,20 @@ TinyTDS is fully tested with the Azure platform. You must set the :azure => true
 
 
 
+== Using MiniPortile
+
+MiniPortile is a minimalistic, simplistic and stupid implementation of a port/recipe system for developers. <https://github.com/luislavena/mini_portile>
+
+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.
+
+  $ bundle install
+  $ rake compile
+  $ rake native gem
+
+
+
 == 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 or azure) to use. For example:
@@ -245,23 +272,26 @@ We use bundler for development. Simply run "bundle install" then "rake" to build
     or
   $ rake TINYTDS_UNIT_HOST=mydb.host.net TINYTDS_SCHEMA=sqlserver_azure
 
-If you do not want to use MiniPortile to compile a local project version of FreeTDS, use the TINYTDS_SKIP_PORTS environment variable. This will ignore any port tasks and will instead look for your systems FreeTDS installation as a normal gem install would.
+If you do not want to use MiniPortile to compile a local project version of FreeTDS and instead use your local system version, use the TINYTDS_SKIP_PORTS environment variable. This will ignore any port tasks and will instead build and link to your system's FreeTDS installation as a normal gem install would.
 
   $ rake TINYTDS_SKIP_PORTS=true
 
-For help and support.
+
+
+== Help & Support
 
 * Github Source: http://github.com/rails-sqlserver/tiny_tds
 * Github Issues: http://github.com/rails-sqlserver/tiny_tds/issues
 * Google Group: http://groups.google.com/group/rails-sqlserver-adapter
 * IRC Room: #rails-sqlserver on irc.freenode.net
 
-Current to do list.
+
+
+== TODO List
 
 * Include OpenSSL with Windows binaries for SQL Azure.
 * Install an interrupt handler.
 * Allow #escape to accept all ruby primitives.
-* Get bug reports!
 
 
 
@@ -278,3 +308,10 @@ My name is Ken Collins and I currently maintain the SQL Server adapter for Activ
 * Yehuda Katz for articulating ruby's need for proper encoding support. Especially in database drivers - http://yehudakatz.com/2010/05/05/ruby-1-9-encodings-a-primer-and-the-solution-for-rails/
 * Josh Clayton of Thoughtbot for writing about ruby C extensions. - http://robots.thoughtbot.com/post/1037240922/get-your-c-on
 
+
+
+== License
+
+TinyTDS is Copyright (c) 2010-2011 Ken Collins, <ken@metaskills.net> and is distributed under the MIT license. Windows binaries contain precompiled versions of FreeTDS <http://www.freetds.org/> which is licensed under the GNU LGPL license at <http://www.gnu.org/licenses/lgpl-2.0.html>
+
+

data/Rakefile

@@ -6,6 +6,17 @@ require 'rake/testtask'
 require 'rake/extensiontask'
 require "rubygems/package_task"
 
+# My notes for cross compile native Windows gem.
+# 
+# $ rake-compiler cross-ruby VERSION=1.8.7-p352
+# $ rake-compiler cross-ruby VERSION=1.9.2-p290
+# 
+# $ git clean -x -d -f
+# $ bundle install
+# $ ~/.rbenv/shims/rake compile
+# $ ~/.rbenv/shims/rake cross compile RUBY_CC_VERSION=1.8.7:1.9.2
+# $ ~/.rbenv/shims/rake cross native gem RUBY_CC_VERSION=1.8.7:1.9.2
+
 def test_libs
   ['lib','test']
 end

data/ext/tiny_tds/client.c

@@ -54,6 +54,8 @@ int tinytds_err_handler(DBPROCESS *dbproc, int severity, int dberr, int oserr, c
  int return_value = INT_CONTINUE;
  int cancel = 0;
  switch(dberr) {
+   case 100: /* SYBEVERDOWN */
+     return INT_CANCEL;
    case SYBESMSG:
      return return_value;
    case SYBEICONVI:
@@ -96,7 +98,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";
-  if (severity)
+  if (severity > 10)
     rb_tinytds_raise_error(dbproc, 1, msgtext, source, severity, msgno, msgstate);
   return 0;
 }
@@ -232,6 +234,14 @@ static VALUE rb_tinytds_return_code(VALUE self) {
   }
 }
 
+static VALUE rb_tinytds_freetds_nine_one_or_higher(VALUE self) {
+  #ifdef DBSETLDBNAME
+    return Qtrue;
+  #else
+    return Qfalse;
+  #endif
+}
+
 
 // TinyTds::Client (protected) 
 
@@ -313,6 +323,7 @@ void init_tinytds_client() {
   rb_define_method(cTinyTdsClient, "encoding", rb_tinytds_encoding, 0);
   rb_define_method(cTinyTdsClient, "escape", rb_tinytds_escape, 1);
   rb_define_method(cTinyTdsClient, "return_code", rb_tinytds_return_code, 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/result.c

@@ -1,6 +1,45 @@
 
 #include <tiny_tds_ext.h>
 
+// 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
+
+
+// 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
+
+
+// File Types/Vars
+
 VALUE cTinyTdsResult;
 extern VALUE mTinyTds, cTinyTdsClient, cTinyTdsError;
 VALUE cBigDecimal, cDate, cDateTime;
@@ -8,7 +47,7 @@ VALUE opt_decimal_zero, opt_float_zero, opt_one, opt_zero, opt_four, opt_19hdr,
 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;
+static ID sym_symbolize_keys, sym_as, sym_array, sym_cache_rows, sym_first, sym_timezone, sym_local, sym_utc, sym_empty_sets;
 
 
 // Lib Macros
@@ -200,8 +239,9 @@ static VALUE rb_tinytds_result_fetch_row(VALUE self, ID timezone, int symbolize_
               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;
             /* Use DateTime */
-            if (year < 1902 || year+month+day > 2058) {
+            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)) {
@@ -256,8 +296,12 @@ 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;
     VALUE qopts = rb_iv_get(self, "@query_options");
-    int symbolize_keys = (rb_hash_aref(qopts, sym_symbolize_keys) == Qtrue) ? 1 : 0;
+    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) {
@@ -292,7 +336,7 @@ static VALUE rb_tinytds_result_each(int argc, VALUE * argv, VALUE self) {
   /* Local Vars */
   VALUE qopts, opts, block;
   ID timezone;
-  int symbolize_keys = 0, as_array = 0, cache_rows = 0, first = 0;
+  int symbolize_keys = 0, as_array = 0, cache_rows = 0, first = 0, empty_sets = 0;
   /* 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)
@@ -315,6 +359,8 @@ static VALUE rb_tinytds_result_each(int argc, VALUE * argv, VALUE self) {
     rb_warn(":timezone option must be :utc or :local - defaulting to :local");
     timezone = intern_local;
   }
+  if (rb_hash_aref(qopts, sym_empty_sets) == Qtrue)
+    empty_sets = 1;
   /* Make The Results Or Yield Existing */
   if (NIL_P(rwrap->results)) {
     rwrap->results = rb_ary_new();
@@ -322,8 +368,9 @@ static VALUE rb_tinytds_result_each(int argc, VALUE * argv, VALUE self) {
     RETCODE dbresults_rc = rb_tinytds_result_dbresults_retcode(self);
     while ((dbsqlok_rc == SUCCEED) && (dbresults_rc == SUCCEED)) {
       int has_rows = (DBROWS(rwrap->client) == SUCCEED) ? 1 : 0;
-      rb_tinytds_result_fields(self);
-      if (has_rows && rwrap->number_of_fields > 0) {
+      if (has_rows || empty_sets || (rwrap->number_of_results == 0))
+        rb_tinytds_result_fields(self);
+      if ((has_rows || empty_sets) && rwrap->number_of_fields > 0) {
         /* Create rows for this result set. */
         unsigned long rowi = 0;
         VALUE result = rb_ary_new();
@@ -356,6 +403,7 @@ static VALUE rb_tinytds_result_each(int argc, VALUE * argv, VALUE self) {
         // If we find results increment the counter that helpers use and setup the next loop.
         rwrap->number_of_results = rwrap->number_of_results + 1;
         dbresults_rc = rb_tinytds_result_dbresults_retcode(self);
+        rb_ary_store(rwrap->fields_processed, rwrap->number_of_results, Qnil);
       } 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.
@@ -473,6 +521,7 @@ void init_tinytds_result() {
   sym_local = ID2SYM(intern_local);
   sym_utc = ID2SYM(intern_utc);
   sym_timezone = ID2SYM(rb_intern("timezone"));
+  sym_empty_sets = ID2SYM(rb_intern("empty_sets"));
   /* Data Conversion Options */
   opt_decimal_zero = rb_str_new2("0.0");
   rb_global_variable(&opt_decimal_zero);

data/ext/tiny_tds/result.h

@@ -2,8 +2,9 @@
 #ifndef TINYTDS_RESULT_H
 #define TINYTDS_RESULT_H
 
-// TODO: Is this needed?
-typedef tds_sysdep_int64_type DBBIGINT;  /* Missing in sybdb.h ?!?! */
+#ifndef DBSETLDBNAME
+  typedef tds_sysdep_int64_type DBBIGINT;  /* For FreeTDS 0.82 */
+#endif
 
 void init_tinytds_result();
 VALUE rb_tinytds_new_result_obj(DBPROCESS *c);

data/lib/tiny_tds/client.rb

@@ -7,8 +7,10 @@ module TinyTds
       '100'     => 2,
       '42'      => 3,
       '70'      => 4,
+      '71'      => 5,
       '80'      => 5,
-      '90'      => 6  # TODO: untested
+      '72'      => 6,
+      '90'      => 6
     }.freeze
     
     TDS_VERSIONS_GETTERS = {
@@ -21,28 +23,33 @@ module TinyTds
       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_8_0',     :description => 'Microsoft SQL Server 2000'},
-      10 => {:name => 'DBTDS_9_0',     :description => 'Microsoft SQL Server 2005'}
+      9  => {:name => 'DBTDS_7_1',     :description => 'Microsoft SQL Server 2000'},
+      10 => {:name => 'DBTDS_7_2',     :description => 'Microsoft SQL Server 2005'}
     }.freeze
     
     @@default_query_options = {
       :as => :hash,
       :symbolize_keys => false,
       :cache_rows => true,
-      :timezone => :local
+      :timezone => :local,
+      :empty_sets => true
     }
     
     attr_reader :query_options
     
-    def self.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 
-    # is to return the passed encoding.
-    def self.transpose_iconv_encoding(encoding)
-      encoding
+    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 
+      # is to return the passed encoding.
+      def transpose_iconv_encoding(encoding)
+        encoding
+      end
+      
     end
 
 
@@ -51,7 +58,7 @@ module TinyTds
       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[:appname] ||= 'TinyTds'
-      opts[:tds_version] = TDS_VERSIONS_SETTERS[opts[:tds_version].to_s] || TDS_VERSIONS_SETTERS['80']
+      opts[:tds_version] = TDS_VERSIONS_SETTERS[opts[:tds_version].to_s] || TDS_VERSIONS_SETTERS['71']
       opts[:login_timeout] ||= 60
       opts[:timeout] ||= 5
       opts[:encoding] = (opts[:encoding].nil? || opts[:encoding].downcase == 'utf8') ? 'UTF-8' : opts[:encoding].upcase

data/lib/tiny_tds/version.rb

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

data/tasks/ports.rake

@@ -2,12 +2,15 @@ require "mini_portile"
 require "rake/extensioncompiler"
 
 namespace :ports do
-
+  
+  # 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 = "1.13.1"
   FREETDS_VERSION = ENV['TINYTDS_FREETDS_082'] ? "0.82" : "0.91"
   FREETDS_VERSION_INFO = {
-    "0.82" => {:files => "http://ibiblio.org/pub/Linux/ALPHA/freetds/stable/freetds-stable.tgz"},
-    "0.91" => {:files => "http://ibiblio.org/pub/Linux/ALPHA/freetds/stable/release_candidates/freetds-0.91RC2.tar.gz"} }
+    "0.82" => {:files => "http://ibiblio.org/pub/Linux/ALPHA/freetds/old/0.82/freetds-0.82.tar.gz"},
+    # "0.82" => {:files => "http://ibiblio.org/pub/Linux/ALPHA/freetds/old/0.82/freetds-patched.tgz"},
+    "0.91" => {:files => "http://ibiblio.org/pub/Linux/ALPHA/freetds/stable/freetds-0.91.tar.gz"} }
 
   ORIGINAL_HOST = RbConfig::CONFIG["arch"]
 
@@ -25,6 +28,7 @@ namespace :ports do
     recipe = $recipes[:libiconv]
     checkpoint = "ports/.#{recipe.name}.#{recipe.version}.#{recipe.host}.timestamp"
     unless File.exist?(checkpoint)
+      recipe.configure_options << "CFLAGS='-fPIC'"
       recipe.cook
       touch checkpoint
     end
@@ -39,7 +43,12 @@ namespace :ports do
       # recipe.configure_options << "--disable-debug"
       recipe.configure_options << '--sysconfdir="C:/Sites"' if recipe.host != ORIGINAL_HOST
       recipe.configure_options << "--disable-odbc"
-      recipe.configure_options << "--with-tdsver=7.1"
+      if ENV['TINYTDS_FREETDS_082']
+        recipe.configure_options << "--with-tdsver=8.0"
+      else
+        recipe.configure_options << "--with-tdsver=7.1"
+      end
+      recipe.configure_options << "CFLAGS='-fPIC'"
       recipe.cook
       touch checkpoint
     end

data/test/benchmark/query_tinytds.rb

@@ -84,28 +84,43 @@ end
 
 =begin
 
+Query Tinytds
+=============
+Author: Ken Collins  
+Date: September 11, 2011  
+Summary: Benchmark TinyTds Querys  
+
 System Information
 ------------------
-    Operating System:    Mac OS X 10.6.4 (10F569)
-    CPU:                 Intel Core 2 Duo 2.4 GHz
-    Processor Count:     2
-    Memory:              4 GB
-    ruby 1.8.7 (2010-08-16 patchlevel 302) [i686-darwin10.4.0]
+    Operating System:    Mac OS X 10.7.1 (11B26)
+    CPU:                 Quad-Core Intel Xeon 2.66 GHz
+    Processor Count:     4
+    Memory:              24 GB
+    ruby 1.8.7 (2011-02-18 patchlevel 334) [i686-darwin11.1.0], MBARI 0x6770, Ruby Enterprise Edition 2011.03
 
-"Nothing" is up to 89% faster over 1,000 repetitions
 ----------------------------------------------------
-
-    Nothing     0.357741832733154 secs    Fastest
-    Guids       0.460683107376099 secs    22% Slower
-    Bits        0.483309984207153 secs    25% Slower
-    Floats      0.505340099334717 secs    29% Slower
-    Moneys      0.523844003677368 secs    31% Slower
-    Integers    0.616975069046021 secs    42% Slower
-    Binaries    0.639773845672607 secs    44% Slower
-    Decimals    0.670897960662842 secs    46% Slower
-    Chars       0.800287008285522 secs    55% Slower
-    Dates       0.950634956359863 secs    62% Slower
-    All         2.91044211387634  secs    87% Slower
+    (before 64bit times)                    (after 64bit times)
+    Nothing     0.287657022476196 secs      Nothing     0.289273977279663 secs
+    Bits        0.406533002853394 secs      Bits        0.424988031387329 secs
+    Guids       0.419962882995605 secs      Guids       0.427381992340088 secs
+    Floats      0.452103137969971 secs      Floats      0.455377101898193 secs
+    Moneys      0.481696844100952 secs      Moneys      0.485175132751465 secs
+    Integers    0.496185064315796 secs      Integers    0.525003910064697 secs
+    Binaries    0.538873195648193 secs      Decimals    0.541536808013916 secs
+    Decimals    0.540570974349976 secs      Binaries    0.542865991592407 secs
+    Dates       0.761389970779419 secs      Dates       1.51440119743347  secs
+    Chars       0.793163061141968 secs      Chars       0.666505098342896 secs
+    All         4.4630811214447   secs      All         5.17242312431335  secs
 
 =end
 
+
+
+
+
+
+
+
+
+
+

data/test/client_test.rb

@@ -25,7 +25,7 @@ class ClientTest < TinyTds::TestCase
     
     should 'have a getters for the tds version information (brittle since conf takes precedence)' do
       assert_equal 9, @client.tds_version
-      assert_equal 'DBTDS_8_0 - Microsoft SQL Server 2000', @client.tds_version_info
+      assert_equal 'DBTDS_7_1 - Microsoft SQL Server 2000', @client.tds_version_info
     end
     
     should 'use UTF-8 client charset/encoding by default' do

data/test/result_test.rb

@@ -4,7 +4,7 @@ require 'test_helper'
 class ResultTest < TinyTds::TestCase
   
   context 'Basic query and result' do
-
+  
     setup do
       @@current_schema_loaded ||= load_current_schema
       @client = new_connection
@@ -110,7 +110,7 @@ class ResultTest < TinyTds::TestCase
         assert_equal text, row['varchar_50']
       end
     end
-    
+        
     should 'insert and find unicode data' do
       rollback_transaction(@client) do
         text = '✓'
@@ -174,7 +174,7 @@ class ResultTest < TinyTds::TestCase
         assert_equal sql_identity+1, native_identity
       end
     end
-
+  
     should 'return bigint for #insert when needed' do
       rollback_transaction(@client) do
         seed = 9223372036854775805
@@ -326,9 +326,20 @@ class ResultTest < TinyTds::TestCase
     end
     
     context 'with multiple result sets' do
-      
+  
       setup do
-        @double_select = "SELECT 1 AS [rs1]\nSELECT 2 AS [rs2]" 
+        @empty_select  = "SELECT 1 AS [rs1] WHERE 1 = 0"
+        @double_select = "SELECT 1 AS [rs1]
+                          SELECT 2 AS [rs2]" 
+        @triple_select_1st_empty = "SELECT 1 AS [rs1] WHERE 1 = 0
+                                    SELECT 2 AS [rs2]
+                                    SELECT 3 AS [rs3]"
+        @triple_select_2nd_empty = "SELECT 1 AS [rs1]
+                                    SELECT 2 AS [rs2] WHERE 1 = 0
+                                    SELECT 3 AS [rs3]"
+        @triple_select_3rd_empty = "SELECT 1 AS [rs1]
+                                    SELECT 2 AS [rs2]
+                                    SELECT 3 AS [rs3] WHERE 1 = 0"
       end
       
       should 'handle a command buffer with double selects' do
@@ -337,7 +348,7 @@ class ResultTest < TinyTds::TestCase
         assert_equal 2, result_sets.size
         assert_equal [{'rs1' => 1}], result_sets.first
         assert_equal [{'rs2' => 2}], result_sets.last
-        assert_equal [['rs1'],['rs2']], result.fields
+        assert_equal [['rs1'], ['rs2']], result.fields
         assert_equal result.each.object_id, result.each.object_id, 'same cached rows'
         # As array
         result = @client.execute(@double_select)
@@ -345,7 +356,7 @@ class ResultTest < TinyTds::TestCase
         assert_equal 2, result_sets.size
         assert_equal [[1]], result_sets.first
         assert_equal [[2]], result_sets.last
-        assert_equal [['rs1'],['rs2']], result.fields
+        assert_equal [['rs1'], ['rs2']], result.fields
         assert_equal result.each.object_id, result.each.object_id, 'same cached rows'
       end
       
@@ -365,23 +376,160 @@ class ResultTest < TinyTds::TestCase
         assert constraint_info.key?("constraint_name")
       end
       
-      should 'ignore empty result sets' do
-        rollback_transaction(@client) do
-          @client.execute("DELETE FROM [datatypes]").do
-          id = @client.execute("INSERT INTO [datatypes] ([varchar_50]) VALUES ('test empty result sets')").insert
-          sql = %|
-            SET NOCOUNT ON
-            DECLARE @row_number TABLE (row int identity(1,1), id int) 
-            INSERT INTO @row_number (id) 
-              SELECT [datatypes].[id] FROM [datatypes]
-            SET NOCOUNT OFF 
-            SELECT id FROM @row_number|
-          result = @client.execute(sql)
-          result.each.must_equal [{"id"=>id}]
-          result.fields.must_equal ['id']
+      context 'using :empty_sets TRUE' do
+        
+        setup do
+          @old_query_option_value = TinyTds::Client.default_query_options[:empty_sets]
+          TinyTds::Client.default_query_options[:empty_sets] = true
+          @client = new_connection
         end
+        
+        teardown do
+          TinyTds::Client.default_query_options[:empty_sets] = @old_query_option_value
+        end
+        
+        should 'handle a basic empty result set' do
+          result = @client.execute(@empty_select)
+          assert_equal [], result.each
+          assert_equal ['rs1'], result.fields
+        end
+  
+        should 'include empty result sets by default - using 1st empty buffer' do
+          result = @client.execute(@triple_select_1st_empty)
+          result_sets = result.each
+          assert_equal 3, result_sets.size
+          assert_equal [], result_sets[0]
+          assert_equal [{'rs2' => 2}], result_sets[1]
+          assert_equal [{'rs3' => 3}], result_sets[2]
+          assert_equal [['rs1'], ['rs2'], ['rs3']], result.fields
+          assert_equal result.each.object_id, result.each.object_id, 'same cached rows'
+          # As array
+          result = @client.execute(@triple_select_1st_empty)
+          result_sets = result.each(:as => :array)
+          assert_equal 3, result_sets.size
+          assert_equal [], result_sets[0]
+          assert_equal [[2]], result_sets[1]
+          assert_equal [[3]], result_sets[2]
+          assert_equal [['rs1'], ['rs2'], ['rs3']], result.fields
+          assert_equal result.each.object_id, result.each.object_id, 'same cached rows'
+        end
+  
+        should 'include empty result sets by default - using 2nd empty buffer' do
+          result = @client.execute(@triple_select_2nd_empty)
+          result_sets = result.each
+          assert_equal 3, result_sets.size
+          assert_equal [{'rs1' => 1}], result_sets[0]
+          assert_equal [], result_sets[1]
+          assert_equal [{'rs3' => 3}], result_sets[2]
+          assert_equal [['rs1'], ['rs2'], ['rs3']], result.fields
+          assert_equal result.each.object_id, result.each.object_id, 'same cached rows'
+          # As array
+          result = @client.execute(@triple_select_2nd_empty)
+          result_sets = result.each(:as => :array)
+          assert_equal 3, result_sets.size
+          assert_equal [[1]], result_sets[0]
+          assert_equal [], result_sets[1]
+          assert_equal [[3]], result_sets[2]
+          assert_equal [['rs1'], ['rs2'], ['rs3']], result.fields
+          assert_equal result.each.object_id, result.each.object_id, 'same cached rows'
+        end
+  
+        should 'include empty result sets by default - using 3rd empty buffer' do
+          result = @client.execute(@triple_select_3rd_empty)
+          result_sets = result.each
+          assert_equal 3, result_sets.size
+          assert_equal [{'rs1' => 1}], result_sets[0]
+          assert_equal [{'rs2' => 2}], result_sets[1]
+          assert_equal [], result_sets[2]
+          assert_equal [['rs1'], ['rs2'], ['rs3']], result.fields
+          assert_equal result.each.object_id, result.each.object_id, 'same cached rows'
+          # As array
+          result = @client.execute(@triple_select_3rd_empty)
+          result_sets = result.each(:as => :array)
+          assert_equal 3, result_sets.size
+          assert_equal [[1]], result_sets[0]
+          assert_equal [[2]], result_sets[1]
+          assert_equal [], result_sets[2]
+          assert_equal [['rs1'], ['rs2'], ['rs3']], result.fields
+          assert_equal result.each.object_id, result.each.object_id, 'same cached rows'
+        end
+  
       end
-    
+      
+      context 'using :empty_sets FALSE' do
+        
+        setup do
+          @old_query_option_value = TinyTds::Client.default_query_options[:empty_sets]
+          TinyTds::Client.default_query_options[:empty_sets] = false
+          @client = new_connection
+        end
+        
+        teardown do
+          TinyTds::Client.default_query_options[:empty_sets] = @old_query_option_value
+        end
+        
+        should 'handle a basic empty result set' do
+          result = @client.execute(@empty_select)
+          assert_equal [], result.each
+          assert_equal ['rs1'], result.fields
+        end
+        
+        should 'not include empty result sets by default - using 1st empty buffer' do
+          result = @client.execute(@triple_select_1st_empty)
+          result_sets = result.each
+          assert_equal 2, result_sets.size
+          assert_equal [{'rs2' => 2}], result_sets[0]
+          assert_equal [{'rs3' => 3}], result_sets[1]
+          assert_equal [['rs2'], ['rs3']], result.fields
+          assert_equal result.each.object_id, result.each.object_id, 'same cached rows'
+          # As array
+          result = @client.execute(@triple_select_1st_empty)
+          result_sets = result.each(:as => :array)
+          assert_equal 2, result_sets.size
+          assert_equal [[2]], result_sets[0]
+          assert_equal [[3]], result_sets[1]
+          assert_equal [['rs2'], ['rs3']], result.fields
+          assert_equal result.each.object_id, result.each.object_id, 'same cached rows'
+        end
+        
+        should 'not include empty result sets by default - using 2nd empty buffer' do
+          result = @client.execute(@triple_select_2nd_empty)
+          result_sets = result.each
+          assert_equal 2, result_sets.size
+          assert_equal [{'rs1' => 1}], result_sets[0]
+          assert_equal [{'rs3' => 3}], result_sets[1]
+          assert_equal [['rs1'], ['rs3']], result.fields
+          assert_equal result.each.object_id, result.each.object_id, 'same cached rows'
+          # As array
+          result = @client.execute(@triple_select_2nd_empty)
+          result_sets = result.each(:as => :array)
+          assert_equal 2, result_sets.size
+          assert_equal [[1]], result_sets[0]
+          assert_equal [[3]], result_sets[1]
+          assert_equal [['rs1'], ['rs3']], result.fields
+          assert_equal result.each.object_id, result.each.object_id, 'same cached rows'
+        end
+  
+        should 'not include empty result sets by default - using 3rd empty buffer' do
+          result = @client.execute(@triple_select_3rd_empty)
+          result_sets = result.each
+          assert_equal 2, result_sets.size
+          assert_equal [{'rs1' => 1}], result_sets[0]
+          assert_equal [{'rs2' => 2}], result_sets[1]
+          assert_equal [['rs1'], ['rs2']], result.fields
+          assert_equal result.each.object_id, result.each.object_id, 'same cached rows'
+          # As array
+          result = @client.execute(@triple_select_3rd_empty)
+          result_sets = result.each(:as => :array)
+          assert_equal 2, result_sets.size
+          assert_equal [[1]], result_sets[0]
+          assert_equal [[2]], result_sets[1]
+          assert_equal [['rs1'], ['rs2']], result.fields
+          assert_equal result.each.object_id, result.each.object_id, 'same cached rows'
+        end
+  
+      end
+      
     end
     
     context 'when casting to native ruby values' do
@@ -398,6 +546,28 @@ class ResultTest < TinyTds::TestCase
     
     end
     
+    context 'with data type' do
+
+      context 'char max' do
+
+        setup do
+          @big_text = 'x' * 2_000_000
+          @old_textsize = @client.execute("SELECT @@TEXTSIZE AS [textsize]").each.first['textsize'].inspect
+          @client.execute("SET TEXTSIZE #{(@big_text.length*2)+1}").do
+        end
+
+        should 'insert and select large varchar_max' do
+          insert_and_select_datatype :varchar_max
+        end
+
+        should 'insert and select large nvarchar_max' do
+          insert_and_select_datatype :nvarchar_max
+        end
+
+      end unless sqlserver_2000?
+
+    end
+    
     context 'when shit happens' do
       
       should 'cope with nil or empty buffer' do
@@ -405,6 +575,21 @@ class ResultTest < TinyTds::TestCase
         assert_equal [], @client.execute('').each
       end
       
+      should 'not raise an error when severity is 10 or less' do
+        (1..10).to_a.each do |severity|
+          @client.execute("RAISERROR(N'Test #{severity} severity', #{severity}, 1)").do
+        end
+      end
+      
+      should 'raise an error when severity is greater than 10' do
+        action = lambda { @client.execute("RAISERROR(N'Test 11 severity', 11, 1)").do }
+        assert_raise_tinytds_error(action) do |e|
+          assert_equal "Test 11 severity", e.message
+          assert_equal 11, e.severity
+          assert_equal 50000, e.db_error_number
+        end
+      end
+      
       should 'throw an error when you execute another query with other results pending' do
         result1 = @client.execute(@query1)
         action = lambda { @client.execute(@query1) }
@@ -414,7 +599,7 @@ class ResultTest < TinyTds::TestCase
           assert_equal 20019, e.db_error_number
         end
       end
-    
+          
       should 'error gracefully with bad table name' do
         action = lambda { @client.execute('SELECT * FROM [foobar]').each }
         assert_raise_tinytds_error(action) do |e|
@@ -425,7 +610,7 @@ class ResultTest < TinyTds::TestCase
         assert_followup_query
       end
       
-      should 'error gracefully with invalid syntax' do
+      should 'error gracefully with incorrect syntax' do
         action = lambda { @client.execute('this will not work').each }
         assert_raise_tinytds_error(action) do |e|
           assert_match %r|incorrect syntax|i, e.message
@@ -434,6 +619,20 @@ class ResultTest < TinyTds::TestCase
         end
         assert_followup_query
       end
+      
+      should 'error gracefully with incorrect syntax in sp_executesql' do
+        if @client.freetds_091_or_higer?
+          action = lambda { @client.execute("EXEC sp_executesql N'this will not work'").each }
+          assert_raise_tinytds_error(action) do |e|
+            assert_match %r|incorrect syntax|i, e.message
+            assert_equal 15, e.severity
+            assert_equal 156, e.db_error_number
+          end
+          assert_followup_query
+        else
+          skip 'FreeTDS 0.91 and higher can only pass this test.'
+        end
+      end
     
     end
 
@@ -447,5 +646,14 @@ class ResultTest < TinyTds::TestCase
     assert_equal 1, result.each.first['one']
   end
   
+  def insert_and_select_datatype(datatype)
+    rollback_transaction(@client) do
+      @client.execute("DELETE FROM [datatypes] WHERE [#{datatype}] IS NOT NULL").do
+      id = @client.execute("INSERT INTO [datatypes] ([#{datatype}]) VALUES (N'#{@big_text}')").insert
+      found_text = find_value id, datatype
+      flunk "Large #{datatype} data with a length of #{@big_text.length} did not match found text with length of #{found_text.length}" unless @big_text == found_text
+    end
+  end
+  
 end
 

data/test/schema_test.rb

@@ -39,40 +39,77 @@ class SchemaTest < TinyTds::TestCase
       end
       
       should 'cast datetime' do
-        # 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(61, :datetime, :timezone => :local).offset
-        assert_equal 0, find_value(61, :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
+        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
       end
       
       should 'cast decimal' do
@@ -146,28 +183,53 @@ class SchemaTest < TinyTds::TestCase
       end
       
       should 'cast smalldatetime' do
-        # 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
+        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
       end
       
       should 'cast smallint' do
@@ -242,33 +304,54 @@ class SchemaTest < TinyTds::TestCase
     
     context 'for 2008 and up' do
       
-      should 'cast date' do
-        
-      end
-      
-      should 'cast datetime2' do
-        
-      end
-      
-      should 'cast datetimeoffset' do
-        
-      end
-      
-      should 'cast geography' do
-        
-      end
-      
-      should 'cast geometry' do
-        
-      end
-      
-      should 'cast hierarchyid' do
-        
-      end
-      
-      should 'cast time' do
-        
-      end
+      # These data types always come back as SYBTEXT and there is no way I can 
+      # find out the column's human readable name. 
+      # 
+      #   * [date]
+      #   * [datetime2]
+      #   * [datetimeoffset]
+      #   * [time]
+      # 
+      # I have tried the following and I only get back either "char" or 0/null.
+      # 
+      #   rb_warn("SYBTEXT: dbprtype: %s", dbprtype(coltype));
+      #   rb_warn("SYBTEXT: dbcolutype: %s", dbcolutype(rwrap->client, col));
+      #   rb_warn("SYBTEXT: dbcolutype: %ld", dbcolutype(rwrap->client, col));
+      
+      # should 'cast date' do
+      #   value = find_value 51, :date
+      #   assert_equal '', value
+      # end
+      # 
+      # should 'cast datetime2' do
+      #   value = find_value 72, :datetime2_7
+      #   assert_equal '', value
+      # end
+      # 
+      # should 'cast datetimeoffset' do
+      #   value = find_value 81, :datetimeoffset_2
+      #   assert_equal '', value
+      # end
+      # 
+      # should 'cast geography' do
+      #   value = find_value 111, :geography
+      #   assert_equal '', value
+      # end
+      # 
+      # should 'cast geometry' do
+      #   value = find_value 121, :geometry
+      #   assert_equal '', value
+      # end
+      # 
+      # should 'cast hierarchyid' do
+      #   value = find_value 131, :hierarchyid
+      #   assert_equal '', value
+      # end
+      # 
+      # should 'cast time' do
+      #   value = find_value 283, :time_7
+      #   assert_equal '', value
+      # end
       
     end if sqlserver_2008? || sqlserver_azure?
   

data/test/test_helper.rb

@@ -127,6 +127,10 @@ module TinyTds
       RUBY_VERSION == '1.9.2'
     end
     
+    def ruby32bit?
+      1.size == 4
+    end
+    
     def rubyRbx?
       RUBY_DESCRIPTION =~ /rubinius/i
     end

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: tiny_tds
 version: !ruby/object:Gem::Version 
-  hash: 5
-  prerelease: 
+  hash: 15424071
+  prerelease: 6
   segments: 
   - 0
-  - 4
   - 5
-  version: 0.4.5
+  - 0
+  - rc
+  - 1
+  version: 0.5.0.rc1
 platform: ruby
 authors: 
 - Ken Collins
@@ -16,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-24 00:00:00 -04:00
+date: 2011-09-12 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -83,12 +85,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: