tiny_tds 0.1.0 → 0.2.0

data/CHANGELOG

@@ -1,3 +1,16 @@
 
+* 0.2.0 *
+
+* Convert GUID's in a more compatible way. [Klaus Gundermann]
+
+* Handle multiple result sets in command buffer or stored procs. [Ken Collins]
+
+* Fixed some compiler warnings. [Erik Bryn]
+
+* Avoid segfault related to smalldatetime conversion. [Erik Bryn]
+
+* Properly encode column names in 1.9. [Erik Bryn]
+
+
 * 0.1.0 Initial release!
 

data/README.rdoc

@@ -46,7 +46,7 @@ Below is a list of the data types we plan to support using future versions of Fr
 
 Connect to a database.
 
-  client = TinyTds::Client.new(:user => 'sa', :password => 'secret', :dataserver => 'mytds_box')
+  client = TinyTds::Client.new(:username => 'sa', :password => 'secret', :dataserver => 'mytds_box')
 
 Creating a new client takes a hash of options. For valid iconv encoding options, see the output of "iconv -l". Only a few have been tested and highly recommended to leave blank for the UTF-8 default.
 
@@ -142,6 +142,13 @@ Besides the standard query options, the result object can take one additional op
 By default row caching is turned on because the SQL Server adapter for ActiveRecord would not work without it. I hope to find some time to create some performance patches for ActiveRecord that would allow it to take advantages of lazily created yielded rows from result objects. Currently only TinyTds and the Mysql2 gem allow such a performance gain.
 
 
+== Using TinyTds With the ActiveRecord SQL Server adapter.
+
+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. Make sure to add a :dataserver option to that matches the name in your freetds.conf file. The SQL Server adapter can be found here.
+
+http://github.com/rails-sqlserver/activerecord-sqlserver-adapter
+
+
 
 == Development & Testing
 
@@ -158,7 +165,6 @@ For help and support.
 Current to do list.
 
 * Test 0.83 development of FreeTDS.
-* Handle multiple result sets.
 * Find someone brave enough to compile/test for Windows.
 * Install an interrupt handler.
 * Allow #escape to accept all ruby primitives.
@@ -168,7 +174,7 @@ Current to do list.
 
 == About Me
 
-My name is Ken Collins and I have no love for Microsoft nor do I work on Windows or have I ever owned a PC. I currently maintain the SQL Server adapter for ActiveRecord and wrote this library as my first cut into learning ruby C extensions. Hopefully it will help promote the power of ruby and the rails framework to those that have not yet discovered it. My blog is http://metaskills.net and I can be found on twitter as @metaskills. Enjoy!
+My name is Ken Collins and to avoid confusion – I have no love for Microsoft nor do I work on Windows or have I ever owned a PC, just so we know :) – I currently maintain the SQL Server adapter for ActiveRecord and wrote this library as my first cut into learning ruby C extensions. Hopefully it will help promote the power of ruby and the rails framework to those that have not yet discovered it. My blog is http://metaskills.net and I can be found on twitter as @metaskills. Enjoy!
 
 
 

data/ext/tiny_tds/result.c

@@ -23,9 +23,9 @@ static ID sym_symbolize_keys, sym_as, sym_array, sym_cache_rows, sym_first, sym_
   })
 #else
   #define ENCODED_STR_NEW(_data, _len) \
-    rb_str_new((char *)_data, (long)_len);
+    rb_str_new((char *)_data, (long)_len)
   #define ENCODED_STR_NEW2(_data2) \
-    rb_str_new2((char *)_data2);
+    rb_str_new2((char *)_data2)
 #endif
 
 
@@ -36,7 +36,7 @@ static void rb_tinytds_result_mark(void *ptr) {
   if (rwrap) {
     rb_gc_mark(rwrap->local_offset);
     rb_gc_mark(rwrap->fields);
-    rb_gc_mark(rwrap->rows);
+    rb_gc_mark(rwrap->results);
   }
 }
 
