rubyfb 0.6.3 → 0.6.4

data/ext/Row.h

@@ -31,23 +31,8 @@
       #define RUBY_H_INCLUDED
    #endif
 
-/* Type definitions. */
-typedef struct {
-  char name[32],
-       alias[32];
-  VALUE value,
-        type,
-        scale;
-} ColumnHandle;
-
-typedef struct {
-  unsigned int size,
-               number;
-  ColumnHandle *columns;
-} RowHandle;
-
 /* Function prototypes. */
 void Init_Row(VALUE);
-VALUE rb_row_new(VALUE, VALUE, VALUE);
+VALUE rb_row_new(VALUE, VALUE);
 
 #endif // FIRERUBY_ROW_H

data/ext/TypeMap.c

@@ -57,14 +57,18 @@ void populateDateField(VALUE, XSQLVAR *);
 void populateTimeField(VALUE, XSQLVAR *);
 void populateTimestampField(VALUE, XSQLVAR *);
 
+ID NEW_ID, TO_F_ID, ROUND_ID, ASTERISK_ID, CLASS_ID, TRANSACTION_ID,
+  CONNECTION_ID, STATEMENT_ID, NAME_ID, AT_VALUE_ID, AT_TYPE_ID,
+  AT_COLUMN_ID;
+
 long long sql_scale(VALUE value, XSQLVAR *field) {
-  value = rb_funcall(value, rb_intern("to_f"), 0);
+  value = rb_funcall(value, TO_F_ID, 0);
   if(field->sqlscale) {
     // this requires special care - decimal point shift can cause type overflow
     // the easyest way is to use ruby arithmetics (although it's not the fastes)
-    value = rb_funcall(value, rb_intern("*"), 1, LONG2NUM((long)pow(10, abs(field->sqlscale))));
+    value = rb_funcall(value, ASTERISK_ID, 1, LONG2NUM((long)pow(10, abs(field->sqlscale))));
   }
-  return NUM2LL(rb_funcall(value, rb_intern("round"), 0));
+  return NUM2LL(rb_funcall(value, ROUND_ID, 0));
 }
 
 VALUE sql_unscale(VALUE value, XSQLVAR *field) {
@@ -72,7 +76,7 @@ VALUE sql_unscale(VALUE value, XSQLVAR *field) {
     return value;
   }
   return rb_float_new(
-    NUM2DBL(rb_funcall(value, rb_intern("to_f"), 0)) / pow(10, abs(field->sqlscale))
+    NUM2DBL(rb_funcall(value, TO_F_ID, 0)) / pow(10, abs(field->sqlscale))
   );
 }
 
