rubyfb 0.5.5 → 0.5.6

data/ext/ResultSet.c

@@ -3,20 +3,20 @@
  *----------------------------------------------------------------------------*/
 /**
  * Copyright � Peter Wood, 2005
- * 
+ *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with the
- * License. You may obtain a copy of the License at 
+ * License. You may obtain a copy of the License at
  *
  * http://www.mozilla.org/MPL/
- * 
+ *
  * Software distributed under the License is distributed on an "AS IS" basis,
  * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
  * the specificlanguage governing rights and  limitations under the License.
- * 
+ *
  * The Original Code is the FireRuby extension for the Ruby language.
- * 
- * The Initial Developer of the Original Code is Peter Wood. All Rights 
+ *
+ * The Initial Developer of the Original Code is Peter Wood. All Rights
  * Reserved.
  *
  * @author  Peter Wood
@@ -47,6 +47,7 @@ static VALUE getResultSetDialect(VALUE);
 static VALUE getResultSetColumnCount(VALUE);
 static VALUE getResultSetColumnName(VALUE, VALUE);
 static VALUE getResultSetColumnAlias(VALUE, VALUE);
+static VALUE getResultSetColumnScale(VALUE, VALUE);
 static VALUE getResultSetColumnTable(VALUE, VALUE);
 static VALUE getResultSetColumnType(VALUE, VALUE);
 static VALUE eachResultSetRow(VALUE);
@@ -67,24 +68,22 @@ VALUE cResultSet;
  * @return  A reference to the newly allocated ResultSet object.
  *
  */
