rubyfb 0.5.9 → 0.6

data/ext/ResultSet.c

@@ -36,12 +36,14 @@
 
 /* Function prototypes. */
 static VALUE allocateResultSet(VALUE);
-static VALUE initializeResultSet(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE);
+static VALUE initializeResultSet(VALUE, VALUE, VALUE);
+static VALUE getResultSetRow(VALUE);
 static VALUE fetchResultSetEntry(VALUE);
 static VALUE closeResultSet(VALUE);
 static VALUE getResultSetCount(VALUE);
 static VALUE getResultSetConnection(VALUE);
 static VALUE getResultSetTransaction(VALUE);
+static VALUE getResultSetStatement(VALUE);
 static VALUE getResultSetSQL(VALUE);
 static VALUE getResultSetDialect(VALUE);
 static VALUE getResultSetColumnCount(VALUE);
@@ -52,14 +54,39 @@ static VALUE getResultSetColumnTable(VALUE, VALUE);
 static VALUE getResultSetColumnType(VALUE, VALUE);
 static VALUE eachResultSetRow(VALUE);
 static VALUE isResultSetExhausted(VALUE);
-static void resultSetMark(void *);
-static void cleanupHandle(isc_stmt_handle *handle);
-static void resolveResultsTransaction(ResultsHandle *results, char *resolveMethod);
-
 
 /* Globals. */
 VALUE cResultSet;
 
+StatementHandle* getStatementHandle(VALUE self) {
+  StatementHandle *hStatement;
+  Data_Get_Struct(getResultSetStatement(self), StatementHandle, hStatement);
+  
+  return (hStatement);
+}
+
+short isActiveResultSet(VALUE self) {
+  short result = 0;
+  if ((Qtrue == rb_obj_is_kind_of(self, cResultSet))) {
+    ResultsHandle *hResults = NULL;
+    Data_Get_Struct(self, ResultsHandle, hResults);
+    result = hResults->active;
+  }
+  return (result);
+}
+
+void resultSetManageTransaction(VALUE self) {
+  ResultsHandle *hResults = NULL;
+  Data_Get_Struct(self, ResultsHandle, hResults);
+  hResults->manage_transaction = 1;
+}
+
+void resultSetManageStatement(VALUE self) {
+  ResultsHandle *hResults = NULL;
+  Data_Get_Struct(self, ResultsHandle, hResults);
+  hResults->manage_statement = 1;
+}
+
 /**
  * This method allocates a new ResultSet object.
  *
@@ -75,15 +102,12 @@ VALUE allocateResultSet(VALUE klass) {
     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;
+  results->active = 0;
+  results->manage_transaction = 0;
+  results->manage_statement = 0;
 
-  return(Data_Wrap_Struct(klass, resultSetMark, resultSetFree, results));
+  return(Data_Wrap_Struct(klass, NULL, resultSetFree, results));
 }
 
 
@@ -91,137 +115,42 @@ VALUE allocateResultSet(VALUE klass) {
  * This function provides the initialize method for the ResultSet class.
  *
  * @param  self         A reference to the ResultSet object to be initialized.
- * @param  connection   A reference to a Connection object that will be used
- *                      in executing the statement.
- * @param  transaction  A reference to a Transaction object that will be used
- *                      in executing the statement.
- * @param  sql          A reference to a String containing the SQL statement to
- *                      be executed. Must be a query.
- * @param  dialect      A reference to an integer containing the SQL dialect to
- *                      be used in executing the query.
- * @param  parameters   A reference to an array containing the parameters to be
- *                      used in executing the query.
+ * @param  statement    A statement to iterate over
+ * @param  transaction  A reference to a privater transaction object
+ *                      taht should be managed by this ResultSet.
  *
  * @return  A reference to the newly initialize ResultSet object.
  *
  */
-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 {
-    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.");
-  }
+VALUE initializeResultSet(VALUE self, VALUE statement, VALUE transaction) {
+  ResultsHandle *hResults = NULL;
+  Data_Get_Struct(self, ResultsHandle, hResults);
 
-  rb_iv_set(self, "@connection", connection);
+  rb_iv_set(self, "@statement", statement);
   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.");
-    }
+  hResults->active = 1;
+  
+  return(self);
+}
 
