rubyfb 0.5.9 → 0.6

data/ext/Connection.c

@@ -41,14 +41,12 @@ static VALUE getConnectionDatabase(VALUE);
 static VALUE startConnectionTransaction(VALUE);
 static VALUE connectionToString(VALUE);
 static VALUE executeOnConnection(VALUE, VALUE, VALUE);
+static VALUE executeOnConnectionWithParams(VALUE, VALUE, VALUE, VALUE);
 static VALUE executeOnConnectionImmediate(VALUE, VALUE);
+static VALUE createStatement(VALUE, VALUE);
 static VALUE getConnectionUser(VALUE);
 VALUE startTransactionBlock(VALUE);
 VALUE startTransactionRescue(VALUE, VALUE);
-VALUE executeBlock(VALUE);
-VALUE executeRescue(VALUE, VALUE);
-VALUE executeImmediateBlock(VALUE);
-VALUE executeImmediateRescue(VALUE, VALUE);
 char *createDPB(VALUE, VALUE, VALUE, short *);
 
 /* Globals. */
@@ -300,8 +298,26 @@ static VALUE connectionToString(VALUE self) {
  *          non-query statement.
  *
  */
- static VALUE executeOnConnection(VALUE self, VALUE sql, VALUE transaction) {
-  return rb_execute_sql(self, transaction, sql);
+VALUE executeOnConnection(VALUE self, VALUE sql, VALUE transaction) {
+  return executeOnConnectionWithParams(self, sql, rb_ary_new(), transaction);
+}
+
+/**
+ * This function provides the execute_for method for the Connection class.
+ *
+ * @param  self         A reference to the connection object to perform the
+ *                      execution through.
+ * @param  sql          A reference to the SQL statement to be executed.
+ * @param  params       Array containing parameter values for the statement.
+ * @param  transaction  A reference to the transction that the statement will
+ *                      be executed under.
+ *
+ * @return  Either a ResultSet object for a query statement or nil for a
+ *          non-query statement.
+ *
+ */
+VALUE executeOnConnectionWithParams(VALUE self, VALUE sql, VALUE params, VALUE transaction) {
+  return rb_execute_sql(self, sql, params, transaction);
 }
 
 /**
@@ -314,41 +330,23 @@ static VALUE connectionToString(VALUE self) {
  * @return  Always returns nil.
  *
  */
-static VALUE executeOnConnectionImmediate(VALUE self, VALUE sql) {
-  VALUE transaction = rb_transaction_new(self),
-        set         = Qnil,
-        results     = Qnil,
-        array       = rb_ary_new(),
-        dialect     = INT2FIX(3),
-        statement   = rb_statement_new(self, transaction, sql, dialect);
-
-  rb_ary_push(array, self);
-  rb_ary_push(array, transaction);
-  rb_ary_push(array, sql);
-  rb_ary_push(array, statement);
-
-  set = rb_rescue(executeBlock, array, executeRescue, array);
-  if(set != Qnil) {
-    if(TYPE(set) == T_DATA &&
-       RDATA(set)->dfree == (RUBY_DATA_FUNC)resultSetFree) {
-      rb_assign_transaction(set, transaction);
-      if(rb_block_given_p()) {
-        results = rb_rescue(executeImmediateBlock, set,
-                            executeImmediateRescue, set);
-      } else {
-        results = set;
-      }
-    } else {
-      rb_funcall(transaction, rb_intern("commit"), 0);
-      results = set;
-    }
-  } else {
-    rb_funcall(transaction, rb_intern("commit"), 0);
-  }
-
-  return(results);
+VALUE executeOnConnectionImmediate(VALUE self, VALUE sql) {
+  return executeOnConnection(self, sql, Qnil);
 }
 
+/**
+ * Create statement object
+ *
+ * @param  self  A reference to the connection object to perform the execution
+ *               through.
+ * @param  sql   A reference to the SQL statement to be executed.
+ *
+ * @return  Reference to the statement object.
+ *
+ */
+VALUE createStatement(VALUE self, VALUE sql) {
+  return rb_statement_new(self, sql);
+}
 
 /**
  * This function provides the user accessor method for the Connection object.
@@ -398,93 +396,6 @@ VALUE startTransactionRescue(VALUE transaction, VALUE error) {
   return(Qnil);
 }
 
-
-/**
- * This function is used to wrap the call to the executeOnConnection() function
- * made by the executeOnConnectionImmediate() function to help insure that the
- * transaction is rolled back in case of an error.
- *
- * @param  array  An array of the parameters for the function to use.
- *
- * @return  The ResultSet object generated by execution or nil if it wasn't a
- *          query.
- *
- */
-VALUE executeBlock(VALUE array) {
-  VALUE result      = Qnil,
-        connection  = rb_ary_entry(array, 0),
-        transaction = rb_ary_entry(array, 1),
-        sql         = rb_ary_entry(array, 2),
-        statement   = rb_ary_entry(array, 3);
-
-  result = rb_execute_statement(statement);
-  rb_statement_close(statement);
-
-  return(result);
-}
-
-
-/**
- * This function provides clean up for the execution of a block associated
- * with the execute method.
- *
- * @param  array        An array of the parameters for the function to use.
- * @param  error        A reference to details relating to the exception raised.
- *
- * @return  Would always returns nil except that it always raises an exception.
- *
- */
-VALUE executeRescue(VALUE array, VALUE error) {
-  VALUE transaction = rb_ary_entry(array, 1),
-        statement   = rb_ary_entry(array, 3);
-
-  rb_funcall(transaction, rb_intern("rollback"), 0);
-  rb_statement_close(statement);
-  rb_exc_raise(error);
-  return(Qnil);
-}
-
-
-/**
- * This function is executed to process a block passed to the execute_immedate
- * method.
- *
- * @param  set  A reference to the ResultSet to be processed by the block.
- *
- * @return  A reference to the return value generated by the block.
- *
- */
-VALUE executeImmediateBlock(VALUE set) {
-  VALUE result = Qnil,
-        row    = rb_funcall(set, rb_intern("fetch"), 0);
-
-  while(row != Qnil) {
-    result = rb_yield(row);
-    row    = rb_funcall(set, rb_intern("fetch"), 0);
-  }
-  rb_funcall(set, rb_intern("close"), 0);
-
-  return(result);
-}
-
-
-/**
- * This function provides clean up for the execution of a block associated
- * with the execute_immediate method.
- *
- * @param  set    A reference to the ResultSet object for the block.
- * @param  error  A reference to details relating to the exception raised.
- *
- * @return  Would always returns nil except that it always raises an exception.
- *
- */
-VALUE executeImmediateRescue(VALUE set, VALUE error) {
-  rb_funcall(set, rb_intern("close"), 0);
-  rb_exc_raise(error);
-  return(Qnil);
-}
-
-
 /**
  * This method creates a database parameter buffer to be used in creating a
  * database connection.
@@ -676,6 +587,7 @@ VALUE rb_connection_new(VALUE database, VALUE user, VALUE password, VALUE option
 }
 
 
+
 /**
  * This function is called to record the beginnings of a transactions against
  * a related connection.
@@ -760,7 +672,9 @@ void Init_Connection(VALUE module) {
   rb_define_method(cConnection, "start_transaction", startConnectionTransaction, 0);
   rb_define_method(cConnection, "to_s", connectionToString, 0);
   rb_define_method(cConnection, "execute", executeOnConnection, 2);
+  rb_define_method(cConnection, "execute_for", executeOnConnectionWithParams, 3);
   rb_define_method(cConnection, "execute_immediate", executeOnConnectionImmediate, 1);
+  rb_define_method(cConnection, "create_statement", createStatement, 1);
 
   rb_define_const(cConnection, "MARK_DATABASE_DAMAGED", INT2FIX(isc_dpb_damaged));
   rb_define_const(cConnection, "WRITE_POLICY", INT2FIX(isc_dpb_force_write));

data/ext/FireRubyException.c

@@ -55,8 +55,8 @@ static VALUE initializeFireRubyException(VALUE self, VALUE message) {
   }
 
   rb_iv_set(self, "@message", message);
-  rb_iv_set(self, "@sql_code", 0);
-  rb_iv_set(self, "@db_code", 0);
+  rb_iv_set(self, "@sql_code", INT2NUM(0));
+  rb_iv_set(self, "@db_code", INT2NUM(0));
 
   return(self);
 }
@@ -104,19 +104,31 @@ static VALUE getFireRubyExceptionMessage(VALUE self) {
 
 
 /**
- * This function decodes the contents of a Firebird ISC_STATUS array into a
- * String object.
+ * This function provides a means to programmatically create a new instance of
+ * the FireRubyException class.
+ *
+ * @param  message  A string containing the error message for the exception.
+ *
+ * @return  A reference to a newly created FireRubyException object.
  *
- * @param  status     A pointer to the status array to be decoded.
- * @param  prefix     An initial message that may be added to the exception as
- *                    part of the decoding. Ignored if it is NULL or has zero
- *                    length.
+ */
+VALUE rb_fireruby_exception_new(const char *message) {
+  return rb_funcall(cFireRubyException, rb_intern("new"), 1, rb_str_new2(message));
+}
+
+
+/**
+ * This function raises a new FireRuby exception.
  *
- * @return  A reference to the full decode error message string.
+ * @param  status   A pointer to the Firebird status vector containing the error
+ *                  details.
+ * @param  message  A string containing a message to be prefixed to the error
+ *                  text generated by the decoding.
  *
  */
-VALUE decodeException(const ISC_STATUS *status, const char *prefix) {
-  VALUE message = rb_str_new2(""),
+void rb_fireruby_raise(const ISC_STATUS *status, const char *prefix) {
+  VALUE exception = rb_exc_new2(cFireRubyException, ""),
+        message = rb_str_new2(""),
         eol     = rb_str_new2("\n");
   char text[512];
   int sqlCode = isc_sqlcode(status),
@@ -149,36 +161,10 @@ VALUE decodeException(const ISC_STATUS *status, const char *prefix) {
     rb_str_concat(message, rb_str_new2(text));
   }
 
-  return(message);
-}
-
-
-/**
- * This function provides a means to programmatically create a new instance of
- * the FireRubyException class.
- *
- * @param  message  A string containing the error message for the exception.
- *
- * @return  A reference to a newly created FireRubyException object.
- *
- */
-VALUE rb_fireruby_exception_new(const char *message) {
-  return rb_funcall(cFireRubyException, rb_intern("new"), 1, rb_str_new2(message));
-}
-
-
-/**
- * This function raises a new FireRuby exception.
- *
- * @param  status   A pointer to the Firebird status vector containing the error
- *                  details.
- * @param  message  A string containing a message to be prefixed to the error
- *                  text generated by the decoding.
- *
- */
-void rb_fireruby_raise(const ISC_STATUS *status, const char *message) {
-  VALUE text = decodeException(status, message);
-  rb_raise(cFireRubyException, "%s", StringValuePtr(text));
+  rb_iv_set(exception, "@message", message);
+  rb_iv_set(exception, "@sql_code", INT2NUM(sqlCode));
+  rb_iv_set(exception, "@db_code", INT2NUM(dbCode));
+  rb_exc_raise(exception);
 }