-VALUE allocateResultSet(VALUE klass)
-{
-   ResultsHandle *results = ALLOC(ResultsHandle);
-   
-   if(results == NULL)
-   {
-      rb_raise(rb_eNoMemError,
-               "Memory allocation failure allocating a result set.");
-   }
-   results->handle      = 0;
-   results->output      = NULL;
-   results->exhausted   = 0;
-   results->fetched     = 0;
-   results->dialect     = 0;
-   results->procedure_output_fetch_state = -1;
-   results->transaction = Qnil;
-   
-   return(Data_Wrap_Struct(klass, resultSetMark, resultSetFree, results));
+VALUE allocateResultSet(VALUE klass) {
+  ResultsHandle *results = ALLOC(ResultsHandle);
+
+  if(results == NULL) {
+    rb_raise(rb_eNoMemError,
+             "Memory allocation failure allocating a result set.");
+  }
+  results->handle      = 0;
+  results->output      = NULL;
+  results->exhausted   = 0;
+  results->fetched     = 0;
+  results->dialect     = 0;
+  results->procedure_output_fetch_state = -1;
+  results->transaction = Qnil;
+
+  return(Data_Wrap_Struct(klass, resultSetMark, resultSetFree, results));
 }
 
 
@@ -107,140 +106,122 @@ VALUE allocateResultSet(VALUE klass)
  *
  */
 VALUE initializeResultSet(VALUE self, VALUE connection, VALUE transaction,
-                          VALUE sql, VALUE dialect, VALUE parameters)
-{
-   short             setting     = 0;
-   int               type        = 0,
-                     inputs      = 0,
-                     outputs     = 0;
-   long              affected    = 0;
-   ResultsHandle     *results    = NULL;
-   VALUE             value       = Qnil;
-   ConnectionHandle  *cHandle    = NULL;
-   TransactionHandle *tHandle    = NULL;
-   XSQLDA            *params     = NULL;
-   
-   /* Validate the inputs. */
-   if(TYPE(connection) == T_DATA &&
-      RDATA(connection)->dfree == (RUBY_DATA_FUNC)connectionFree)
-   {
-      if(rb_funcall(connection, rb_intern("open?"), 0) == Qfalse)
-      {
-         rb_fireruby_raise(NULL, "Closed connection specified for result set.");
-      }
-   }
-   else
-   {
-      rb_fireruby_raise(NULL, "Invalid connection specified for result set.");
-   }
-
-   if(TYPE(transaction) == T_DATA &&
-      RDATA(transaction)->dfree == (RUBY_DATA_FUNC)transactionFree)
-   {
-      if(rb_funcall(transaction, rb_intern("active?"), 0) == Qfalse)
-      {
-         rb_fireruby_raise(NULL, "Inactive transaction specified for result set.");
-      }
-   }
-   else
-   {
-      rb_fireruby_raise(NULL, "Invalid transaction specified for result set.");
-   }
-   
-   value = rb_funcall(dialect, rb_intern("to_i"), 0);
-   if(TYPE(value) == T_FIXNUM)
-   {
-      setting = FIX2INT(value);
-      if(setting < 1 || setting > 3)
-      {
-         rb_fireruby_raise(NULL,
-                           "Invalid dialect value specified for result set. "\
-                           "The dialect value must be between 1 and 3.");
-      }
-   }
-   else
-   {
+                          VALUE sql, VALUE dialect, VALUE parameters) {
+  short setting     = 0;
+  int type        = 0,
+      inputs      = 0,
+      outputs     = 0;
+  long affected    = 0;
+  ResultsHandle     *results    = NULL;
+  VALUE value       = Qnil;
+  ConnectionHandle  *cHandle    = NULL;
+  TransactionHandle *tHandle    = NULL;
+  XSQLDA            *params     = NULL;
+
+  /* Validate the inputs. */
+  if(TYPE(connection) == T_DATA &&
+     RDATA(connection)->dfree == (RUBY_DATA_FUNC)connectionFree) {
+    if(rb_funcall(connection, rb_intern("open?"), 0) == Qfalse) {
+      rb_fireruby_raise(NULL, "Closed connection specified for result set.");
+    }
+  } else {
+    rb_fireruby_raise(NULL, "Invalid connection specified for result set.");
+  }
+
+  if(TYPE(transaction) == T_DATA &&
+     RDATA(transaction)->dfree == (RUBY_DATA_FUNC)transactionFree) {
+    if(rb_funcall(transaction, rb_intern("active?"), 0) == Qfalse) {
+      rb_fireruby_raise(NULL, "Inactive transaction specified for result set.");
+    }
+  } else {
+    rb_fireruby_raise(NULL, "Invalid transaction specified for result set.");
+  }
+
+  value = rb_funcall(dialect, rb_intern("to_i"), 0);
+  if(TYPE(value) == T_FIXNUM) {
+    setting = FIX2INT(value);
+    if(setting < 1 || setting > 3) {
       rb_fireruby_raise(NULL,
-                        "Invalid dialect value specified for result set. The "\
-                        "dialect value must be between 1 and 3.");
-   }
-   
-   /* Prepare the result set. */
-   Data_Get_Struct(connection, ConnectionHandle, cHandle);
-   Data_Get_Struct(transaction, TransactionHandle, tHandle);
-   Data_Get_Struct(self, ResultsHandle, results);
-   prepare(&cHandle->handle, &tHandle->handle, StringValuePtr(sql), &results->handle,
-           setting, &type, &inputs, &outputs);
-           
-   if(type != isc_info_sql_stmt_select &&
-      type != isc_info_sql_stmt_select_for_upd &&
-      type != isc_info_sql_stmt_exec_procedure)
-   {
+                        "Invalid dialect value specified for result set. " \
+                        "The dialect value must be between 1 and 3.");
+    }
+  } else {
+    rb_fireruby_raise(NULL,
+                      "Invalid dialect value specified for result set. The " \
+                      "dialect value must be between 1 and 3.");
+  }
+
+  /* Prepare the result set. */
+  Data_Get_Struct(connection, ConnectionHandle, cHandle);
+  Data_Get_Struct(transaction, TransactionHandle, tHandle);
+  Data_Get_Struct(self, ResultsHandle, results);
+  prepare(&cHandle->handle, &tHandle->handle, StringValuePtr(sql), &results->handle,
+          setting, &type, &inputs, &outputs);
+
+  if(type != isc_info_sql_stmt_select &&
+     type != isc_info_sql_stmt_select_for_upd &&
+     type != isc_info_sql_stmt_exec_procedure) {
+    cleanupHandle(&results->handle);
+    rb_fireruby_raise(NULL,
+                      "Non-query SQL statement specified for result set.");
+  }
+
+  rb_iv_set(self, "@connection", connection);
+  rb_iv_set(self, "@transaction", transaction);
+  rb_iv_set(self, "@sql", rb_funcall(sql, rb_intern("to_s"), 0));
+  rb_iv_set(self, "@dialect", value);
+  results->dialect = setting;
+
+  /* UNCOMMENT FOR DEBUGGING PURPOSES! */
+  /*strcpy(results->sql, StringValuePtr(sql));*/
+
+  /* Check if input parameters are needed. */
+  if(inputs > 0) {
+    VALUE value = Qnil;
+    int size  = 0;
+
+    if(parameters == Qnil) {
       cleanupHandle(&results->handle);
       rb_fireruby_raise(NULL,
-                        "Non-query SQL statement specified for result set.");
-   }
-   
-   rb_iv_set(self, "@connection", connection);
-   rb_iv_set(self, "@transaction", transaction);
-   rb_iv_set(self, "@sql", rb_funcall(sql, rb_intern("to_s"), 0));
-   rb_iv_set(self, "@dialect", value);
-   results->dialect = setting;
-   
-   /* UNCOMMENT FOR DEBUGGING PURPOSES! */
-   /*strcpy(results->sql, StringValuePtr(sql));*/
-   
-   /* Check if input parameters are needed. */
-   if(inputs > 0)
-   {
-      VALUE value = Qnil;
-      int   size  = 0;
-      
-      if(parameters == Qnil)
-      {
-         cleanupHandle(&results->handle);
-         rb_fireruby_raise(NULL,
-                           "Empty parameter list specified for result set.");
-      }
-      
-      value = rb_funcall(parameters, rb_intern("size"), 0);
-      size  = TYPE(value) == T_FIXNUM ? FIX2INT(value) : NUM2INT(value);
-      if(size < inputs)
-      {
-         cleanupHandle(&results->handle);
-         rb_fireruby_raise(NULL,
-                           "Insufficient parameters specified for result set.");
-      }
-      
-      /* Allocate the XSQLDA and populate it. */
-      params = allocateInXSQLDA(inputs, &results->handle, setting);
-      prepareDataArea(params);
-      setParameters(params, parameters, self);
-   }
-   
-   /* Allocate output storage. */
-   results->output = allocateOutXSQLDA(outputs, &results->handle, setting);
-   prepareDataArea(results->output);
-   
-   /* Execute the statement and clean up. */
-	if(type == isc_info_sql_stmt_exec_procedure) {
-		/* Execute with output params */
-		execute_2(&tHandle->handle, &results->handle, setting, params, type,
-					&affected, results->output);
-		/* Initialize procedure output fetch */
-		results->procedure_output_fetch_state = 0;
-		/* Early resolve transaction */
-		resolveResultsTransaction (results, "commit");
-	} else {
-		execute(&tHandle->handle, &results->handle, setting, params, type,
-					&affected);
-	}
-   if(params != NULL)
-   {
-      releaseDataArea(params);
-   }
-   
-   return(self);
+                        "Empty parameter list specified for result set.");
+    }
+
+    value = rb_funcall(parameters, rb_intern("size"), 0);
+    size  = TYPE(value) == T_FIXNUM ? FIX2INT(value) : NUM2INT(value);
+    if(size < inputs) {
+      cleanupHandle(&results->handle);
+      rb_fireruby_raise(NULL,
+                        "Insufficient parameters specified for result set.");
+    }
+
+    /* Allocate the XSQLDA and populate it. */
+    params = allocateInXSQLDA(inputs, &results->handle, setting);
+    prepareDataArea(params);
+    setParameters(params, parameters, self);
+  }
+
+  /* Allocate output storage. */
+  results->output = allocateOutXSQLDA(outputs, &results->handle, setting);
+  prepareDataArea(results->output);
+
+  /* Execute the statement and clean up. */
+  if(type == isc_info_sql_stmt_exec_procedure) {
+    /* Execute with output params */
+    execute_2(&tHandle->handle, &results->handle, setting, params, type,
+              &affected, results->output);
+    /* Initialize procedure output fetch */
+    results->procedure_output_fetch_state = 0;
+    /* Early resolve transaction */
+    resolveResultsTransaction (results, "commit");
+  } else {
+    execute(&tHandle->handle, &results->handle, setting, params, type,
+            &affected);
+  }
+  if(params != NULL) {
+    releaseDataArea(params);
+  }
+
+  return(self);
 }
 
 