-    /* Allocate the XSQLDA and populate it. */
-    params = allocateInXSQLDA(inputs, &results->handle, setting);
-    prepareDataArea(params);
-    setParameters(params, parameters, self);
-  }
+/**
+ * This function provides the row method for the ResultSet class.
+ *
+ * @param  self  A reference to the ResultSet object to make the call on.
+ *
+ * @return  Either a reference to a Row object or nil.
+ *
+ */
+VALUE getResultSetRow(VALUE self) {
+  VALUE row      = Qnil;
+  ResultsHandle *hResults = NULL;
 
-  /* 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);
+  Data_Get_Struct(self, ResultsHandle, hResults);
+  if(hResults->fetched) {
+    VALUE array = toArray(self);
+    row = rb_row_new(self, array, INT2FIX(hResults->fetched));
   }
-
-  return(self);
+  return (row);
 }
 
 
@@ -234,43 +163,37 @@ VALUE initializeResultSet(VALUE self, VALUE connection, VALUE transaction,
  *
  */
 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 && !results->exhausted) {
-    VALUE array,number;
-    value = results->procedure_output_fetch_state;
-    if(value < 0) {
-      value = isc_dsql_fetch(status, &results->handle, results->dialect,
-                             results->output);
+  VALUE row         = Qnil;
+  StatementHandle   *hStatement   = getStatementHandle(self);
+  ResultsHandle     *hResults = NULL;
+  ISC_STATUS        status[ISC_STATUS_LENGTH],
+                    fetch_result;
+
+  Data_Get_Struct(self, ResultsHandle, hResults);
+  if(hResults->active) {
+    if (isCursorStatement(hStatement)) {
+      fetch_result = isc_dsql_fetch(status, &hStatement->handle, hStatement->dialect,
+                             hStatement->output);
+      switch(fetch_result) {
+      case 0:
+        hResults->fetched += 1;
+        row = getResultSetRow(self);
+        break;
+      case 100:
+        hResults->active = 0;
+        break;
+      default:
+        rb_fireruby_raise(status, "Error fetching query row.");
+      }
     } 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.");
+      hResults->active = 0;
+      hResults->fetched = 1;
+      row = getResultSetRow(self);
     }
   }
-
-  return(row);
+  return (row);
 }
 
-
 /**
  * This function provides the close method for the ResultSet class, releasing
  * resources associated with the ResultSet.
@@ -281,24 +204,29 @@ VALUE fetchResultSetEntry(VALUE 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;
+  StatementHandle   *hStatement   = getStatementHandle(self);
+  ResultsHandle     *hResults = NULL;
+  Data_Get_Struct(self, ResultsHandle, hResults);
+  ISC_STATUS status[ISC_STATUS_LENGTH];
+
+  hResults->active = 0;
+  if(isc_dsql_free_statement(status, &hStatement->handle, DSQL_close)) {
+    rb_fireruby_raise(status, "Error closing cursor.");
   }
-
-  if(results->output != NULL) {
-    releaseDataArea(results->output);
-    results->output = NULL;
+  if(hResults->manage_statement) {
+    VALUE statement = getResultSetStatement(self),
+          menagement_required = rb_funcall(statement, rb_intern("prepared?"), 0);
+    if(Qtrue == menagement_required) {
+      rb_funcall(statement, rb_intern("close"), 0);
+    }  
+  }
+  if(hResults->manage_transaction) {
+    VALUE transaction = getResultSetTransaction(self),
+          menagement_required = rb_funcall(transaction, rb_intern("active?"), 0);
+    if(Qtrue == menagement_required) {
+      rb_funcall(transaction, rb_intern("commit"), 0);
+    }  
   }
-
-  resolveResultsTransaction(results, "commit");
 
   return(self);
 }
@@ -334,7 +262,7 @@ VALUE getResultSetCount(VALUE self) {
  *
  */
 VALUE getResultSetConnection(VALUE self) {
-  return(rb_iv_get(self, "@connection"));
+  return(rb_funcall(getResultSetStatement(self), rb_intern("connection"), 0));
 }
 
 
