rubyfb 0.6.4 → 0.6.7

data/ext/Statement.h

@@ -55,5 +55,6 @@ VALUE rb_statement_new(VALUE, VALUE);
 VALUE rb_execute_sql(VALUE, VALUE, VALUE, VALUE);
 void Init_Statement(VALUE);
 short isCursorStatement(StatementHandle*);
+VALUE getStatementMetadata(VALUE);
 
 #endif /* FIRERUBY_STATEMENT_H */

data/ext/Transaction.c

@@ -27,7 +27,6 @@
 #include "Transaction.h"
 #include "Common.h"
 #include "Connection.h"
-#include "ResultSet.h"
 #include "Statement.h"
 
 /* Function prototypes. */

data/ext/TypeMap.c

@@ -28,10 +28,10 @@
 #include <time.h>
 #include <math.h>
 #include <limits.h>
+#include "Common.h"
 #include "Blob.h"
 #include "Connection.h"
 #include "Transaction.h"
-#include "ResultSet.h"
 #include "Statement.h"
 #include "FireRuby.h"
 #include "rfbint.h"
@@ -42,7 +42,6 @@ VALUE createDate(const struct tm *);
 VALUE createDateTime(VALUE dt);
 VALUE createTime(VALUE dt);
 VALUE createSafeTime(const struct tm*);
-VALUE getConstant(const char *, VALUE);
 VALUE toDateTime(VALUE);
 VALUE rescueConvert(VALUE, VALUE);
 void storeBlob(VALUE, XSQLVAR *, ConnectionHandle *, TransactionHandle *);
@@ -57,18 +56,24 @@ void populateDateField(VALUE, XSQLVAR *);
 void populateTimeField(VALUE, XSQLVAR *);
 void populateTimestampField(VALUE, XSQLVAR *);
 
-ID NEW_ID, TO_F_ID, ROUND_ID, ASTERISK_ID, CLASS_ID, TRANSACTION_ID,
-  CONNECTION_ID, STATEMENT_ID, NAME_ID, AT_VALUE_ID, AT_TYPE_ID,
-  AT_COLUMN_ID;
+static ID 
+  RB_INTERN_NEW,
+  RB_INTERN_TO_F,
+  RB_INTERN_ROUND,
+  RB_INTERN_ASTERISK,
+  RB_INTERN_CLASS,
+  RB_INTERN_NAME;
+  
+static VALUE cDate, cDateTime;
 
 long long sql_scale(VALUE value, XSQLVAR *field) {
-  value = rb_funcall(value, TO_F_ID, 0);
+  value = rb_funcall(value, RB_INTERN_TO_F, 0);
   if(field->sqlscale) {
     // this requires special care - decimal point shift can cause type overflow
     // the easyest way is to use ruby arithmetics (although it's not the fastes)
-    value = rb_funcall(value, ASTERISK_ID, 1, LONG2NUM((long)pow(10, abs(field->sqlscale))));
+    value = rb_funcall(value, RB_INTERN_ASTERISK, 1, LONG2NUM((long)pow(10, abs(field->sqlscale))));
   }
-  return NUM2LL(rb_funcall(value, ROUND_ID, 0));
+  return NUM2LL(rb_funcall(value, RB_INTERN_ROUND, 0));
 }
 
 VALUE sql_unscale(VALUE value, XSQLVAR *field) {
@@ -76,7 +81,7 @@ VALUE sql_unscale(VALUE value, XSQLVAR *field) {
     return value;
   }
   return rb_float_new(
-    NUM2DBL(rb_funcall(value, TO_F_ID, 0)) / pow(10, abs(field->sqlscale))
+    NUM2DBL(rb_funcall(value, RB_INTERN_TO_F, 0)) / pow(10, abs(field->sqlscale))
   );
 }
 