@@ -88,10 +92,11 @@ VALUE sql_unscale(VALUE value, XSQLVAR *field) {
  *          the field type referenced.
  *
  */
-VALUE toValue(XSQLVAR *entry,
+VALUE toColumn(XSQLVAR *entry,
+              VALUE metadata, 
               VALUE connection, 
               VALUE transaction) {
-  VALUE value  = rb_ary_new();
+  VALUE column, value = Qnil;
 
   /* Check for NULL values. */
   if(!((entry->sqltype & 1) && (*entry->sqlind < 0))) {
@@ -107,10 +112,6 @@ VALUE toValue(XSQLVAR *entry,
           working = Qnil;
 
     switch(type) {
-    case SQL_ARRAY:       /* Type: ARRAY */
-      /* TO BE DONE! */
-      break;
-
     case SQL_BLOB:        /* Type: BLOB */
       memset(column, 0, 256);
       memset(table, 0, 256);
@@ -119,8 +120,7 @@ VALUE toValue(XSQLVAR *entry,
       blob = openBlob(entry, column, table, connection,
                       transaction);
       working = Data_Wrap_Struct(cBlob, NULL, blobFree, blob);
-      rb_ary_push(value, initializeBlob(working, connection));
-      rb_ary_push(value, getColumnType(entry));
+      value = initializeBlob(working, connection);
       break;
 
     case SQL_TYPE_DATE:       /* Type: DATE */
@@ -130,41 +130,34 @@ VALUE toValue(XSQLVAR *entry,
       datetime.tm_min  = 0;
       datetime.tm_hour = 0;
       if(setting == Qtrue) {
-        rb_ary_push(value, createDate(&datetime));
+        value = createDate(&datetime);
       } else {
-        rb_ary_push(value, createSafeTime(&datetime));
+        value = createSafeTime(&datetime);
       }
-      rb_ary_push(value, getColumnType(entry));
       break;
 
     case SQL_DOUBLE:       /* Type: DOUBLE PRECISION, DECIMAL, NUMERIC */
-      rb_ary_push(value, rb_float_new(*((double *)entry->sqldata)));
-      rb_ary_push(value, getColumnType(entry));
+      value = rb_float_new(*((double *)entry->sqldata));
       break;
 
     case SQL_FLOAT:       /* Type: FLOAT */
-      rb_ary_push(value, rb_float_new(*((float *)entry->sqldata)));
-      rb_ary_push(value, getColumnType(entry));
+      value =  rb_float_new(*((float *)entry->sqldata));
       break;
 
     case SQL_INT64:       /* Type: DECIMAL, NUMERIC */
-      rb_ary_push(value, sql_unscale(LL2NUM(*((long long *)entry->sqldata)), entry));
-      rb_ary_push(value, getColumnType(entry));
+      value =  sql_unscale(LL2NUM(*((long long *)entry->sqldata)), entry);
       break;
 
     case SQL_LONG:       /* Type: INTEGER, DECIMAL, NUMERIC */
-      rb_ary_push(value, sql_unscale(LONG2NUM(*((int32_t *)entry->sqldata)), entry));
-      rb_ary_push(value, getColumnType(entry));
+      value = sql_unscale(LONG2NUM(*((int32_t *)entry->sqldata)), entry);
       break;
 
     case SQL_SHORT:       /* Type: SMALLINT, DECIMAL, NUMERIC */
-      rb_ary_push(value, sql_unscale(INT2NUM(*((short *)entry->sqldata)), entry));
-      rb_ary_push(value, getColumnType(entry));
+      value = sql_unscale(INT2NUM(*((short *)entry->sqldata)), entry);
       break;
 
     case SQL_TEXT:       /* Type: CHAR */
-      rb_ary_push(value, rfbstr(connection, entry->sqlsubtype, entry->sqldata, entry->sqllen));
-      rb_ary_push(value, getColumnType(entry));
+      value = rfbstr(connection, entry->sqlsubtype, entry->sqldata, entry->sqllen);
       break;
 
     case SQL_TYPE_TIME:       /* Type: TIME */
@@ -172,32 +165,25 @@ VALUE toValue(XSQLVAR *entry,
       datetime.tm_year = 70;
       datetime.tm_mon  = 0;
       datetime.tm_mday = 1;
-      rb_ary_push(value, createSafeTime(&datetime));
-      rb_ary_push(value, getColumnType(entry));
+      value = createSafeTime(&datetime);
       break;
 
     case SQL_TIMESTAMP:       /* Type: TIMESTAMP */
       isc_decode_timestamp((ISC_TIMESTAMP *)entry->sqldata, &datetime);
-      rb_ary_push(value, createSafeTime(&datetime));
-      rb_ary_push(value, getColumnType(entry));
+      value = createSafeTime(&datetime);
       break;
 
     case SQL_VARYING:
       memcpy(&length, entry->sqldata, 2);
-      rb_ary_push(value, rfbstr(connection, entry->sqlsubtype, &entry->sqldata[2], length));
-      rb_ary_push(value, getColumnType(entry));
+      value = rfbstr(connection, entry->sqlsubtype, &entry->sqldata[2], length);
       break;
-
-    default:
-      rb_ary_push(value, Qnil);
-      rb_ary_push(value, Qnil);
     }   /* End of switch. */
-  } else {
-    rb_ary_push(value, Qnil);
-    rb_ary_push(value, getColumnType(entry));
   }
 
-  return(value);
+  column = rb_funcall(rb_cObject, NEW_ID, 0);
+  rb_ivar_set(column, AT_COLUMN_ID, metadata);
+  rb_ivar_set(column, AT_VALUE_ID, value);
+  return(column);
 }
 
 
@@ -211,20 +197,21 @@ VALUE toValue(XSQLVAR *entry,
  * @return  A reference to the array containing the row data from the XSQLDA.
  *
  */
-VALUE toArray(VALUE results) {
-  VALUE array       = rb_ary_new(),
-        transaction = rb_funcall(results, rb_intern("transaction"), 0),
-        connection  = rb_funcall(results, rb_intern("connection"), 0);
+VALUE toRowColumns(VALUE results) {
+  VALUE array, transaction, connection, columns;
   XSQLVAR           *entry      = NULL;
   StatementHandle *hStatement = NULL;
   int i;
 
-  Data_Get_Struct(rb_funcall(results, rb_intern("statement"), 0), StatementHandle, hStatement);
+  Data_Get_Struct(rb_funcall(results, STATEMENT_ID, 0), StatementHandle, hStatement);
+  transaction = rb_funcall(results, TRANSACTION_ID, 0);
+  connection  = rb_funcall(results, CONNECTION_ID, 0);
+  array       = rb_ary_new2(hStatement->output->sqln);
+
   entry = hStatement->output->sqlvar;
+  columns = getResultsColumns(results);
   for(i = 0; i < hStatement->output->sqln; i++, entry++) {
-    VALUE value = toValue(entry, connection, transaction);
-
-    rb_ary_push(array, value);
+    rb_ary_store(array, i, toColumn(entry, rb_ary_entry(columns, i), connection, transaction));
   }
 
   return(array);
@@ -246,14 +233,12 @@ VALUE toArray(VALUE results) {
  *
  */
 void setParameters(XSQLDA *parameters, VALUE array, VALUE transaction, VALUE connection) {
-  VALUE value;
-  int index,
-      size;
+  long index,
+       size;
   XSQLVAR *parameter = NULL;
 
   /* Check that sufficient parameters have been provided. */
-  value     = rb_funcall(array, rb_intern("size"), 0);
-  size      = (TYPE(value) == T_FIXNUM ? FIX2INT(value) : NUM2INT(value));
+  size      = RARRAY_LEN(array);
   parameter = parameters->sqlvar;
   if(size != parameters->sqld) {
     rb_raise(rb_eException,
@@ -266,14 +251,14 @@ void setParameters(XSQLDA *parameters, VALUE array, VALUE transaction, VALUE con
   /* Populate the parameters from the array's contents. */
   for(index = 0; index < size; index++, parameter++) {
     int type = (parameter->sqltype & ~1);
+    VALUE value = rb_ary_entry(array, index);
 
-    value = rb_ary_entry(array, index);
     /* Check for nils to indicate null values. */
     if(value != Qnil) {
-      VALUE name = rb_funcall(value, rb_intern("class"), 0);
+      VALUE name = rb_funcall(value, CLASS_ID, 0);
 
       *parameter->sqlind = 0;
-      name = rb_funcall(name, rb_intern("name"), 0);
+      name = rb_funcall(name, NAME_ID, 0);
       switch(type) {
       case SQL_ARRAY:        /* Type: ARRAY */
         /* TO BE DONE! */
@@ -367,7 +352,7 @@ VALUE createDate(const struct tm *date) {
     arguments[2] = INT2FIX(date->tm_mday);
 
     /* Create the class instance. */
-    result = rb_funcall2(klass, rb_intern("new"), 3, arguments);
+    result = rb_funcall2(klass, NEW_ID, 3, arguments);
   }
 
 
@@ -412,7 +397,7 @@ VALUE createDateTime(VALUE dt) {
     arguments[6] = rb_funcall(rb_funcall(klass, rb_intern("now"), 0), rb_intern("offset"), 0);
 
     /* Create the class instance. */
-    result = rb_funcall2(klass, rb_intern("new"), 7, arguments);
+    result = rb_funcall2(klass, NEW_ID, 7, arguments);
   }
 
   return(result);
@@ -522,7 +507,7 @@ VALUE getModule(const char *name) {
   VALUE module = getConstant(name, Qnil);
 
   if(module != Qnil) {
-    VALUE type = rb_funcall(module, rb_intern("class"), 0);
+    VALUE type = rb_funcall(module, CLASS_ID, 0);
 
     if(type != rb_cModule) {
       module = Qnil;
@@ -545,7 +530,7 @@ VALUE getClass(const char *name) {
   VALUE klass = getConstant(name, Qnil);
 
   if(klass != Qnil) {
-    VALUE type = rb_funcall(klass, rb_intern("class"), 0);
+    VALUE type = rb_funcall(klass, CLASS_ID, 0);
 
     if(type != rb_cClass) {
       klass = Qnil;
@@ -570,7 +555,7 @@ VALUE getModuleInModule(const char *name, VALUE owner) {
   VALUE module = getConstant(name, owner);
 
   if(module != Qnil) {
-    VALUE type = rb_funcall(module, rb_intern("class"), 0);
+    VALUE type = rb_funcall(module, CLASS_ID, 0);
 
     if(type != rb_cModule) {
       module = Qnil;
@@ -595,7 +580,7 @@ VALUE getClassInModule(const char *name, VALUE owner) {
   VALUE klass = getConstant(name, owner);
 
   if(klass != Qnil) {
-    VALUE type = rb_funcall(klass, rb_intern("class"), 0);
+    VALUE type = rb_funcall(klass, CLASS_ID, 0);
 
     if(type != rb_cClass) {
       klass = Qnil;
@@ -617,7 +602,7 @@ VALUE getClassInModule(const char *name, VALUE owner) {
  */
 VALUE toDateTime(VALUE value) {
   VALUE result,
-        klass = rb_funcall(value, rb_intern("class"), 0),
+        klass = rb_funcall(value, CLASS_ID, 0),
         date_time_class = getClass("DateTime");
 
   if((klass == rb_cTime) || (klass == date_time_class)) {
@@ -813,7 +798,7 @@ void populateDoubleField(VALUE value, XSQLVAR *field) {
 
   if(TYPE(value) != T_FLOAT) {
     if(rb_obj_is_kind_of(value, rb_cNumeric) || TYPE(value) == T_STRING) {
-      actual = rb_funcall(value, rb_intern("to_f"), 0);
+      actual = rb_funcall(value, TO_F_ID, 0);
     } else {
       rb_fireruby_raise(NULL,
                         "Error converting input parameter to double.");
@@ -840,7 +825,7 @@ void populateFloatField(VALUE value, XSQLVAR *field) {
 
   if(TYPE(value) != T_FLOAT) {
     if(rb_obj_is_kind_of(value, rb_cNumeric) || TYPE(value) == T_STRING) {
-      actual = rb_funcall(value, rb_intern("to_f"), 0);
+      actual = rb_funcall(value, TO_F_ID, 0);
     } else {
       rb_fireruby_raise(NULL,
                         "Error converting input parameter to double.");
@@ -981,3 +966,18 @@ void populateTimestampField(VALUE value, XSQLVAR *field) {
   isc_encode_timestamp(&datetime, (ISC_TIMESTAMP *)field->sqldata);
   field->sqltype   = SQL_TIMESTAMP;
 }
+
+void Init_TypeMap() {
+  NEW_ID = rb_intern("new");
+  TO_F_ID = rb_intern("to_f");
+  ROUND_ID = rb_intern("round");
+  ASTERISK_ID = rb_intern("*");
+  CLASS_ID = rb_intern("class");
+  CONNECTION_ID = rb_intern("connection");
+  TRANSACTION_ID = rb_intern("transaction");
+  STATEMENT_ID = rb_intern("statement");
+  NAME_ID = rb_intern("name");
+  AT_VALUE_ID = rb_intern("@value");
+  AT_TYPE_ID = rb_intern("@type");
+  AT_COLUMN_ID = rb_intern("@column");
+}

data/ext/TypeMap.h

@@ -40,6 +40,7 @@
    #endif
 
 /* Function prototypes. */
+void Init_TypeMap();
 VALUE toArray(VALUE);
 void setParameters(XSQLDA *, VALUE, VALUE, VALUE);
 VALUE getModule(const char *);

data/rubyfb.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "rubyfb"
-  s.version = "0.6.3"
+  s.version = "0.6.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["George Georgiev"]
-  s.date = "2012-02-21"
+  s.date = "2012-03-23"
   s.description = "Firebird SQL access library"
   s.email = "georgiev@heatbs.com"
   s.extensions = ["ext/extconf.rb"]
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Rubyfb", "--main", "README"]
   s.require_paths = ["lib", "ext"]
   s.rubyforge_project = "rubyfb"
-  s.rubygems_version = "1.8.11"
+  s.rubygems_version = "1.8.20"
   s.summary = "Firebird SQL access library"
 
   if s.respond_to? :specification_version then

data/test/KeyTest.rb

@@ -122,10 +122,10 @@ class KeyTest < Test::Unit::TestCase
       assert(array.include?(['COL03', 3]))
       
       hash = data.to_hash
-      assert(hash.length == 3)
-      assert(hash['COL01'] == 1)
-      assert(hash['COL02'] == 'Two')
-      assert(hash['COL03'] == 3)
+      assert_equal(3, hash.length)
+      assert_equal(1, hash['COL01'])
+      assert_equal('Two', hash['COL02'])
+      assert_equal(3, hash['COL03'])
       
       array = data.values_at('COL10', 'COL02', 'COL03')
       assert(array.size == 3)

data/test/RowTest.rb

@@ -20,20 +20,6 @@ class RowTest < Test::Unit::TestCase
       @connection  = database.connect(DB_USER_NAME, DB_PASSWORD)
       @transaction = @connection.start_transaction
       @results     = @connection.execute('SELECT * FROM RDB$FIELDS', @transaction)
-      @empty       = [[0, SQLType::INTEGER], [0, SQLType::INTEGER],
-                      [0, SQLType::INTEGER], [0, SQLType::INTEGER],
-                      [0, SQLType::INTEGER], [0, SQLType::INTEGER],
-                      [0, SQLType::INTEGER], [0, SQLType::INTEGER],
-                      [0, SQLType::INTEGER], [0, SQLType::INTEGER],
-                      [0, SQLType::INTEGER], [0, SQLType::INTEGER],
-                      [0, SQLType::INTEGER], [0, SQLType::INTEGER],
-                      [0, SQLType::INTEGER], [0, SQLType::INTEGER],
-                      [0, SQLType::INTEGER], [0, SQLType::INTEGER],
-                      [0, SQLType::INTEGER], [0, SQLType::INTEGER],
-                      [0, SQLType::INTEGER], [0, SQLType::INTEGER],
-                      [0, SQLType::INTEGER], [0, SQLType::INTEGER],
-                      [0, SQLType::INTEGER], [0, SQLType::INTEGER],
-                      [0, SQLType::INTEGER], [0, SQLType::INTEGER]]
       
       @connection.start_transaction do |tx|
          tx.execute('create table rowtest (COL01 integer, COL02 varchar(10), '\
@@ -68,17 +54,6 @@ class RowTest < Test::Unit::TestCase
       puts "#{self.class.name} finished." if TEST_LOGGING
    end
    
-   def test01
-      row = Row.new(@results, @empty, 100)
-      
-      assert(row.column_count == 28)
-      assert(row.number == 100)
-      assert(row.column_name(0) == 'RDB$FIELD_NAME')
-      assert(row.column_alias(10) == 'RDB$FIELD_TYPE')
-      assert(row[0] == 0)
-      assert(row['RDB$FIELD_TYPE'] == 0)
-   end
-   
    def test02
       sql  = 'select COL01 one, COL02 two, COL03 three from rowtest'
       rows = @connection.execute_immediate(sql)
@@ -86,7 +61,7 @@ class RowTest < Test::Unit::TestCase
       
       count = 0
       data.each do |name, value|
-         assert(['ONE', 'TWO', 'THREE'].include?(name))
+         assert(['ONE', 'TWO', 'THREE'].include?(name), name)
          assert([1, 'Two', 3].include?(value))
          count += 1
       end
@@ -181,7 +156,7 @@ class RowTest < Test::Unit::TestCase
          results = @connection.execute_immediate('select * from all_types')
          row     = results.fetch
          
-         assert(row.get_base_type(0) == SQLType::BIGINT)
+         assert_equal(SQLType::BIGINT, row.get_base_type(0))
          assert(row.get_base_type(1) == SQLType::BLOB)
          assert(row.get_base_type(2) == SQLType::CHAR)
          assert(row.get_base_type(3) == SQLType::DATE)
@@ -214,4 +189,22 @@ class RowTest < Test::Unit::TestCase
    ensure
       results.close if results
    end
+   
+   def test05
+      @connection.start_transaction do |tx|
+         tx.execute('create table rowtest2 (COL01 varchar(5000), COL02 varchar(5000), '\
+                    'COL03 integer)')
+      end
+      1000.times do |i|
+        begin
+          st = @connection.create_statement("insert into rowtest2 values (?, ?, ?)")
+          st.exec(['a'*5000, 'b'*5000, i])
+        ensure
+          st.close
+        end
+      end
+      @connection.execute_immediate("select * from rowtest2") do |row|
+        puts "#{row}\n"
+      end
+   end
 end