@@ -349,7 +277,21 @@ VALUE getResultSetConnection(VALUE self) {
  *
  */
 VALUE getResultSetTransaction(VALUE self) {
-  return(rb_iv_get(self, "@transaction"));
+  return rb_iv_get(self, "@transaction");
+}
+
+/**
+ * This method provides the accessor method for the transaction ResultSet
+ * statement.
+ *
+ * @param  self  A reference to the ResultSet object to fetch the attribute
+ *               from.
+ *
+ * @return  A reference to the requested attribute object.
+ *
+ */
+VALUE getResultSetStatement(VALUE self) {
+  return rb_iv_get(self, "@statement");
 }
 
 
@@ -363,7 +305,7 @@ VALUE getResultSetTransaction(VALUE self) {
  *
  */
 VALUE getResultSetSQL(VALUE self) {
-  return(rb_iv_get(self, "@sql"));
+  return(rb_funcall(getResultSetStatement(self), rb_intern("sql"), 0));
 }
 
 
@@ -377,7 +319,7 @@ VALUE getResultSetSQL(VALUE self) {
  *
  */
 VALUE getResultSetDialect(VALUE self) {
-  return(rb_iv_get(self, "@dialect"));
+  return(rb_funcall(getResultSetStatement(self), rb_intern("dialect"), 0));
 }
 
 
@@ -391,15 +333,7 @@ VALUE getResultSetDialect(VALUE self) {
  *
  */
 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);
+  return(INT2NUM(getStatementHandle(self)->output->sqld));
 }
 
 
@@ -415,21 +349,17 @@ VALUE getResultSetColumnCount(VALUE self) {
  *
  */
 static VALUE getResultSetColumnName(VALUE self, VALUE column) {
+  int offset = 0;
   VALUE name     = Qnil;
-  ResultsHandle *results = NULL;
-
-  Data_Get_Struct(self, ResultsHandle, results);
-  if(results != NULL) {
-    int offset = 0;
+  StatementHandle *hStatement = getStatementHandle(self);
 
-    offset = (TYPE(column) == T_FIXNUM ? FIX2INT(column) : NUM2INT(column));
-    if(offset >= 0 && offset < results->output->sqld) {
-      XSQLVAR *var = results->output->sqlvar;
-      int index;
+  offset = (TYPE(column) == T_FIXNUM ? FIX2INT(column) : NUM2INT(column));
+  if(offset >= 0 && offset < hStatement->output->sqld) {
+    XSQLVAR *var = hStatement->output->sqlvar;
+    int index;
 
-      for(index = 0; index < offset; index++, var++) ;
-      name = rb_str_new(var->sqlname, var->sqlname_length);
-    }
+    for(index = 0; index < offset; index++, var++) ;
+    name = rb_str_new(var->sqlname, var->sqlname_length);
   }
 
   return(name);
@@ -448,21 +378,17 @@ static VALUE getResultSetColumnName(VALUE self, VALUE column) {
  *
  */
 static VALUE getResultSetColumnAlias(VALUE self, VALUE column) {
+  int offset = 0;
   VALUE alias    = Qnil;
-  ResultsHandle *results = NULL;
-
-  Data_Get_Struct(self, ResultsHandle, results);
-  if(results != NULL) {
-    int offset = 0;
+  StatementHandle *hStatement = getStatementHandle(self);
 
-    offset = (TYPE(column) == T_FIXNUM ? FIX2INT(column) : NUM2INT(column));
-    if(offset >= 0 && offset < results->output->sqld) {
-      XSQLVAR *var = results->output->sqlvar;
-      int index;
+  offset = (TYPE(column) == T_FIXNUM ? FIX2INT(column) : NUM2INT(column));
+  if(offset >= 0 && offset < hStatement->output->sqld) {
+    XSQLVAR *var = hStatement->output->sqlvar;
+    int index;
 
-      for(index = 0; index < offset; index++, var++) ;
-      alias = rb_str_new(var->aliasname, var->aliasname_length);
-    }
+    for(index = 0; index < offset; index++, var++) ;
+    alias = rb_str_new(var->aliasname, var->aliasname_length);
   }
 
   return(alias);
@@ -480,21 +406,17 @@ static VALUE getResultSetColumnAlias(VALUE self, VALUE column) {
  *
  */
 static VALUE getResultSetColumnScale(VALUE self, VALUE column) {
+  int offset = 0;
   VALUE scale    = Qnil;
-  ResultsHandle *results = NULL;
+  StatementHandle *hStatement = getStatementHandle(self);
 
-  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 < hStatement->output->sqld) {
+    XSQLVAR *var = hStatement->output->sqlvar;
+    int index;
 
-    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);
-    }
+    for(index = 0; index < offset; index++, var++) ;
+    scale = INT2FIX(var->sqlscale);
   }
 
   return(scale);
@@ -513,21 +435,17 @@ static VALUE getResultSetColumnScale(VALUE self, VALUE column) {
  *
  */
 static VALUE getResultSetColumnTable(VALUE self, VALUE column) {
+  int offset = 0;
   VALUE name    = Qnil;
-  ResultsHandle *results = NULL;
-
-  Data_Get_Struct(self, ResultsHandle, results);
-  if(results != NULL) {
-    int offset = 0;
+  StatementHandle *hStatement = getStatementHandle(self);
 
-    offset = (TYPE(column) == T_FIXNUM ? FIX2INT(column) : NUM2INT(column));
-    if(offset >= 0 && offset < results->output->sqld) {
-      XSQLVAR *var = results->output->sqlvar;
-      int index;
+  offset = (TYPE(column) == T_FIXNUM ? FIX2INT(column) : NUM2INT(column));
+  if(offset >= 0 && offset < hStatement->output->sqld) {
+    XSQLVAR *var = hStatement->output->sqlvar;
+    int index;
 
-      for(index = 0; index < offset; index++, var++) ;
-      name = rb_str_new(var->relname, var->relname_length);
-    }
+    for(index = 0; index < offset; index++, var++) ;
+    name = rb_str_new(var->relname, var->relname_length);
   }
 
   return(name);
@@ -548,44 +466,28 @@ 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);
+    StatementHandle *hStatement = getStatementHandle(self);
+    int index = FIX2INT(column);
 
-      /* Fix negative index values. */
-      if(index < 0) {
-        index = handle->output->sqln + index;
-      }
+    /* Fix negative index values. */
+    if(index < 0) {
+      index = hStatement->output->sqln + index;
+    }
 
-      if(index >= 0 && index < handle->output->sqln) {
-        type = getColumnType(&handle->output->sqlvar[index]);
-      }
+    if(index >= 0 && index < hStatement->output->sqln) {
+      type = getColumnType(&hStatement->output->sqlvar[index]);
     }
   }
 
-
   return(type);
 }
 
-
-/**
- * This function provides the each method for the ResultSet class.
- *
- * @param  self  A reference to the ResultSet object to execute the method for.
- *
- * @return  A reference to the last value returned by the associated block or
- *          nil.
- *
- */
-VALUE eachResultSetRow(VALUE self) {
+VALUE yieldRows(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);
     }
@@ -594,6 +496,22 @@ VALUE eachResultSetRow(VALUE self) {
   return(result);
 }
 
+VALUE yieldResultsRows(VALUE self) {
+  return rb_ensure(yieldRows, self, closeResultSet, self);
+}
+
+/**
+ * This function provides the each method for the ResultSet class.
+ *
+ * @param  self  A reference to the ResultSet object to execute the method for.
+ *
+ * @return  A reference to the last value returned by the associated block or
+ *          nil.
+ *
+ */
+VALUE eachResultSetRow(VALUE self) {
+  return yieldRows(self);
+}
 
 /**
  * This function provides the exhausted? method of the ResultSet class.
@@ -605,84 +523,34 @@ VALUE eachResultSetRow(VALUE self) {
  *
  */
 VALUE isResultSetExhausted(VALUE self) {
-  VALUE exhausted = Qfalse;
-  ResultsHandle *results  = NULL;
+  VALUE exhausted = Qtrue;
+  ResultsHandle *hResults  = NULL;
 
-  Data_Get_Struct(self, ResultsHandle, results);
-  if(results->exhausted) {
-    exhausted = Qtrue;
+  Data_Get_Struct(self, ResultsHandle, hResults);
+  if(hResults->active) {
+    exhausted = Qfalse;
   }
 
   return(exhausted);
 }
 
 
-/**
- * This method integrates with the Ruby garbage collector to insure that, if
- * a ResultSet contains a reference to a Transaction object, it doesn't get
- * collected by the garbage collector unnecessarily.
- *
- * @param  handle  A void pointer to the structure associated with the object
- *                 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);
-    }
-  }
-}
-
-
 /**
  * This function provides a programmatic means of creating a ResultSet object.
  *
- * @param  connection   A reference to a Connection object that will be used
- *                      in executing the statement.
- * @param  transaction  A reference to a Transaction object that will be used
- *                      in executing the statement.
- * @param  sql          A reference to a String containing the SQL statement to
- *                      be executed. Must be a query.
- * @param  dialect      A reference to an integer containing the SQL dialect to
- *                      be used in executing the query.
- * @param  parameters   A reference to an array containing the parameters to be
- *                      used in executing the query.
+ * @param  statement    A statement to iterate over
+ * @param  transaction  A reference to a privater transaction object
+ *                      taht should be managed by this ResultSet.
+ * @param  owns_transaction  true if the result set should manage the transaction
  *
  * @return  A reference to the newly created ResultSet object.
  *
  */
-VALUE rb_result_set_new(VALUE connection, VALUE transaction, VALUE sql,
-                        VALUE dialect, VALUE parameters) {
+VALUE rb_result_set_new(VALUE statement, VALUE transaction) {
   VALUE instance = allocateResultSet(cResultSet);
-
-  initializeResultSet(instance, connection, transaction, sql, dialect,
-                      parameters);
-
-  return(instance);
+  return (initializeResultSet(instance, statement, transaction));
 }
 
-
-/**
- * This function assigns an anonymous transaction to a ResultSet, giving the
- * object responsibility for closing it.
- *
- * @param  set          A reference to the ResultSet object that will be taking
- *                      ownership of the Transaction.
- * @param  transaction  A reference to the Transaction object that the ResultSet
- *                      is assuming responsibility for.
- *
- */
-void rb_assign_transaction(VALUE set, VALUE transaction) {
-  ResultsHandle *results = NULL;
-
-  Data_Get_Struct(set, ResultsHandle, results);
-  results->transaction = transaction;
-}
-
-
 /**
  * This function integrates with the Ruby garbage collector to free all of the
  * resources for a ResultSet object that is being collected.
@@ -692,60 +560,11 @@ void rb_assign_transaction(VALUE set, VALUE transaction) {
  *
  */
 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);
-  }
-}
-
-
-/**
- * This is a simple function to aid in the clean up of statement handles.
- *
- * @param  handle  A pointer to the statement handle to be cleaned up.
- *
- */
-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);
+  if(handle) {
+    free(handle);
   }
 }
 
-
-/**
- * Simple helper function to resolve ResultsHandle associated transaction
- *
- * @param results - the ResultsHandle 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;
-  }
-}
-
-
 /**
  * This function initializes the ResultSet class within the Ruby environment.
  * The class is established under the module specified to the function.
@@ -757,13 +576,14 @@ 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", initializeResultSet, 2);
   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, "statement", getResultSetStatement, 0);
   rb_define_method(cResultSet, "sql", getResultSetSQL, 0);
   rb_define_method(cResultSet, "dialect", getResultSetDialect, 0);
   rb_define_method(cResultSet, "each", eachResultSetRow, 0);