rubyfb 0.6.3 → 0.6.4

data/CHANGELOG

@@ -1,3 +1,6 @@
+v0.6.4 ==
+Tyr to fix another Segmentation fault in Row class (GC integration issues)
+
 v0.6.3 ==
 Fix change_column() migration method
 Fix Segmentation fault in Row class (GC integration issues)

data/Rakefile

@@ -1,5 +1,5 @@
 require 'echoe'
-e = Echoe.new('rubyfb', '0.6.3') do |p|
+e = Echoe.new('rubyfb', '0.6.4') do |p|
   p.description    = "Firebird SQL access library"
   p.url            = "http://rubyforge.org/projects/rubyfb"
   p.author         = "George Georgiev"

data/ext/ResultSet.c

@@ -31,8 +31,8 @@
 #include "Transaction.h"
 #include "DataArea.h"
 #include "Row.h"
-#include "TypeMap.h"
 #include "ruby.h"
+#include "FireRuby.h"
 
 /* Function prototypes. */
 static VALUE allocateResultSet(VALUE);
@@ -58,7 +58,10 @@ static VALUE isResultSetExhausted(VALUE);
 /* Globals. */
 VALUE cResultSet;
 
-StatementHandle* getStatementHandle(VALUE self) {
+ID NEW_ID, SIZE_ID, AT_NAME_ID, AT_ALIAS_ID, AT_KEY_ID, AT_SCALE_ID, AT_COLUMNS_ID, AT_TYPE_ID,
+  AT_RELATION_ID, AT_STATEMENT_ID, AT_TRANSACTION_ID, AT_COLUMNS_ID;
+
+static StatementHandle* getStatementHandle(VALUE self) {
   StatementHandle *hStatement;
   Data_Get_Struct(getResultSetStatement(self), StatementHandle, hStatement);
   
@@ -87,6 +90,15 @@ void resultSetManageStatement(VALUE self) {
   hResults->manage_statement = 1;
 }
 
+/**
+ * @self - the result set object
+ * @return - columns metadata array
+*/
+
+VALUE getResultsColumns(VALUE self) {
+  return rb_ivar_get(self, AT_COLUMNS_ID);
+}
+
 /**
  * This method allocates a new ResultSet object.
  *
@@ -123,13 +135,40 @@ VALUE allocateResultSet(VALUE klass) {
  *
  */
 VALUE initializeResultSet(VALUE self, VALUE statement, VALUE transaction) {
+  int index;
   ResultsHandle *hResults = NULL;
-  Data_Get_Struct(self, ResultsHandle, hResults);
+  StatementHandle *hStatement;
+  XSQLVAR *var;
+  VALUE columns, column, name, alias, key_flag;
 
-  rb_iv_set(self, "@statement", statement);
-  rb_iv_set(self, "@transaction", transaction);
-  hResults->active = 1;
+  Data_Get_Struct(self, ResultsHandle, hResults);
+  rb_ivar_set(self, AT_STATEMENT_ID, statement);
+  rb_ivar_set(self, AT_TRANSACTION_ID, transaction);
   
+  hStatement = getStatementHandle(self);
+  var = hStatement->output->sqlvar;
+  columns = rb_ary_new2(hStatement->output->sqld);
+  rb_ivar_set(self, AT_COLUMNS_ID, columns);
+
+  key_flag = getFireRubySetting("ALIAS_KEYS");
+  for(index = 0; index < hStatement->output->sqld; index++, var++) {
+    column = rb_funcall(rb_cObject, NEW_ID, 0);
+    rb_ary_store(columns, index, column);
+    name = rb_str_new(var->sqlname, var->sqlname_length);
+    alias = rb_str_new(var->aliasname, var->aliasname_length);
+    rb_ivar_set(column, AT_NAME_ID, name);
+    rb_ivar_set(column, AT_ALIAS_ID, alias);
+    if(key_flag == Qtrue) {
+      rb_ivar_set(column, AT_KEY_ID, alias);
+    } else {
+      rb_ivar_set(column, AT_KEY_ID, name);
+    }
+    rb_ivar_set(column, AT_TYPE_ID, getColumnType(var));
+    rb_ivar_set(column, AT_SCALE_ID, INT2FIX(var->sqlscale));
+    rb_ivar_set(column, AT_RELATION_ID, rb_str_new(var->relname, var->relname_length));
+  }
+  
+  hResults->active = 1;
   return(self);
 }
 
@@ -147,8 +186,7 @@ VALUE getResultSetRow(VALUE self) {
 
   Data_Get_Struct(self, ResultsHandle, hResults);
   if(hResults->fetched) {
-    VALUE array = toArray(self);
-    row = rb_row_new(self, array, INT2FIX(hResults->fetched));
+    row = rb_row_new(self, INT2FIX(hResults->fetched));
   }
   return (row);
 }
@@ -277,7 +315,7 @@ VALUE getResultSetConnection(VALUE self) {
  *
  */
 VALUE getResultSetTransaction(VALUE self) {
-  return rb_iv_get(self, "@transaction");
+  return rb_ivar_get(self, AT_TRANSACTION_ID);
 }
 
 /**
@@ -291,7 +329,7 @@ VALUE getResultSetTransaction(VALUE self) {
  *
  */
 VALUE getResultSetStatement(VALUE self) {
-  return rb_iv_get(self, "@statement");
+  return rb_ivar_get(self, AT_STATEMENT_ID);
 }
 
 
@@ -333,7 +371,7 @@ VALUE getResultSetDialect(VALUE self) {
  *
  */
 VALUE getResultSetColumnCount(VALUE self) {
-  return(INT2NUM(getStatementHandle(self)->output->sqld));
+  return rb_funcall(getResultsColumns(self), SIZE_ID, 0);
 }
 
 
@@ -573,6 +611,19 @@ void resultSetFree(void *handle) {
  *
  */
 void Init_ResultSet(VALUE module) {
+  NEW_ID = rb_intern("new");
+  SIZE_ID = rb_intern("size");
+  AT_NAME_ID = rb_intern("@name");
+  AT_ALIAS_ID = rb_intern("@alias");
+  AT_KEY_ID = rb_intern("@key");
+  AT_SCALE_ID = rb_intern("@scale");
+  AT_COLUMNS_ID = rb_intern("@columns");
+  AT_TYPE_ID = rb_intern("@type");
+  AT_RELATION_ID = rb_intern("@relation");
+  AT_STATEMENT_ID = rb_intern("@statement");
+  AT_TRANSACTION_ID = rb_intern("@transaction");
+  AT_COLUMNS_ID = rb_intern("@columns");
+
   cResultSet = rb_define_class_under(module, "ResultSet", rb_cObject);
   rb_define_alloc_func(cResultSet, allocateResultSet);
   rb_include_module(cResultSet, rb_mEnumerable);

data/ext/ResultSet.h

@@ -52,6 +52,7 @@ short isActiveResultSet(VALUE);
 VALUE yieldResultsRows(VALUE);
 void resultSetManageTransaction(VALUE);
 void resultSetManageStatement(VALUE);
+VALUE getResultsColumns(VALUE);
 
 #endif /* FIRERUBY_RESULT_SET_H */
 

data/ext/Row.c

@@ -25,13 +25,13 @@
 
 /* Includes. */
 #include "Row.h"
+#include "TypeMap.h"
 #include "FireRuby.h"
 #include "ibase.h"
 #include "ruby.h"
 
 /* Function prototypes. */
-static VALUE allocateRow(VALUE);
-static VALUE initializeRow(VALUE, VALUE, VALUE, VALUE);
+static VALUE initializeRow(VALUE, VALUE, VALUE);
 static VALUE columnsInRow(VALUE);
 static VALUE getRowNumber(VALUE);
 static VALUE getColumnName(VALUE, VALUE);
@@ -57,72 +57,71 @@ static VALUE rowValuesAt(int, VALUE *, VALUE);
 
 /* Globals. */
 VALUE cRow;
+ID EQL_ID, FETCH_ID, NEW_ID, 
+  AT_COLUMNS_ID, AT_NUMBER_ID,
+  AT_NAME_ID, AT_ALIAS_ID, AT_KEY_ID, AT_SCALE_ID, 
+  AT_VALUE_ID, AT_TYPE_ID, AT_COLUMN_ID;
 
-/**
- * This function integrates with the Ruby garbage collector to insure that
- * all resources associated with a Row object are marked during the mark phase
- *
- * @param  row  A pointer to the RowHandle object for the Row object.
- *
- */
-void rowGCMark(void *handle) {
-  if(handle != NULL) {
-    RowHandle *row = (RowHandle *)handle;
-    int i;
-    for(i = 0; i < row->size; i++) {
-      rb_gc_mark(row->columns[i].value);
-      rb_gc_mark(row->columns[i].type);
-      rb_gc_mark(row->columns[i].scale);
-    }
+static VALUE getColumns(VALUE self) {
+  return rb_ivar_get(self, AT_COLUMNS_ID);
+}
+
+static VALUE checkRowOffset(VALUE columns, VALUE index) {
+  int offset = FIX2INT(index);
+
+  /* Correct negative index values. */
+  if(offset < 0) {
+    return INT2NUM(RARRAY_LEN(columns) + offset);
   }
+  return index;
 }
 
-/**
- * This function integrates with the Ruby garbage collector to insure that
- * all resources associated with a Row object are released whenever the Row
- * object is collected.
- *
- * @param  row  A pointer to the RowHandle object for the Row object.
- *
- */
-void freeRow(void *row) {
-  if(row != NULL) {
-    RowHandle *handle = (RowHandle *)row;
+static VALUE metadataScan(VALUE self, VALUE key, ID slot) {
+  long idx;
+  VALUE columns = getColumns(self);
 
-    if(handle->columns != NULL) {
-      free(handle->columns);
+  for(idx=0; idx < RARRAY_LEN(columns); idx++) {
+    VALUE column = rb_ary_entry(columns, idx),
+          meta_data = rb_ivar_get(column, AT_COLUMN_ID);
+    if(Qtrue == rb_funcall(rb_ivar_get(meta_data, slot), EQL_ID, 1, key)) {
+      return(column);
     }
-    free(handle);
   }
+  return(Qnil);
 }
 
-/**
- * This function integrates with the Ruby memory allocation system to allocate
- * space for new Row objects.
- *
- * @param  klass  A reference to the Row class.
- *
- * @return  A reference to the Row class instance allocated.
- *
- */
-static VALUE allocateRow(VALUE klass) {
-  VALUE row;
-  RowHandle *handle = ALLOC(RowHandle);
-
-  if(handle != NULL) {
-    /* Initialise the row fields. */
-    handle->size    = 0;
-    handle->number  = 0;
-    handle->columns = NULL;
-    row             = Data_Wrap_Struct(klass, rowGCMark, freeRow, handle);
-  } else {
-    /* Generate an exception. */
-    rb_raise(rb_eNoMemError, "Memory allocation failure allocating a row.");
+static VALUE rowCollect(VALUE self, ID slot, short metadata_flag) {
+  VALUE columns = getColumns(self);
+  long idx, size = RARRAY_LEN(columns);
+  VALUE result = rb_ary_new2(size);
+  for(idx=0; idx < size; idx++) {
+    VALUE target = rb_ary_entry(columns, idx);
+    if(metadata_flag) {
+      target = rb_ivar_get(target, AT_COLUMN_ID);
+    }
+    rb_ary_store(result, idx, rb_ivar_get(target, slot));
   }
+  return(result);
+}
 
-  return(row);
+static VALUE getColumn(VALUE columns, VALUE index) {
+  return rb_funcall(columns, FETCH_ID, 1, index);
 }
 
+static VALUE getMetadata(VALUE columns, VALUE index) {
+  return rb_ivar_get(getColumn(columns, index), AT_COLUMN_ID);
+}
+
+static VALUE columnKey(VALUE column) {
+  return rb_ivar_get(rb_ivar_get(column, AT_COLUMN_ID), AT_KEY_ID);
+}
+
+static VALUE keyValuePair(VALUE column) {
+  VALUE result = rb_ary_new2(2);
+  rb_ary_store(result, 0, columnKey(column));
+  rb_ary_store(result, 1, rb_ivar_get(column, AT_VALUE_ID));
+  return(result);
+}
 
 /**
  * This function provides the initialize method for the Row class.
@@ -140,46 +139,9 @@ static VALUE allocateRow(VALUE klass) {
  * @return  A reference to the initialize Row object.
  *
  */
-static VALUE initializeRow(VALUE self, VALUE results, VALUE data, VALUE number) {
-  RowHandle *row  = NULL;
-  VALUE value = rb_funcall(data, rb_intern("size"), 0);
-
-  Data_Get_Struct(self, RowHandle, row);
-  rb_iv_set(self, "@number", number);
-  row->size = TYPE(value) == T_FIXNUM ? FIX2INT(value) : NUM2INT(value);
-  if(row->size > 0) {
-    row->columns = ALLOC_N(ColumnHandle, row->size);
-
-    if(row->columns != NULL) {
-      int i;
-
-      memset(row->columns, 0, sizeof(ColumnHandle) * row->size);
-      for(i = 0; i < row->size; i++) {
-        VALUE index,
-              name,
-              alias,
-              scale,
-              items;
-
-        index = INT2NUM(i);
-        name  = rb_funcall(results, rb_intern("column_name"), 1, index);
-        alias = rb_funcall(results, rb_intern("column_alias"), 1, index);
-        strcpy(row->columns[i].name, StringValuePtr(name));
-        strcpy(row->columns[i].alias, StringValuePtr(alias));
-        items = rb_ary_entry(data, i);
-        row->columns[i].value = rb_ary_entry(items, 0);
-        row->columns[i].type  = rb_ary_entry(items, 1);
-        row->columns[i].scale = rb_funcall(results, rb_intern("column_scale"), 1, index);
-
-        if(TYPE(rb_ary_entry(items, 1)) == T_NIL) {
-          fprintf(stderr, "Nil column type encountered.\n");
-        }
-      }
-    } else {
-      rb_raise(rb_eNoMemError, "Memory allocation failure populating row.");
-    }
-  }
-
+static VALUE initializeRow(VALUE self, VALUE results, VALUE number) {
+  rb_ivar_set(self, AT_NUMBER_ID, number);
+  rb_ivar_set(self, AT_COLUMNS_ID, toRowColumns(results));
   return(self);
 }
 
@@ -193,11 +155,7 @@ static VALUE initializeRow(VALUE self, VALUE results, VALUE data, VALUE number)
  *
  */
 static VALUE columnsInRow(VALUE self) {
-  RowHandle *row = NULL;
-
-  Data_Get_Struct(self, RowHandle, row);
-
-  return(INT2NUM(row->size));
+  return LONG2NUM(RARRAY_LEN(getColumns(self)));
 }
 
 
@@ -210,7 +168,7 @@ static VALUE columnsInRow(VALUE self) {
  *
  */
 static VALUE getRowNumber(VALUE self) {
-  return(rb_iv_get(self, "@number"));
+  return(rb_ivar_get(self, AT_NUMBER_ID));
 }
 
 
@@ -225,17 +183,7 @@ static VALUE getRowNumber(VALUE self) {
  *
  */
 static VALUE getColumnName(VALUE self, VALUE index) {
-  VALUE name   = Qnil;
-  RowHandle *row   = NULL;
-  int number = 0;
-
-  Data_Get_Struct(self, RowHandle, row);
-  number = TYPE(index) == T_FIXNUM ? FIX2INT(index) : NUM2INT(index);
-  if(number >= 0 && number < row->size) {
-    name = rb_str_new2(row->columns[number].name);
-  }
-
-  return(name);
+  return rb_ivar_get(getMetadata(getColumns(self), index), AT_NAME_ID);
 }
 
 
@@ -250,17 +198,7 @@ static VALUE getColumnName(VALUE self, VALUE index) {
  *
  */
 static VALUE getColumnAlias(VALUE self, VALUE index) {
-  VALUE alias  = Qnil;
-  RowHandle *row   = NULL;
-  int number = 0;
-
-  Data_Get_Struct(self, RowHandle, row);
-  number = TYPE(index) == T_FIXNUM ? FIX2INT(index) : NUM2INT(index);
-  if(number >= 0 && number < row->size) {
-    alias = rb_str_new2(row->columns[number].alias);
-  }
-
-  return(alias);
+  return rb_ivar_get(getMetadata(getColumns(self), index), AT_ALIAS_ID);
 }
 
 
@@ -276,41 +214,17 @@ static VALUE getColumnAlias(VALUE self, VALUE index) {
  *
  */
 static VALUE getColumnValue(VALUE self, VALUE index) {
-  VALUE value  = Qnil;
-  RowHandle *row   = NULL;
+  VALUE fld;
 
-  Data_Get_Struct(self, RowHandle, row);
   if(TYPE(index) == T_STRING) {
-    char name[32];
-    int i,
-        done = 0;
-    VALUE flag = getFireRubySetting("ALIAS_KEYS");
-
-    strcpy(name, StringValuePtr(index));
-    for(i = 0; i < row->size && done == 0; i++) {
-      int match;
-
-      /* Check whether its column name or column alias to compare on. */
-      if(flag == Qtrue) {
-        match = strcmp(name, row->columns[i].alias);
-      } else {
-        match = strcmp(name, row->columns[i].name);
-      }
-
-      if(match == 0) {
-        value = row->columns[i].value;
-        done  = 1;
-      }
-    }
+    fld = metadataScan(self, index, AT_KEY_ID);
   } else {
-    int number = TYPE(index) == T_FIXNUM ? FIX2INT(index) : NUM2INT(index);
-
-    if(number >= 0 && number < row->size) {
-      value = row->columns[number].value;
-    }
+    fld = getColumn(getColumns(self), index);
   }
-
-  return(value);
+  if(Qnil == fld) {
+    return(Qnil);
+  }
+  return rb_ivar_get(fld, AT_VALUE_ID);
 }
 
 
@@ -328,22 +242,10 @@ VALUE eachColumn(VALUE self) {
   VALUE result = Qnil;
 
   if(rb_block_given_p()) {
-    RowHandle *row = NULL;
-    int i;
-    VALUE flag = getFireRubySetting("ALIAS_KEYS");
-
-    Data_Get_Struct(self, RowHandle, row);
-    for(i = 0; i < row->size; i++) {
-      VALUE parameters = rb_ary_new();
-
-      /* Decide whether we're keying on column name or alias. */
-      if(flag == Qtrue) {
-        rb_ary_push(parameters, rb_str_new2(row->columns[i].alias));
-      } else {
-        rb_ary_push(parameters, rb_str_new2(row->columns[i].name));
-      }
-      rb_ary_push(parameters, row->columns[i].value);
-      result = rb_yield(parameters);
+    long i;
+    VALUE columns = getColumns(self);
+    for(i = 0; i < RARRAY_LEN(columns); i++) {
+      result = rb_yield(keyValuePair(rb_ary_entry(columns, i)));
     }
   }
 
@@ -366,17 +268,10 @@ VALUE eachColumnKey(VALUE self) {
   VALUE result = Qnil;
 
   if(rb_block_given_p()) {
-    RowHandle *row = NULL;
-    int i;
-    VALUE flag = getFireRubySetting("ALIAS_KEYS");
-
-    Data_Get_Struct(self, RowHandle, row);
-    for(i = 0; i < row->size; i++) {
-      if(flag == Qtrue) {
-        result = rb_yield(rb_str_new2(row->columns[i].alias));
-      } else {
-        result = rb_yield(rb_str_new2(row->columns[i].name));
-      }
+    long i;
+    VALUE columns = getColumns(self);
+    for(i = 0; i < RARRAY_LEN(columns); i++) {
+      result = rb_yield(columnKey(rb_ary_entry(columns, i)));
     }
   }
 
@@ -398,12 +293,10 @@ VALUE eachColumnValue(VALUE self) {
   VALUE result = Qnil;
 
   if(rb_block_given_p()) {
-    RowHandle *row = NULL;
-    int i;
-
-    Data_Get_Struct(self, RowHandle, row);
-    for(i = 0; i < row->size; i++) {
-      result = rb_yield(row->columns[i].value);
+    long i;
+    VALUE columns = getColumns(self);
+    for(i = 0; i < RARRAY_LEN(columns); i++) {
+      result = rb_yield(rb_ivar_get(rb_ary_entry(columns, i), AT_VALUE_ID));
     }
   }
 
@@ -460,30 +353,10 @@ VALUE fetchRowValue(int size, VALUE *parameters, VALUE self) {
  *
  */
 VALUE hasColumnKey(VALUE self, VALUE name) {
-  VALUE result = Qfalse;
-  RowHandle *row   = NULL;
-  char text[32];
-  int i;
-  VALUE flag = getFireRubySetting("ALIAS_KEYS");
-
-  Data_Get_Struct(self, RowHandle, row);
-  strcpy(text, StringValuePtr(name));
-  for(i = 0; i < row->size && result == Qfalse; i++) {
-    int match;
-
-    /* Check whether key is column name or alias. */
-    if(flag == Qtrue) {
-      match = strcmp(text, row->columns[i].alias);
-    } else {
-      match = strcmp(text, row->columns[i].name);
-    }
-
-    if(match == 0) {
-      result = Qtrue;
-    }
+  if(Qnil == metadataScan(self, name, AT_KEY_ID)) {
+    return Qfalse;
   }
-
-  return(result);
+  return Qtrue;
 }
 
 
@@ -499,20 +372,10 @@ VALUE hasColumnKey(VALUE self, VALUE name) {
  *
  */
 VALUE hasColumnName(VALUE self, VALUE name) {
-  VALUE result = Qfalse;
-  RowHandle *row   = NULL;
-  char text[32];
-  int i;
-
-  Data_Get_Struct(self, RowHandle, row);
-  strcpy(text, StringValuePtr(name));
-  for(i = 0; i < row->size && result == Qfalse; i++) {
-    if(strcmp(text, row->columns[i].name) == 0) {
-      result = Qtrue;
-    }
+  if(Qnil == metadataScan(self, name, AT_NAME_ID)) {
+    return Qfalse;
   }
-
-  return(result);
+  return Qtrue;
 }
 
 
@@ -528,20 +391,10 @@ VALUE hasColumnName(VALUE self, VALUE name) {
  *
  */
 VALUE hasColumnAlias(VALUE self, VALUE name) {
-  VALUE result = Qfalse;
-  RowHandle *row   = NULL;
-  char text[32];
-  int i;
-
-  Data_Get_Struct(self, RowHandle, row);
-  strcpy(text, StringValuePtr(name));
-  for(i = 0; i < row->size && result == Qfalse; i++) {
-    if(strcmp(text, row->columns[i].alias) == 0) {
-      result = Qtrue;
-    }
+  if(Qnil == metadataScan(self, name, AT_ALIAS_ID)) {
+    return Qfalse;
   }
-
-  return(result);
+  return Qtrue;
 }
 
 
@@ -555,19 +408,16 @@ VALUE hasColumnAlias(VALUE self, VALUE name) {
  *
  */
 VALUE hasColumnValue(VALUE self, VALUE value) {
-  VALUE result = Qfalse;
-  RowHandle *row   = NULL;
-  int i;
-
-  Data_Get_Struct(self, RowHandle, row);
-  for(i = 0; i < row->size && result == Qfalse; i++) {
-    result = rb_funcall(row->columns[i].value, rb_intern("eql?"), 1, value);
+  long i;
+  VALUE columns = getColumns(self);
+  for(i = 0; i < RARRAY_LEN(columns); i++) {
+    if(Qtrue == rb_funcall(rb_ivar_get(rb_ary_entry(columns, i), AT_VALUE_ID), EQL_ID, 1, value)) {
+      return(Qtrue);
+    }
   }
-
-  return(result);
+  return(Qfalse);
 }
 
-
 /**
  * This function fetches a list of column index keys for a Row object. What the
  * keys are depends on the library settings, but they will either be the column
@@ -579,16 +429,7 @@ VALUE hasColumnValue(VALUE self, VALUE value) {
  *
  */
 VALUE getColumnKeys(VALUE self) {
-  VALUE flag = getFireRubySetting("ALIAS_KEYS"),
-        keys = Qnil;
-
-  if(flag == Qtrue) {
-    keys = getColumnAliases(self);
-  } else {
-    keys = getColumnNames(self);
-  }
-
-  return(keys);
+  return rowCollect(self, AT_KEY_ID, 1);
 }
 
 
@@ -601,16 +442,7 @@ VALUE getColumnKeys(VALUE self) {
  *
  */
 VALUE getColumnNames(VALUE self) {
-  VALUE result = rb_ary_new();
-  RowHandle *row   = NULL;
-  int i;
-
-  Data_Get_Struct(self, RowHandle, row);
-  for(i = 0; i < row->size; i++) {
-    rb_ary_push(result, rb_str_new2(row->columns[i].name));
-  }
-
-  return(result);
+  return rowCollect(self, AT_NAME_ID, 1);
 }
 
 
@@ -623,16 +455,7 @@ VALUE getColumnNames(VALUE self) {
  *
  */
 VALUE getColumnAliases(VALUE self) {
-  VALUE result = rb_ary_new();
-  RowHandle *row   = NULL;
-  int i;
-
-  Data_Get_Struct(self, RowHandle, row);
-  for(i = 0; i < row->size; i++) {
-    rb_ary_push(result, rb_str_new2(row->columns[i].alias));
-  }
-
-  return(result);
+  return rowCollect(self, AT_ALIAS_ID, 1);
 }
 
 
@@ -645,16 +468,7 @@ VALUE getColumnAliases(VALUE self) {
  *
  */
 VALUE getColumnValues(VALUE self) {
-  VALUE result = rb_ary_new();
-  RowHandle *row   = NULL;
-  int i;
-
-  Data_Get_Struct(self, RowHandle, row);
-  for(i = 0; i < row->size; i++) {
-    rb_ary_push(result, row->columns[i].value);
-  }
-
-  return(result);
+  return rowCollect(self, AT_VALUE_ID, 0);
 }
 
 
@@ -668,27 +482,8 @@ VALUE getColumnValues(VALUE self) {
  *
  */
 VALUE getColumnBaseType(VALUE self, VALUE index) {
-  VALUE result = Qnil;
-
-  if(TYPE(index) == T_FIXNUM) {
-    RowHandle *row   = NULL;
-
-    Data_Get_Struct(self, RowHandle, row);
-    if(row != NULL) {
-      int offset = FIX2INT(index);
-
-      /* Correct negative index values. */
-      if(offset < 0) {
-        offset = row->size + offset;
-      }
-
-      if(offset >= 0 && offset < row->size) {
-        result = row->columns[offset].type;
-      }
-    }
-  }
-
-  return(result);
+  VALUE columns = getColumns(self);
+  return rb_ivar_get(getMetadata(columns, checkRowOffset(columns, index)), AT_TYPE_ID);
 }
 
 /**
@@ -703,27 +498,8 @@ VALUE getColumnBaseType(VALUE self, VALUE index) {
  *
  */
 static VALUE getColumnScale(VALUE self, VALUE index) {
-  VALUE result = Qnil;
-
-  if(TYPE(index) == T_FIXNUM) {
-    RowHandle *row   = NULL;
-
-    Data_Get_Struct(self, RowHandle, row);
-    if(row != NULL) {
-      int offset = FIX2INT(index);
-
-      /* Correct negative index values. */
-      if(offset < 0) {
-        offset = row->size + offset;
-      }
-
-      if(offset >= 0 && offset < row->size) {
-        result = row->columns[offset].scale;
-      }
-    }
-  }
-
-  return(result);
+  VALUE columns = getColumns(self);
+  return rb_ivar_get(getMetadata(columns, checkRowOffset(columns, index)), AT_SCALE_ID);
 }
 
 
@@ -737,33 +513,21 @@ static VALUE getColumnScale(VALUE self, VALUE index) {
  *
  */
 VALUE selectRowEntries(VALUE self) {
-  VALUE result = Qnil,
-        flag   = getFireRubySetting("ALIAS_KEYS");
-  RowHandle *row   = NULL;
-  int i;
+  long i;
+  VALUE result = rb_ary_new(),
+        columns = getColumns(self);
 
   if(!rb_block_given_p()) {
     rb_raise(rb_eStandardError, "No block specified in call to Row#select.");
   }
 
-  result = rb_ary_new();
-  Data_Get_Struct(self, RowHandle, row);
-  for(i = 0; i < row->size; i++) {
-    VALUE parameters = rb_ary_new();
-
-    /* Check whether we're keying on column name or alias. */
-    if(flag == Qtrue) {
-      rb_ary_push(parameters, rb_str_new2(row->columns[i].alias));
-    } else {
-      rb_ary_push(parameters, rb_str_new2(row->columns[i].name));
-    }
-    rb_ary_push(parameters, row->columns[i].value);
+  for(i = 0; i < RARRAY_LEN(columns); i++) {
+    VALUE parameters = keyValuePair(rb_ary_entry(columns, i));
     if(rb_yield(parameters) == Qtrue) {
       rb_ary_push(result, parameters);
     }
   }
 
-
   return(result);
 }
 
@@ -777,23 +541,12 @@ VALUE selectRowEntries(VALUE self) {
  *
  */
 VALUE rowToArray(VALUE self) {
+  long i;
   VALUE result = rb_ary_new(),
-        flag   = getFireRubySetting("ALIAS_KEYS");
-  RowHandle *row   = NULL;
-  int i;
+        columns = getColumns(self);
 
-  Data_Get_Struct(self, RowHandle, row);
-  for(i = 0; i < row->size; i++) {
-    VALUE parameters = rb_ary_new();
-
-    /* Check whether we're keying on column name or alias. */
-    if(flag == Qtrue) {
-      rb_ary_push(parameters, rb_str_new2(row->columns[i].alias));
-    } else {
-      rb_ary_push(parameters, rb_str_new2(row->columns[i].name));
-    }
-    rb_ary_push(parameters, row->columns[i].value);
-    rb_ary_push(result, parameters);
+  for(i = 0; i < RARRAY_LEN(columns); i++) {
+    rb_ary_push(result, keyValuePair(rb_ary_entry(columns, i)));
   }
 
   return(result);
@@ -809,22 +562,13 @@ VALUE rowToArray(VALUE self) {
  *
  */
 VALUE rowToHash(VALUE self) {
+  long i;
   VALUE result = rb_hash_new(),
-        flag   = getFireRubySetting("ALIAS_KEYS");
-  RowHandle *row   = NULL;
-  int i;
+        columns = getColumns(self);
 
-  Data_Get_Struct(self, RowHandle, row);
-  for(i = 0; i < row->size; i++) {
-    VALUE key = Qnil;
-
-    /* Check if we're keying on column name or alias. */
-    if(flag == Qtrue) {
-      key = rb_str_new2(row->columns[i].alias);
-    } else {
-      key = rb_str_new2(row->columns[i].name);
-    }
-    rb_hash_aset(result, key, row->columns[i].value);
+  for(i = 0; i < RARRAY_LEN(columns); i++) {
+    VALUE fld = rb_ary_entry(columns, i);
+    rb_hash_aset(result, columnKey(fld), rb_ivar_get(fld, AT_VALUE_ID));
   }
 
   return(result);
@@ -842,8 +586,8 @@ VALUE rowToHash(VALUE self) {
  *
  */
 VALUE rowValuesAt(int size, VALUE *keys, VALUE self) {
-  VALUE result = rb_ary_new();
   int i;
+  VALUE result = rb_ary_new();
 
   for(i = 0; i < size; i++) {
     rb_ary_push(result, getColumnValue(self, keys[i]));
@@ -863,10 +607,12 @@ VALUE rowValuesAt(int size, VALUE *keys, VALUE self) {
  * @return  A reference to the Row object created.
  *
  */
-VALUE rb_row_new(VALUE results, VALUE data, VALUE number) {
-  VALUE row = allocateRow(cRow);
+VALUE rb_row_new(VALUE results, VALUE number) {
+  VALUE row = rb_funcall(cRow, NEW_ID, 2, results, number);
+
+  RB_GC_GUARD(row);
 
-  initializeRow(row, results, data, number);
+  initializeRow(row, results, number);
 
   return(row);
 }
@@ -881,10 +627,23 @@ VALUE rb_row_new(VALUE results, VALUE data, VALUE number) {
  *
  */
 void Init_Row(VALUE module) {
+  Init_TypeMap();
+  EQL_ID = rb_intern("eql?");
+  FETCH_ID = rb_intern("fetch");
+  AT_NAME_ID = rb_intern("@name");
+  AT_ALIAS_ID = rb_intern("@alias");
+  AT_KEY_ID = rb_intern("@key");
+  AT_SCALE_ID = rb_intern("@scale");
+  AT_COLUMNS_ID = rb_intern("@columns");
+  AT_NUMBER_ID = rb_intern("@number");
+  AT_VALUE_ID = rb_intern("@value");
+  AT_TYPE_ID = rb_intern("@type");
+  NEW_ID = rb_intern("new");
+  AT_COLUMN_ID = rb_intern("@column");
+  
   cRow = rb_define_class_under(module, "Row", rb_cObject);
-  rb_define_alloc_func(cRow, allocateRow);
   rb_include_module(cRow, rb_mEnumerable);
-  rb_define_method(cRow, "initialize", initializeRow, 3);
+  rb_define_method(cRow, "initialize", initializeRow, 2);
   rb_define_method(cRow, "number", getRowNumber, 0);
   rb_define_method(cRow, "column_count", columnsInRow, 0);
   rb_define_method(cRow, "column_name", getColumnName, 1);