@@ -252,44 +233,41 @@ VALUE initializeResultSet(VALUE self, VALUE connection, VALUE transaction,
  * @return  Either a reference to a Row object or nil.
  *
  */
-VALUE fetchResultSetEntry(VALUE self)
-{
-   VALUE         row      = Qnil;
-   ResultsHandle *results = NULL;
-   ISC_STATUS    status[20],
-                 value;
-   
-   Data_Get_Struct(self, ResultsHandle, results);
-   if(results->handle != 0)
-   {
-		VALUE array,number;
-		value = results->procedure_output_fetch_state;
-		if(value < 0) {
-			value = isc_dsql_fetch(status, &results->handle, results->dialect,
-											results->output);
-		} else {
-			/* move procedure_output_fetch_state ahead - fetch only one row */
-			results->procedure_output_fetch_state = 100;
-		}
-		array  = Qnil;
-		number = Qnil;
-		switch(value)
-		{
-			case 0 :
-				array  = toArray(self);
-				number = INT2NUM(++(results->fetched));
-				row    = rb_row_new(self, array, number);
-				break;
-			case 100 :
-				results->exhausted = 1;
-				resolveResultsTransaction(results, "commit");
-				break;
-			default :
-				rb_fireruby_raise(status, "Error fetching query row.");
-		}
-   }
-   
-   return(row);
+VALUE fetchResultSetEntry(VALUE self) {
+  VALUE row      = Qnil;
+  ResultsHandle *results = NULL;
+  ISC_STATUS status[ISC_STATUS_LENGTH],
+             value;
+
+  Data_Get_Struct(self, ResultsHandle, results);
+  if(results->handle != 0) {
+    VALUE array,number;
+    value = results->procedure_output_fetch_state;
+    if(value < 0) {
+      value = isc_dsql_fetch(status, &results->handle, results->dialect,
+                             results->output);
+    } else {
+      /* move procedure_output_fetch_state ahead - fetch only one row */
+      results->procedure_output_fetch_state = 100;
+    }
+    array  = Qnil;
+    number = Qnil;
+    switch(value) {
+    case 0:
+      array  = toArray(self);
+      number = INT2NUM(++(results->fetched));
+      row    = rb_row_new(self, array, number);
+      break;
+    case 100:
+      results->exhausted = 1;
+      resolveResultsTransaction(results, "commit");
+      break;
+    default:
+      rb_fireruby_raise(status, "Error fetching query row.");
+    }
+  }
+
+  return(row);
 }
 
 
@@ -302,31 +280,27 @@ VALUE fetchResultSetEntry(VALUE self)
  * @return  A reference to the closed ResultSet object.
  *
  */
-VALUE closeResultSet(VALUE self)
-{
-   ResultsHandle *results = NULL;
-   
-   Data_Get_Struct(self, ResultsHandle, results);
-   if(results->handle != 0)
-   {
-      ISC_STATUS status[20];
-      
-      if(isc_dsql_free_statement(status, &results->handle, DSQL_drop))
-      {
-         rb_fireruby_raise(status, "Error closing result set.");
-      }
-      results->handle = 0;
-   }
-   
-   if(results->output != NULL)
-   {
-      releaseDataArea(results->output);
-      results->output = NULL;
-   }
-   
-	resolveResultsTransaction(results, "commit");
-   
-   return(self);
+VALUE closeResultSet(VALUE self) {
+  ResultsHandle *results = NULL;
+
+  Data_Get_Struct(self, ResultsHandle, results);
+  if(results->handle != 0) {
+    ISC_STATUS status[ISC_STATUS_LENGTH];
+
+    if(isc_dsql_free_statement(status, &results->handle, DSQL_drop)) {
+      rb_fireruby_raise(status, "Error closing result set.");
+    }
+    results->handle = 0;
+  }
+
+  if(results->output != NULL) {
+    releaseDataArea(results->output);
+    results->output = NULL;
+  }
+
+  resolveResultsTransaction(results, "commit");
+
+  return(self);
 }
 
 
@@ -340,13 +314,12 @@ VALUE closeResultSet(VALUE self)
  *          fetched from the ResultSet so far.
  *
  */
-VALUE getResultSetCount(VALUE self)
-{
-   ResultsHandle *results = NULL;
-   
-   Data_Get_Struct(self, ResultsHandle, results);
-   
-   return(INT2NUM(results->fetched));
+VALUE getResultSetCount(VALUE self) {
+  ResultsHandle *results = NULL;
+
+  Data_Get_Struct(self, ResultsHandle, results);
+
+  return(INT2NUM(results->fetched));
 }
 
 
@@ -360,9 +333,8 @@ VALUE getResultSetCount(VALUE self)
  * @return  A reference to the requested attribute object.
  *
  */
-VALUE getResultSetConnection(VALUE self)
-{
-   return(rb_iv_get(self, "@connection"));
+VALUE getResultSetConnection(VALUE self) {
+  return(rb_iv_get(self, "@connection"));
 }
 
 
@@ -376,9 +348,8 @@ VALUE getResultSetConnection(VALUE self)
  * @return  A reference to the requested attribute object.
  *
  */
-VALUE getResultSetTransaction(VALUE self)
-{
-   return(rb_iv_get(self, "@transaction"));
+VALUE getResultSetTransaction(VALUE self) {
+  return(rb_iv_get(self, "@transaction"));
 }
 
 
@@ -391,9 +362,8 @@ VALUE getResultSetTransaction(VALUE self)
  * @return  A reference to the requested attribute object.
  *
  */
-VALUE getResultSetSQL(VALUE self)
-{
-   return(rb_iv_get(self, "@sql"));
+VALUE getResultSetSQL(VALUE self) {
+  return(rb_iv_get(self, "@sql"));
 }
 
 
@@ -406,9 +376,8 @@ VALUE getResultSetSQL(VALUE self)
  * @return  A reference to the requested attribute object.
  *
  */
-VALUE getResultSetDialect(VALUE self)
-{
-   return(rb_iv_get(self, "@dialect"));
+VALUE getResultSetDialect(VALUE self) {
+  return(rb_iv_get(self, "@dialect"));
 }
 
 
@@ -421,18 +390,16 @@ VALUE getResultSetDialect(VALUE self)
  * @return  A reference to an integer containing the column count.
  *
  */
-VALUE getResultSetColumnCount(VALUE self)
-{
-   VALUE         count    = Qnil;
-   ResultsHandle *results = NULL;
-   
-   Data_Get_Struct(self, ResultsHandle, results);
-   if(results != NULL)
-   {
-      count = INT2NUM(results->output->sqld);
-   }
-   
-   return(count);
+VALUE getResultSetColumnCount(VALUE self) {
+  VALUE count    = Qnil;
+  ResultsHandle *results = NULL;
+
+  Data_Get_Struct(self, ResultsHandle, results);
+  if(results != NULL) {
+    count = INT2NUM(results->output->sqld);
+  }
+
+  return(count);
 }
 
 
@@ -447,28 +414,25 @@ VALUE getResultSetColumnCount(VALUE self)
  *          was specified.
  *
  */
-static VALUE getResultSetColumnName(VALUE self, VALUE column)
-{
-   VALUE         name     = Qnil;
-   ResultsHandle *results = NULL;
-   
-   Data_Get_Struct(self, ResultsHandle, results);
-   if(results != NULL)
-   {
-      int offset = 0;
-      
-      offset = (TYPE(column) == T_FIXNUM ? FIX2INT(column) : NUM2INT(column));
-      if(offset >= 0 && offset < results->output->sqld)
-      {
-         XSQLVAR *var = results->output->sqlvar;
-         int     index;
-         
-         for(index = 0; index < offset; index++, var++);
-         name = rb_str_new(var->sqlname, var->sqlname_length);
-      }
-   }
-   
-   return(name);
+static VALUE getResultSetColumnName(VALUE self, VALUE column) {
+  VALUE name     = Qnil;
+  ResultsHandle *results = NULL;
+
+  Data_Get_Struct(self, ResultsHandle, results);
+  if(results != NULL) {
+    int offset = 0;
+
+    offset = (TYPE(column) == T_FIXNUM ? FIX2INT(column) : NUM2INT(column));
+    if(offset >= 0 && offset < results->output->sqld) {
+      XSQLVAR *var = results->output->sqlvar;
+      int index;
+
+      for(index = 0; index < offset; index++, var++) ;
+      name = rb_str_new(var->sqlname, var->sqlname_length);
+    }
+  }
+
+  return(name);
 }
 
 
@@ -483,28 +447,57 @@ static VALUE getResultSetColumnName(VALUE self, VALUE column)
  *          was specified.
  *
  */
-static VALUE getResultSetColumnAlias(VALUE self, VALUE column)
-{
-   VALUE         alias    = Qnil;
-   ResultsHandle *results = NULL;
-   
-   Data_Get_Struct(self, ResultsHandle, results);
-   if(results != NULL)
-   {
-      int offset = 0;
-      
-      offset = (TYPE(column) == T_FIXNUM ? FIX2INT(column) : NUM2INT(column));
-      if(offset >= 0 && offset < results->output->sqld)
-      {
-         XSQLVAR *var = results->output->sqlvar;
-         int     index;
-         
-         for(index = 0; index < offset; index++, var++);
-         alias = rb_str_new(var->aliasname, var->aliasname_length);
-      }
-   }
-   
-   return(alias);
+static VALUE getResultSetColumnAlias(VALUE self, VALUE column) {
+  VALUE alias    = Qnil;
+  ResultsHandle *results = NULL;
+
+  Data_Get_Struct(self, ResultsHandle, results);
+  if(results != NULL) {
+    int offset = 0;
+
+    offset = (TYPE(column) == T_FIXNUM ? FIX2INT(column) : NUM2INT(column));
+    if(offset >= 0 && offset < results->output->sqld) {
+      XSQLVAR *var = results->output->sqlvar;
+      int index;
+
+      for(index = 0; index < offset; index++, var++) ;
+      alias = rb_str_new(var->aliasname, var->aliasname_length);
+    }
+  }
+
+  return(alias);
+}
+
+/**
+ * This function provides the column_scale method for the ResultSet class.
+ *
+ * @param  self    A reference to the ResultSet object to retrieve the column
+ *                 alias from.
+ * @param  column  An offset to the column to retrieve the scale of.
+ *
+ * @return  An Integer representing the sqlscale of the column, or nil if an
+ *          invalid column was specified.
+ *
+ */
+static VALUE getResultSetColumnScale(VALUE self, VALUE column) {
+  VALUE scale    = Qnil;
+  ResultsHandle *results = NULL;
+
+  Data_Get_Struct(self, ResultsHandle, results);
+  if(results != NULL) {
+    int offset = 0;
+
+    offset = (TYPE(column) == T_FIXNUM ? FIX2INT(column) : NUM2INT(column));
+    if(offset >= 0 && offset < results->output->sqld) {
+      XSQLVAR *var = results->output->sqlvar;
+      int index;
+
+      for(index = 0; index < offset; index++, var++) ;
+      scale = INT2FIX(var->sqlscale);
+    }
+  }
+
+  return(scale);
 }
 
 
@@ -519,28 +512,25 @@ static VALUE getResultSetColumnAlias(VALUE self, VALUE column)
  *          column was specified.
  *
  */
-static VALUE getResultSetColumnTable(VALUE self, VALUE column)
-{
-   VALUE         name    = Qnil;
-   ResultsHandle *results = NULL;
-   
-   Data_Get_Struct(self, ResultsHandle, results);
-   if(results != NULL)
-   {
-      int offset = 0;
-      
-      offset = (TYPE(column) == T_FIXNUM ? FIX2INT(column) : NUM2INT(column));
-      if(offset >= 0 && offset < results->output->sqld)
-      {
-         XSQLVAR *var = results->output->sqlvar;
-         int     index;
-         
-         for(index = 0; index < offset; index++, var++);
-         name = rb_str_new(var->relname, var->relname_length);
-      }
-   }
-   
-   return(name);
+static VALUE getResultSetColumnTable(VALUE self, VALUE column) {
+  VALUE name    = Qnil;
+  ResultsHandle *results = NULL;
+
+  Data_Get_Struct(self, ResultsHandle, results);
+  if(results != NULL) {
+    int offset = 0;
+
+    offset = (TYPE(column) == T_FIXNUM ? FIX2INT(column) : NUM2INT(column));
+    if(offset >= 0 && offset < results->output->sqld) {
+      XSQLVAR *var = results->output->sqlvar;
+      int index;
+
+      for(index = 0; index < offset; index++, var++) ;
+      name = rb_str_new(var->relname, var->relname_length);
+    }
+  }
+
+  return(name);
 }
 
 
@@ -554,34 +544,29 @@ static VALUE getResultSetColumnTable(VALUE self, VALUE column)
  * @return  A Symbol representing the basic data type.
  *
  */
-static VALUE getResultSetColumnType(VALUE self, VALUE column)
-{
-   VALUE type  = toSymbol("UNKNOWN");
-   
-   if(TYPE(column) == T_FIXNUM)
-   {
-      ResultsHandle *handle = NULL;
-      
-      Data_Get_Struct(self, ResultsHandle, handle);
-      if(handle != NULL)
-      {
-         int index = FIX2INT(column);
-         
-         /* Fix negative index values. */
-         if(index < 0)
-         {
-            index = handle->output->sqln + index;
-         }
-         
-         if(index >= 0 && index < handle->output->sqln)
-         {
-            type = getColumnType(&handle->output->sqlvar[index]);
-         }
+static VALUE getResultSetColumnType(VALUE self, VALUE column) {
+  VALUE type  = toSymbol("UNKNOWN");
+
+  if(TYPE(column) == T_FIXNUM) {
+    ResultsHandle *handle = NULL;
+
+    Data_Get_Struct(self, ResultsHandle, handle);
+    if(handle != NULL) {
+      int index = FIX2INT(column);
+
+      /* Fix negative index values. */
+      if(index < 0) {
+        index = handle->output->sqln + index;
       }
-   }
-   
-   
-   return(type);
+
+      if(index >= 0 && index < handle->output->sqln) {
+        type = getColumnType(&handle->output->sqlvar[index]);
+      }
+    }
+  }
+
+
+  return(type);
 }
 
 
@@ -594,22 +579,19 @@ static VALUE getResultSetColumnType(VALUE self, VALUE column)
  *          nil.
  *
  */
-VALUE eachResultSetRow(VALUE self)
-{
-   VALUE result = Qnil;
-   
-   /* Check if a block was provided. */
-   if(rb_block_given_p())
-   {
-      VALUE row;
-      
-      while((row = fetchResultSetEntry(self)) != Qnil)
-      {
-         result = rb_yield(row);
-      }
-   }
-   
-   return(result);
+VALUE eachResultSetRow(VALUE self) {
+  VALUE result = Qnil;
+
+  /* Check if a block was provided. */
+  if(rb_block_given_p()) {
+    VALUE row;
+
+    while((row = fetchResultSetEntry(self)) != Qnil) {
+      result = rb_yield(row);
+    }
+  }
+
+  return(result);
 }
 
 
@@ -622,18 +604,16 @@ VALUE eachResultSetRow(VALUE self)
  *          if they haven't.
  *
  */
-VALUE isResultSetExhausted(VALUE self)
-{
-   VALUE         exhausted = Qfalse;
-   ResultsHandle *results  = NULL;
-   
-   Data_Get_Struct(self, ResultsHandle, results);
-   if(results->exhausted)
-   {
-      exhausted = Qtrue;
-   }
-   
-   return(exhausted);
+VALUE isResultSetExhausted(VALUE self) {
+  VALUE exhausted = Qfalse;
+  ResultsHandle *results  = NULL;
+
+  Data_Get_Struct(self, ResultsHandle, results);
+  if(results->exhausted) {
+    exhausted = Qtrue;
+  }
+
+  return(exhausted);
 }
 
 
@@ -646,17 +626,14 @@ VALUE isResultSetExhausted(VALUE self)
  *                 being scanned by the garbage collector.
  *
  */
-void resultSetMark(void *handle)
-{
-   ResultsHandle *results = (ResultsHandle *)handle;
-   
-   if(results != NULL)
-   {
-      if(results->transaction != Qnil)
-      {
-         rb_gc_mark(results->transaction);
-      }
-   }
+void resultSetMark(void *handle) {
+  ResultsHandle *results = (ResultsHandle *)handle;
+
+  if(results != NULL) {
+    if(results->transaction != Qnil) {
+      rb_gc_mark(results->transaction);
+    }
+  }
 }
 
 
@@ -678,14 +655,13 @@ void resultSetMark(void *handle)
  *
  */
 VALUE rb_result_set_new(VALUE connection, VALUE transaction, VALUE sql,
-                        VALUE dialect, VALUE parameters)
-{
-   VALUE instance = allocateResultSet(cResultSet);
-   
-   initializeResultSet(instance, connection, transaction, sql, dialect,
-                       parameters);
-   
-   return(instance);
+                        VALUE dialect, VALUE parameters) {
+  VALUE instance = allocateResultSet(cResultSet);
+
+  initializeResultSet(instance, connection, transaction, sql, dialect,
+                      parameters);
+
+  return(instance);
 }
 
 
@@ -699,12 +675,11 @@ VALUE rb_result_set_new(VALUE connection, VALUE transaction, VALUE sql,
  *                      is assuming responsibility for.
  *
  */
-void rb_assign_transaction(VALUE set, VALUE transaction)
-{
-   ResultsHandle *results = NULL;
-   
-   Data_Get_Struct(set, ResultsHandle, results);
-   results->transaction = transaction;
+void rb_assign_transaction(VALUE set, VALUE transaction) {
+  ResultsHandle *results = NULL;
+
+  Data_Get_Struct(set, ResultsHandle, results);
+  results->transaction = transaction;
 }
 
 
@@ -716,29 +691,25 @@ void rb_assign_transaction(VALUE set, VALUE transaction)
  *                 object being collected.
  *
  */
-void resultSetFree(void *handle)
-{
-   if(handle != NULL)
-   {
-      ResultsHandle *results = (ResultsHandle *)handle;
-      
-      if(results->handle != 0)
-      {
-         ISC_STATUS status[20];
-         
-         /* UNCOMMENT FOR DEBUG PURPOSES! */
-         /*fprintf(stderr, "Releasing statement handle for...\n%s\n", results->sql);*/
-         isc_dsql_free_statement(status, &results->handle, DSQL_drop);
-      }
-      
-      if(results->output != NULL)
-      {
-         releaseDataArea(results->output);
-      }
-      
-		resolveResultsTransaction(results, "rollback");
-      free(results);
-   }
+void resultSetFree(void *handle) {
+  if(handle != NULL) {
+    ResultsHandle *results = (ResultsHandle *)handle;
+
+    if(results->handle != 0) {
+      ISC_STATUS status[ISC_STATUS_LENGTH];
+
+      /* UNCOMMENT FOR DEBUG PURPOSES! */
+      /*fprintf(stderr, "Releasing statement handle for...\n%s\n", results->sql);*/
+      isc_dsql_free_statement(status, &results->handle, DSQL_drop);
+    }
+
+    if(results->output != NULL) {
+      releaseDataArea(results->output);
+    }
+
+    resolveResultsTransaction(results, "rollback");
+    free(results);
+  }
 }
 
 
@@ -748,16 +719,14 @@ void resultSetFree(void *handle)
  * @param  handle  A pointer to the statement handle to be cleaned up.
  *
  */
-void cleanupHandle(isc_stmt_handle *handle)
-{
-   if(*handle != 0)
-   {
-      ISC_STATUS status[20];
-         
-      /* UNCOMMENT FOR DEBUG PURPOSES! */
-      /*fprintf(stderr, "Cleaning up a statement handle.\n");*/
-      isc_dsql_free_statement(status, handle, DSQL_drop);
-   }
+void cleanupHandle(isc_stmt_handle *handle) {
+  if(*handle != 0) {
+    ISC_STATUS status[ISC_STATUS_LENGTH];
+
+    /* UNCOMMENT FOR DEBUG PURPOSES! */
+    /*fprintf(stderr, "Cleaning up a statement handle.\n");*/
+    isc_dsql_free_statement(status, handle, DSQL_drop);
+  }
 }
 
 
@@ -769,13 +738,11 @@ void cleanupHandle(isc_stmt_handle *handle)
  * @param resolveMethod - transaction resolving method - eg. commit, rollback
  *
  */
-void resolveResultsTransaction(ResultsHandle *results, char *resolveMethod)
-{
-	if(results->transaction != Qnil)
-	{
-		rb_funcall(results->transaction, rb_intern(resolveMethod), 0);
-		results->transaction = Qnil;
-	}
+void resolveResultsTransaction(ResultsHandle *results, char *resolveMethod) {
+  if(results->transaction != Qnil) {
+    rb_funcall(results->transaction, rb_intern(resolveMethod), 0);
+    results->transaction = Qnil;
+  }
 }
 
 
@@ -786,25 +753,25 @@ void resolveResultsTransaction(ResultsHandle *results, char *resolveMethod)
  * @param  module  A reference to the module to create the class within.
  *
  */
-void Init_ResultSet(VALUE module)
-{
-   cResultSet = rb_define_class_under(module, "ResultSet", rb_cObject);
-   rb_define_alloc_func(cResultSet, allocateResultSet);
-   rb_include_module(cResultSet, rb_mEnumerable);
-   rb_define_method(cResultSet, "initialize", initializeResultSet, 5);
-   rb_define_method(cResultSet, "initialize_copy", forbidObjectCopy, 1);
-   rb_define_method(cResultSet, "row_count", getResultSetCount, 0);
-   rb_define_method(cResultSet, "fetch", fetchResultSetEntry, 0);
-   rb_define_method(cResultSet, "close", closeResultSet, 0);
-   rb_define_method(cResultSet, "connection", getResultSetConnection, 0);
-   rb_define_method(cResultSet, "transaction", getResultSetTransaction, 0);
-   rb_define_method(cResultSet, "sql", getResultSetSQL, 0);
-   rb_define_method(cResultSet, "dialect", getResultSetDialect, 0);
-   rb_define_method(cResultSet, "each", eachResultSetRow, 0);
-   rb_define_method(cResultSet, "column_name", getResultSetColumnName, 1);
-   rb_define_method(cResultSet, "column_alias", getResultSetColumnAlias, 1);
-   rb_define_method(cResultSet, "column_table", getResultSetColumnTable, 1);
-   rb_define_method(cResultSet, "column_count", getResultSetColumnCount, 0);
-   rb_define_method(cResultSet, "exhausted?", isResultSetExhausted, 0);
-   rb_define_method(cResultSet, "get_base_type", getResultSetColumnType, 1);
+void Init_ResultSet(VALUE module) {
+  cResultSet = rb_define_class_under(module, "ResultSet", rb_cObject);
+  rb_define_alloc_func(cResultSet, allocateResultSet);
+  rb_include_module(cResultSet, rb_mEnumerable);
+  rb_define_method(cResultSet, "initialize", initializeResultSet, 5);
+  rb_define_method(cResultSet, "initialize_copy", forbidObjectCopy, 1);
+  rb_define_method(cResultSet, "row_count", getResultSetCount, 0);
+  rb_define_method(cResultSet, "fetch", fetchResultSetEntry, 0);
+  rb_define_method(cResultSet, "close", closeResultSet, 0);
+  rb_define_method(cResultSet, "connection", getResultSetConnection, 0);
+  rb_define_method(cResultSet, "transaction", getResultSetTransaction, 0);
+  rb_define_method(cResultSet, "sql", getResultSetSQL, 0);
+  rb_define_method(cResultSet, "dialect", getResultSetDialect, 0);
+  rb_define_method(cResultSet, "each", eachResultSetRow, 0);
+  rb_define_method(cResultSet, "column_name", getResultSetColumnName, 1);
+  rb_define_method(cResultSet, "column_alias", getResultSetColumnAlias, 1);
+  rb_define_method(cResultSet, "column_scale", getResultSetColumnScale, 1);
+  rb_define_method(cResultSet, "column_table", getResultSetColumnTable, 1);
+  rb_define_method(cResultSet, "column_count", getResultSetColumnCount, 0);
+  rb_define_method(cResultSet, "exhausted?", isResultSetExhausted, 0);
+  rb_define_method(cResultSet, "get_base_type", getResultSetColumnType, 1);
 }