@@ -50,10 +50,10 @@ VALUE rb_tinytds_new_result_obj(DBPROCESS *c) {
   tinytds_result_wrapper *rwrap;
   obj = Data_Make_Struct(cTinyTdsResult, tinytds_result_wrapper, rb_tinytds_result_mark, rb_tinytds_result_free, rwrap);
   rwrap->client = c;
-  rwrap->return_code = 0;
   rwrap->local_offset = Qnil;
   rwrap->fields = Qnil;
-  rwrap->rows = Qnil;
+  rwrap->results = Qnil;
+  rwrap->number_of_results = 0;
   rwrap->number_of_fields = 0;
   rwrap->number_of_rows = 0;
   rb_obj_call_init(obj, 0, NULL);
@@ -66,25 +66,10 @@ VALUE rb_tinytds_new_result_obj(DBPROCESS *c) {
 static VALUE rb_tinytds_result_fetch_row(VALUE self, ID timezone, int symbolize_keys, int as_array) {
   /* Wrapper And Local Vars */
   GET_RESULT_WRAPPER(self);
-  VALUE row;
-  unsigned int i = 0;
-  /* One-Time Fields Info & Container */
-  if (NIL_P(rwrap->fields)) {
-    rwrap->number_of_fields = dbnumcols(rwrap->client);
-    rwrap->fields = rb_ary_new2(rwrap->number_of_fields);
-    for (i = 0; i < rwrap->number_of_fields; i++) {
-      char *colname = dbcolname(rwrap->client, i+1);
-      VALUE field = symbolize_keys ? ID2SYM(rb_intern(colname)) : rb_obj_freeze(rb_str_new2(colname));
-      rb_ary_store(rwrap->fields, i, field);
-    }
-  }
   /* Create Empty Row */
-  if (as_array) {
-    row = rb_ary_new2(rwrap->number_of_fields);
-  } else {
-    row = rb_hash_new();
-  }
+  VALUE row = as_array ? rb_ary_new2(rwrap->number_of_fields) : rb_hash_new();
   /* Storing Values */
+  unsigned int i = 0;
   for (i = 0; i < rwrap->number_of_fields; i++) {
     VALUE val = Qnil;
     int col = i+1;
@@ -152,13 +137,17 @@ static VALUE rb_tinytds_result_fetch_row(VALUE self, ID timezone, int symbolize_
           #endif
           break;
         case 36: { // SYBUNIQUE
-          char converted_unique[32];
-          dbconvert(rwrap->client, coltype, data, 32, SYBVARCHAR, (BYTE *)converted_unique, -1);
+          char converted_unique[36];
+          dbconvert(rwrap->client, coltype, data, data_len, SYBVARCHAR, (BYTE *)converted_unique, sizeof(converted_unique));
           val = ENCODED_STR_NEW2(converted_unique);
           break;
         }
-        case SYBDATETIME4:
-          dbconvert(rwrap->client, coltype, data, data_len, SYBDATETIME, data, data_len);
+        case SYBDATETIME4: {
+          DBDATETIME new_data;
+          dbconvert(rwrap->client, coltype, data, data_len, SYBDATETIME, (BYTE *)&new_data, sizeof(new_data));
+          data = (BYTE *)&new_data;
+          data_len = sizeof(new_data);
+        }
         case SYBDATETIME: {
           DBDATEREC date_rec;
           dbdatecrack(rwrap->client, &date_rec, (DBDATETIME *)data);
@@ -203,7 +192,13 @@ static VALUE rb_tinytds_result_fetch_row(VALUE self, ID timezone, int symbolize_
     if (as_array) {
       rb_ary_store(row, i, val);
     } else {
-      rb_hash_aset(row, rb_ary_entry(rwrap->fields, i), val);
+      VALUE key;
+      if (rwrap->number_of_results == 0) {
+        key = rb_ary_entry(rwrap->fields, i);
+      } else {
+        key = rb_ary_entry(rb_ary_entry(rwrap->fields, rwrap->number_of_results), i);
+      }
+      rb_hash_aset(row, key, val);
     }
   }
   return row;
@@ -242,21 +237,43 @@ 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;
   }
-  /* Make The Rows Or Yield Existing */
-  if (NIL_P(rwrap->rows)) {
-    rwrap->rows = rb_ary_new();
-    RETCODE return_code;
-    while (return_code != NO_MORE_RESULTS) {
-      return_code = dbresults(rwrap->client);
-      if (return_code != FAIL) {
-        /* If no actual rows, return the empty array. */
-        if (DBROWS(rwrap->client) != SUCCEED)
-          return rwrap->rows;
+  /* Make The Results Or Yield Existing */
+  if (NIL_P(rwrap->results)) {
+    rwrap->results = rb_ary_new();
+    RETCODE dbresults_rc = 0;
+    dbresults_rc = dbresults(rwrap->client);
+    while (dbresults_rc == SUCCEED) {
+      /* Only do field and row work if there are rows in this result set. */
+      int has_rows = (DBROWS(rwrap->client) == SUCCEED) ? 1 : 0;
+      int number_of_fields = has_rows ? dbnumcols(rwrap->client) : 0;
+      if (has_rows && (number_of_fields > 0)) {
+        /* Create fields for this result set. */
+        unsigned int fldi = 0;
+        rwrap->number_of_fields = number_of_fields;
+        VALUE fields = rb_ary_new2(rwrap->number_of_fields);
+        for (fldi = 0; fldi < rwrap->number_of_fields; fldi++) {
+          char *colname = dbcolname(rwrap->client, fldi+1);
+          VALUE field = symbolize_keys ? ID2SYM(rb_intern(colname)) : rb_obj_freeze(ENCODED_STR_NEW2(colname));
+          rb_ary_store(fields, fldi, field);
+        }
+        /* Store the fields. */
+        if (rwrap->number_of_results == 0) {
+          rwrap->fields = fields;
+        } else if (rwrap->number_of_results == 1) {
+          VALUE multi_rs_fields = rb_ary_new();
+          rb_ary_store(multi_rs_fields, 0, rwrap->fields);
+          rb_ary_store(multi_rs_fields, 1, fields);
+          rwrap->fields = multi_rs_fields;
+        } else {
+          rb_ary_store(rwrap->fields, rwrap->number_of_results, fields);
+        }
+        /* Create rows for this result set. */
         unsigned long rowi = 0;
+        VALUE result = rb_ary_new();
         while (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(rwrap->rows, rowi, row);
+            rb_ary_store(result, rowi, row);
           if (!NIL_P(block))
             rb_yield(row);
           if (first)
@@ -264,22 +281,33 @@ static VALUE rb_tinytds_result_each(int argc, VALUE * argv, VALUE self) {
           rowi++;
         }
         rwrap->number_of_rows = rowi;
-      } else {
-        // TODO: Account for failed dbresults() must have returned FAIL.
-        rb_warn("TinyTds: dbresults() must have returned FAIL.\n");
+        /* Store the result. */
+        if (rwrap->number_of_results == 0) {
+          rwrap->results = result;
+        } else if (rwrap->number_of_results == 1) {
+          VALUE multi_resultsets = rb_ary_new();
+          rb_ary_store(multi_resultsets, 0, rwrap->results);
+          rb_ary_store(multi_resultsets, 1, result);
+          rwrap->results = multi_resultsets;
+        } else {
+          rb_ary_store(rwrap->results, rwrap->number_of_results, result);
+        }
+        /* Record the result set */
+        rwrap->number_of_results = rwrap->number_of_results + 1;
       }
+      dbresults_rc = dbresults(rwrap->client);
     }
-    if (return_code == FAIL) {
+    if (dbresults_rc == FAIL) {
       // TODO: Account for something in the dbresults() while loop set the return code to FAIL.
       rb_warn("TinyTds: Something in the dbresults() while loop set the return code to FAIL.\n");
     }
   } else if (!NIL_P(block)) {
     unsigned long i;
     for (i = 0; i < rwrap->number_of_rows; i++) {
-      rb_yield(rb_ary_entry(rwrap->rows, i));
+      rb_yield(rb_ary_entry(rwrap->results, i));
     }
   }
-  return rwrap->rows;
+  return rwrap->results;
 }
 
 static VALUE rb_tinytds_result_fields(VALUE self) {

data/ext/tiny_tds/result.h

@@ -7,14 +7,14 @@ VALUE rb_tinytds_new_result_obj(DBPROCESS *c);
 
 typedef struct {
   DBPROCESS *client;
-  RETCODE return_code;
   VALUE local_offset;
   VALUE fields;
-  VALUE rows;
+  VALUE results;
   #ifdef HAVE_RUBY_ENCODING_H
     rb_encoding *encoding;
   #endif
-  long number_of_fields;
+  unsigned int number_of_results;
+  unsigned int number_of_fields;
   unsigned long number_of_rows;
 } tinytds_result_wrapper;
 

data/lib/tiny_tds.rb

@@ -15,5 +15,5 @@ require 'tiny_tds/tiny_tds'
 #
 # Tiny Ruby Wrapper For FreeTDS Using DB-Library
 module TinyTds
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tiny_tds
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Ken Collins
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-17 00:00:00 -04:00
+date: 2010-10-21 00:00:00 -04:00
 default_executable: 
 dependencies: []