@@ -92,11 +97,10 @@ VALUE sql_unscale(VALUE value, XSQLVAR *field) {
  *          the field type referenced.
  *
  */
-VALUE toColumn(XSQLVAR *entry,
-              VALUE metadata, 
+VALUE toValue(XSQLVAR *entry,
               VALUE connection, 
               VALUE transaction) {
-  VALUE column, value = Qnil;
+  VALUE value = Qnil;
 
   /* Check for NULL values. */
   if(!((entry->sqltype & 1) && (*entry->sqlind < 0))) {
@@ -108,8 +112,7 @@ VALUE toColumn(XSQLVAR *entry,
     short length;
     double actual;
     BlobHandle *blob   = NULL;
-    VALUE setting = getFireRubySetting("DATE_AS_DATE"),
-          working = Qnil;
+    VALUE working = Qnil;
 
     switch(type) {
     case SQL_BLOB:        /* Type: BLOB */
@@ -129,7 +132,7 @@ VALUE toColumn(XSQLVAR *entry,
       datetime.tm_sec  = 0;
       datetime.tm_min  = 0;
       datetime.tm_hour = 0;
-      if(setting == Qtrue) {
+      if(getFireRubySetting("DATE_AS_DATE") == Qtrue) {
         value = createDate(&datetime);
       } else {
         value = createSafeTime(&datetime);
@@ -180,41 +183,7 @@ VALUE toColumn(XSQLVAR *entry,
     }   /* End of switch. */
   }
 
-  column = rb_funcall(rb_cObject, NEW_ID, 0);
-  rb_ivar_set(column, AT_COLUMN_ID, metadata);
-  rb_ivar_set(column, AT_VALUE_ID, value);
-  return(column);
-}
-
-
-/**
- * This function attempts to convert the data contents of a XSQLDA to a Ruby
- * array of values.
- *
- * @param  results  A reference to the ResultSet object to extract the data row
- *                  from.
- *
- * @return  A reference to the array containing the row data from the XSQLDA.
- *
- */
-VALUE toRowColumns(VALUE results) {
-  VALUE array, transaction, connection, columns;
-  XSQLVAR           *entry      = NULL;
-  StatementHandle *hStatement = NULL;
-  int i;
-
-  Data_Get_Struct(rb_funcall(results, STATEMENT_ID, 0), StatementHandle, hStatement);
-  transaction = rb_funcall(results, TRANSACTION_ID, 0);
-  connection  = rb_funcall(results, CONNECTION_ID, 0);
-  array       = rb_ary_new2(hStatement->output->sqln);
-
-  entry = hStatement->output->sqlvar;
-  columns = getResultsColumns(results);
-  for(i = 0; i < hStatement->output->sqln; i++, entry++) {
-    rb_ary_store(array, i, toColumn(entry, rb_ary_entry(columns, i), connection, transaction));
-  }
-
-  return(array);
+  return(value);
 }
 
 
@@ -255,10 +224,10 @@ void setParameters(XSQLDA *parameters, VALUE array, VALUE transaction, VALUE con
 
     /* Check for nils to indicate null values. */
     if(value != Qnil) {
-      VALUE name = rb_funcall(value, CLASS_ID, 0);
+      VALUE name = rb_funcall(value, RB_INTERN_CLASS, 0);
 
       *parameter->sqlind = 0;
-      name = rb_funcall(name, NAME_ID, 0);
+      name = rb_funcall(name, RB_INTERN_NAME, 0);
       switch(type) {
       case SQL_ARRAY:        /* Type: ARRAY */
         /* TO BE DONE! */
@@ -331,32 +300,7 @@ void setParameters(XSQLDA *parameters, VALUE array, VALUE transaction, VALUE con
  *
  */
 VALUE createDate(const struct tm *date) {
-  VALUE result = Qnil,
-        klass  = Qnil;
-
-  klass = getClass("Date");
-
-  /* Check if we need to require date. */
-  if(klass == Qnil) {
-    rb_require("date");
-    klass = getClass("Date");
-  }
-
-  /* Check that we got the Date class. */
-  if(klass != Qnil) {
-    VALUE arguments[3];
-
-    /* Prepare the arguments. */
-    arguments[0] = INT2FIX(date->tm_year + 1900);
-    arguments[1] = INT2FIX(date->tm_mon + 1);
-    arguments[2] = INT2FIX(date->tm_mday);
-
-    /* Create the class instance. */
-    result = rb_funcall2(klass, NEW_ID, 3, arguments);
-  }
-
-
-  return(result);
+  return rb_funcall(cDate, RB_INTERN_NEW, 3, INT2FIX(date->tm_year + 1900), INT2FIX(date->tm_mon + 1), INT2FIX(date->tm_mday));
 }
 
 
@@ -369,38 +313,18 @@ VALUE createDate(const struct tm *date) {
  *
  */
 VALUE createDateTime(VALUE dt) {
-  VALUE result = Qnil,
-        klass  = Qnil;
-
   struct tm *datetime;
   Data_Get_Struct(dt, struct tm, datetime);
 
-  klass = getClass("DateTime");
-
-  /* Check if we need to require date. */
-  if(klass == Qnil) {
-    rb_require("date");
-    klass = getClass("DateTime");
-  }
-
-  /* Check that we got the DateTime class. */
-  if(klass != Qnil) {
-    VALUE arguments[7];
-
-    /* Prepare the arguments. */
-    arguments[0] = INT2FIX(datetime->tm_year + 1900);
-    arguments[1] = INT2FIX(datetime->tm_mon + 1);
-    arguments[2] = INT2FIX(datetime->tm_mday);
-    arguments[3] = INT2FIX(datetime->tm_hour);
-    arguments[4] = INT2FIX(datetime->tm_min);
-    arguments[5] = INT2FIX(datetime->tm_sec);
-    arguments[6] = rb_funcall(rb_funcall(klass, rb_intern("now"), 0), rb_intern("offset"), 0);
-
-    /* Create the class instance. */
-    result = rb_funcall2(klass, NEW_ID, 7, arguments);
-  }
-
-  return(result);
+  return rb_funcall(cDateTime, RB_INTERN_NEW, 7, 
+    INT2FIX(datetime->tm_year + 1900),
+    INT2FIX(datetime->tm_mon + 1),
+    INT2FIX(datetime->tm_mday),
+    INT2FIX(datetime->tm_hour),
+    INT2FIX(datetime->tm_min),
+    INT2FIX(datetime->tm_sec),
+    rb_funcall(rb_funcall(cDateTime, rb_intern("now"), 0), rb_intern("offset"), 0)
+  );
 }
 
 
@@ -413,34 +337,22 @@ VALUE createDateTime(VALUE dt) {
  *
  */
 VALUE createTime(VALUE dt) {
-  VALUE result = Qnil,
-        klass  = Qnil;
-
   struct tm *datetime;
   Data_Get_Struct(dt, struct tm, datetime);
 
-  klass = getClass("Time");
-
-  /* Check that we got the Time class. */
-  if(klass != Qnil) {
-    VALUE arguments[6];
-
-    /* Prepare the arguments. */
-    /*fprintf(stderr, "%d-%d-%d %d:%d:%d\n", datetime->tm_year + 1900,
-            datetime->tm_mon + 1, datetime->tm_mday, datetime->tm_hour,
-            datetime->tm_min, datetime->tm_sec);*/
-    arguments[0] = INT2FIX(datetime->tm_year + 1900);
-    arguments[1] = INT2FIX(datetime->tm_mon + 1);
-    arguments[2] = INT2FIX(datetime->tm_mday);
-    arguments[3] = INT2FIX(datetime->tm_hour);
-    arguments[4] = INT2FIX(datetime->tm_min);
-    arguments[5] = INT2FIX(datetime->tm_sec);
-
-    /* Create the class instance. */
-    result = rb_funcall2(klass, rb_intern("local"), 6, arguments);
-  }
-
-  return(result);
+  /*fprintf(stderr, "%d-%d-%d %d:%d:%d\n", datetime->tm_year + 1900,
+          datetime->tm_mon + 1, datetime->tm_mday, datetime->tm_hour,
+          datetime->tm_min, datetime->tm_sec);*/
+
+  /* Create the class instance. */
+  return rb_funcall(rb_cTime, rb_intern("local"), 6, 
+    INT2FIX(datetime->tm_year + 1900),
+    INT2FIX(datetime->tm_mon + 1),
+    INT2FIX(datetime->tm_mday),
+    INT2FIX(datetime->tm_hour),
+    INT2FIX(datetime->tm_min),
+    INT2FIX(datetime->tm_sec)
+  );
 }
 
 /**
@@ -459,138 +371,6 @@ VALUE createSafeTime(const struct tm *datetime) {
   return rb_rescue(createTime, dt, createDateTime, dt);
 }
 
-/**
- * This method fetches a Ruby constant definition. If the module specified to
- * the function is nil then the top level is assume
- *
- * @param  name    The name of the constant to be retrieved.
- * @param  module  A reference to the Ruby module that should contain the
- *                 constant.
- *
- * @return  A Ruby VALUE representing the constant.
- *
- */
-VALUE getConstant(const char *name, VALUE module) {
-  VALUE owner = module,
-        constants,
-        exists,
-        entry = Qnil,
-        symbol = ID2SYM(rb_intern(name));
-
-  /* Check that we've got somewhere to look. */
-  if(owner == Qnil) {
-    owner = rb_cModule;
-  }
-
-  constants = rb_funcall(owner, rb_intern("constants"), 0),
-  exists = rb_funcall(constants, rb_intern("include?"), 1, symbol);
-  if(exists == Qfalse) {
-    /* 1.8 style lookup */
-    exists = rb_funcall(constants, rb_intern("include?"), 1, rb_str_new2(name));
-  }
-  if(exists != Qfalse) {
-    entry = rb_funcall(owner, rb_intern("const_get"), 1, symbol);
-  }
-  return(entry);
-}
-
-
-/**
- * This method fetches a Ruby module definition object based on a class name.
- * The method is assumed to have been defined at the top level.
- *
- * @return  A Ruby VALUE representing the Module requested, or nil if the
- *          module could not be located.
- *
- */
-VALUE getModule(const char *name) {
-  VALUE module = getConstant(name, Qnil);
-
-  if(module != Qnil) {
-    VALUE type = rb_funcall(module, CLASS_ID, 0);
-
-    if(type != rb_cModule) {
-      module = Qnil;
-    }
-  }
-
-  return(module);
-}
-
-
-/**
- * This method fetches a Ruby class definition object based on a class name.
- * The class is assumed to have been defined at the top level.
- *
- * @return  A Ruby VALUE representing the requested class, or nil if the class
- *          could not be found.
- *
- */
-VALUE getClass(const char *name) {
-  VALUE klass = getConstant(name, Qnil);
-
-  if(klass != Qnil) {
-    VALUE type = rb_funcall(klass, CLASS_ID, 0);
-
-    if(type != rb_cClass) {
-      klass = Qnil;
-    }
-  }
-
-  return(klass);
-}
-
-
-/**
- * This method fetches a module from a specified module.
- *
- * @param  name   The name of the class to fetch.
- * @param  owner  The module to search for the module in.
- *
- * @return  A Ruby VALUE representing the requested module, or nil if it could
- *          not be located.
- *
- */
-VALUE getModuleInModule(const char *name, VALUE owner) {
-  VALUE module = getConstant(name, owner);
-
-  if(module != Qnil) {
-    VALUE type = rb_funcall(module, CLASS_ID, 0);
-
-    if(type != rb_cModule) {
-      module = Qnil;
-    }
-  }
-
-  return(module);
-}
-
-
-/**
- * This function fetches a class from a specified module.
- *
- * @param  name   The name of the class to be retrieved.
- * @param  owner  The module to search for the class in.
- *
- * @return  A Ruby VALUE representing the requested module, or nil if it could
- *          not be located.
- *
- */
-VALUE getClassInModule(const char *name, VALUE owner) {
-  VALUE klass = getConstant(name, owner);
-
-  if(klass != Qnil) {
-    VALUE type = rb_funcall(klass, CLASS_ID, 0);
-
-    if(type != rb_cClass) {
-      klass = Qnil;
-    }
-  }
-
-  return(klass);
-}
-
-
 /**
  * This function attempts to convert a VALUE to a series of date/time values.
  *
@@ -602,13 +382,12 @@ VALUE getClassInModule(const char *name, VALUE owner) {
  */
 VALUE toDateTime(VALUE value) {
   VALUE result,
-        klass = rb_funcall(value, CLASS_ID, 0),
-        date_time_class = getClass("DateTime");
+        klass = rb_funcall(value, RB_INTERN_CLASS, 0);
 
-  if((klass == rb_cTime) || (klass == date_time_class)) {
+  if((klass == rb_cTime) || (klass == cDateTime)) {
     VALUE data;
 
-    if (klass == date_time_class) {
+    if (klass == cDateTime) {
       value = rb_funcall(value, rb_intern("to_time"), 0);
     }
     result = rb_ary_new();
@@ -621,7 +400,7 @@ VALUE toDateTime(VALUE value) {
     rb_ary_push(result, rb_funcall(value, rb_intern("hour"), 0));
     rb_ary_push(result, rb_funcall(value, rb_intern("min"), 0));
     rb_ary_push(result, rb_funcall(value, rb_intern("sec"), 0));
-  } else if(klass == getClass("Date")) {
+  } else if(klass == cDate) {
     VALUE data;
 
     result = rb_ary_new();
@@ -798,7 +577,7 @@ void populateDoubleField(VALUE value, XSQLVAR *field) {
 
   if(TYPE(value) != T_FLOAT) {
     if(rb_obj_is_kind_of(value, rb_cNumeric) || TYPE(value) == T_STRING) {
-      actual = rb_funcall(value, TO_F_ID, 0);
+      actual = rb_funcall(value, RB_INTERN_TO_F, 0);
     } else {
       rb_fireruby_raise(NULL,
                         "Error converting input parameter to double.");
@@ -825,7 +604,7 @@ void populateFloatField(VALUE value, XSQLVAR *field) {
 
   if(TYPE(value) != T_FLOAT) {
     if(rb_obj_is_kind_of(value, rb_cNumeric) || TYPE(value) == T_STRING) {
-      actual = rb_funcall(value, TO_F_ID, 0);
+      actual = rb_funcall(value, RB_INTERN_TO_F, 0);
     } else {
       rb_fireruby_raise(NULL,
                         "Error converting input parameter to double.");
@@ -939,7 +718,6 @@ void populateTimeField(VALUE value, XSQLVAR *field) {
   field->sqltype   = SQL_TYPE_TIME;
 }
 
-
 /**
  * This method populates a date output field.
  *
@@ -967,17 +745,14 @@ void populateTimestampField(VALUE value, XSQLVAR *field) {
   field->sqltype   = SQL_TIMESTAMP;
 }
 
-void Init_TypeMap() {
-  NEW_ID = rb_intern("new");
-  TO_F_ID = rb_intern("to_f");
-  ROUND_ID = rb_intern("round");
-  ASTERISK_ID = rb_intern("*");
-  CLASS_ID = rb_intern("class");
-  CONNECTION_ID = rb_intern("connection");
-  TRANSACTION_ID = rb_intern("transaction");
-  STATEMENT_ID = rb_intern("statement");
-  NAME_ID = rb_intern("name");
-  AT_VALUE_ID = rb_intern("@value");
-  AT_TYPE_ID = rb_intern("@type");
-  AT_COLUMN_ID = rb_intern("@column");
+void Init_TypeMap(VALUE module) {
+  RB_INTERN_NEW = rb_intern("new");
+  RB_INTERN_TO_F = rb_intern("to_f");
+  RB_INTERN_ROUND = rb_intern("round");
+  RB_INTERN_ASTERISK = rb_intern("*");
+  RB_INTERN_CLASS = rb_intern("class");
+  RB_INTERN_NAME = rb_intern("name");
+  
+  cDate = getClass("Date");
+  cDateTime = getClass("DateTime");
 }