rubyfb 0.5.9 → 0.6

data/ext/Statement.h

@@ -40,23 +40,20 @@
 typedef struct {
   isc_stmt_handle handle;
   int type,
-      inputs;
+      inputs,
+      outputs;
   short dialect;
-  XSQLDA          *parameters;
+  XSQLDA          *output;
 } StatementHandle;
 
 /* Function prototypes. */
-void prepare(isc_db_handle *, isc_tr_handle *, char *, isc_stmt_handle *,
+/*void prepare(isc_db_handle *, isc_tr_handle *, char *, isc_stmt_handle *,
              short, int *, int *, int *);
 void execute(isc_tr_handle *, isc_stmt_handle *, short, XSQLDA *,
-             int, long *);
-VALUE rb_statement_new(VALUE, VALUE, VALUE, VALUE);
-VALUE rb_execute_statement(VALUE);
-VALUE rb_execute_statement_for(VALUE, VALUE);
-VALUE rb_execute_sql(VALUE, VALUE, VALUE);
-VALUE rb_get_statement_type(VALUE);
-void rb_statement_close(VALUE);
-void statementFree(void *);
+             int, long *);*/
+VALUE rb_statement_new(VALUE, VALUE);
+VALUE rb_execute_sql(VALUE, VALUE, VALUE, VALUE);
 void Init_Statement(VALUE);
+short isCursorStatement(StatementHandle*);
 
 #endif /* FIRERUBY_STATEMENT_H */

data/ext/Transaction.c

@@ -133,7 +133,7 @@ static VALUE commitTransaction(VALUE self) {
   TransactionHandle *transaction = NULL;
 
   Data_Get_Struct(self, TransactionHandle, transaction);
-
+  
   /* Commit the transaction. */
   if(transaction->handle != 0) {
     ISC_STATUS status[ISC_STATUS_LENGTH];
@@ -306,7 +306,7 @@ static VALUE executeOnTransaction(VALUE self, VALUE sql) {
   }
 
   connection = rb_ary_entry(list, 0);
-  return rb_execute_sql(connection, self, sql);
+  return rb_execute_sql(connection, sql, rb_ary_new(), self);
 }
 
 
@@ -480,6 +480,7 @@ void startTransaction(TransactionHandle *transaction,
   if(teb != NULL) {
     free(teb);
   }
+  
 }
 
 

data/ext/TypeMap.c

@@ -46,7 +46,7 @@ VALUE getConstant(const char *, VALUE);
 VALUE toDateTime(VALUE);
 VALUE rescueConvert(VALUE, VALUE);
 void storeBlob(VALUE, XSQLVAR *, ConnectionHandle *, TransactionHandle *);
-void populateBlobField(VALUE, XSQLVAR *, VALUE);
+void populateBlobField(VALUE, XSQLVAR *, VALUE, VALUE);
 void populateDoubleField(VALUE, XSQLVAR *);
 void populateFloatField(VALUE, XSQLVAR *);
 void populateInt64Field(VALUE, XSQLVAR *);
@@ -215,15 +215,15 @@ VALUE toValue(XSQLVAR *entry,
  */
 VALUE toArray(VALUE results) {
   VALUE array       = rb_ary_new(),
-        transaction = rb_iv_get(results, "@transaction"),
-        connection  = rb_iv_get(results, "@connection");
+        transaction = rb_funcall(results, rb_intern("transaction"), 0),
+        connection  = rb_funcall(results, rb_intern("connection"), 0);
   XSQLVAR           *entry      = NULL;
-  ResultsHandle     *rHandle    = NULL;
+  StatementHandle *hStatement = NULL;
   int i;
 
-  Data_Get_Struct(results, ResultsHandle, rHandle);
-  entry = rHandle->output->sqlvar;
-  for(i = 0; i < rHandle->output->sqln; i++, entry++) {
+  Data_Get_Struct(rb_funcall(results, rb_intern("statement"), 0), StatementHandle, hStatement);
+  entry = hStatement->output->sqlvar;
+  for(i = 0; i < hStatement->output->sqln; i++, entry++) {
     VALUE value = toValue(entry, connection, transaction);
 
     rb_ary_push(array, value);
@@ -247,7 +247,7 @@ VALUE toArray(VALUE results) {
  *                     to get connection and transaction details.
  *
  */
-void setParameters(XSQLDA *parameters, VALUE array, VALUE source) {
+void setParameters(XSQLDA *parameters, VALUE array, VALUE transaction, VALUE connection) {
   VALUE value;
   int index,
       size;
@@ -274,7 +274,7 @@ void setParameters(XSQLDA *parameters, VALUE array, VALUE source) {
     if(value != Qnil) {
       VALUE name = rb_funcall(value, rb_intern("class"), 0);
 
-      parameter->sqlind = 0;
+      *parameter->sqlind = 0;
       name = rb_funcall(name, rb_intern("name"), 0);
       switch(type) {
       case SQL_ARRAY:        /* Type: ARRAY */
@@ -282,7 +282,7 @@ void setParameters(XSQLDA *parameters, VALUE array, VALUE source) {
         break;
 
       case SQL_BLOB:         /* Type: BLOB */
-        populateBlobField(value, parameter, source);
+        populateBlobField(value, parameter, transaction, connection);
         break;
 
       case SQL_DOUBLE:        /* Type: DOUBLE PRECISION, DECIMAL, NUMERIC */
@@ -619,11 +619,15 @@ VALUE getClassInModule(const char *name, VALUE owner) {
  */
 VALUE toDateTime(VALUE value) {
   VALUE result,
-        klass = rb_funcall(value, rb_intern("class"), 0);
+        klass = rb_funcall(value, rb_intern("class"), 0),
+        date_time_class = getClass("DateTime");
 
-  if(klass == rb_cTime) {
+  if((klass == rb_cTime) || (klass == date_time_class)) {
     VALUE data;
 
+    if (klass == date_time_class) {
+      value = rb_funcall(value, rb_intern("to_time"), 0);
+    }
     result = rb_ary_new();
 
     data = rb_funcall(value, rb_intern("year"), 0);
@@ -684,6 +688,10 @@ VALUE rescueConvert(VALUE arguments, VALUE error) {
   return(rb_funcall(rb_eException, rb_intern("exception"), 1, &message));
 }
 
+long getLongProperty(VALUE obj, const char* name) {
+  VALUE number  = rb_funcall(obj, rb_intern(name), 0);
+  return TYPE(number) == T_FIXNUM ? FIX2INT(number) : NUM2INT(number);
+}
 
 /**
  * This function creates a new blob and returns the identifier for it.
@@ -707,10 +715,13 @@ void storeBlob(VALUE info,
   isc_blob_handle handle  = 0;
   ISC_QUAD        *blobId = (ISC_QUAD *)field->sqldata;
   char *data   = StringValuePtr(info);
-  VALUE number  = rb_funcall(info, rb_intern("length"), 0);
-  long charLength = TYPE(number) == T_FIXNUM ? FIX2INT(number) : NUM2INT(number);
-  long byteLength = strlen(data);
-  short charSize = byteLength/charLength;
+  long dataLength = getLongProperty(info, "length");
+
+  if(Qtrue == rb_funcall(info, rb_intern("respond_to?"), 1, ID2SYM(rb_intern("bytesize")))) {
+    /* 1.9 strings */
+    dataLength = getLongProperty(info, "bytesize");
+  }
+
   field->sqltype = SQL_BLOB;
 
   if(isc_create_blob(status, &connection->handle, &transaction->handle,
@@ -718,11 +729,10 @@ void storeBlob(VALUE info,
     long offset = 0;
     unsigned short size   = 0;
 
-    while(offset < byteLength) {
+    while(offset < dataLength) {
       char *buffer = &data[offset];
 
-      size = (byteLength - offset) > USHRT_MAX ? USHRT_MAX : byteLength - offset;
-      size = (size/charSize)*charSize; // align
+      size = (dataLength - offset) > USHRT_MAX ? USHRT_MAX : dataLength - offset;
       if(isc_put_segment(status, &handle, size, buffer) != 0) {
         ISC_STATUS other[20];
 
@@ -751,21 +761,18 @@ void storeBlob(VALUE info,
  *                 contains the connection and transaction details.
  *
  */
-void populateBlobField(VALUE value, XSQLVAR *field, VALUE source) {
-  VALUE attribute;
-  ConnectionHandle  *connection = NULL;
-  TransactionHandle *transaction = NULL;
+void populateBlobField(VALUE value, XSQLVAR *field, VALUE transaction, VALUE connection) {
+  ConnectionHandle  *hConnection = NULL;
+  TransactionHandle *hTransaction = NULL;
 
   if(TYPE(value) != T_STRING) {
     rb_fireruby_raise(NULL, "Error converting input parameter to blob.");
   }
 
   /* Fetch the connection and transaction details. */
-  attribute = rb_iv_get(source, "@connection");
-  Data_Get_Struct(attribute, ConnectionHandle, connection);
-  attribute = rb_iv_get(source, "@transaction");
-  Data_Get_Struct(attribute, TransactionHandle, transaction);
-  storeBlob(value, field, connection, transaction);
+  Data_Get_Struct(connection, ConnectionHandle, hConnection);
+  Data_Get_Struct(transaction, TransactionHandle, hTransaction);
+  storeBlob(value, field, hConnection, hTransaction);
   field->sqltype = SQL_BLOB;
 }
 
@@ -858,26 +865,20 @@ void populateFloatField(VALUE value, XSQLVAR *field) {
  *
  */
 void populateInt64Field(VALUE value, XSQLVAR *field) {
-  VALUE actual = Qnil;
+  VALUE actual = value;
   long long store  = 0;
 
-  if(rb_obj_is_kind_of(value, rb_cInteger)) {
-    actual = value;
-  } else if(TYPE(value) == T_FLOAT) {
-    double number = NUM2DBL(value);
-
+  if(TYPE(value) == T_STRING) {
     if(field->sqlscale != 0) {
-      number = number * pow(10, abs(field->sqlscale));
-      actual = INT2NUM((long)number);
+      actual = rb_funcall(value, rb_intern("to_f"), 0);
+    } else {
+      actual = rb_funcall(value, rb_intern("to_i"), 0);
     }
-  } else if(TYPE(value) == T_STRING) {
-    actual = rb_funcall(value, rb_intern("to_i"), 0);
-  } else {
-    rb_fireruby_raise(NULL,
-                      "Error converting input parameter to 64 bit integer.");
   }
-
-  store = TYPE(actual) == T_FIXNUM ? FIX2INT(actual) : NUM2INT(actual);
+  if(field->sqlscale != 0) {
+    actual = rb_funcall(actual, rb_intern("*"), 1, INT2NUM((long)pow(10, abs(field->sqlscale))));
+  }
+  store = NUM2LL(actual);
   memcpy(field->sqldata, &store, field->sqllen);
   field->sqltype = SQL_INT64;
 }

data/ext/TypeMap.h

@@ -41,7 +41,7 @@
 
 /* Function prototypes. */
 VALUE toArray(VALUE);
-void setParameters(XSQLDA *, VALUE, VALUE);
+void setParameters(XSQLDA *, VALUE, VALUE, VALUE);
 VALUE getModule(const char *);
 VALUE getClass(const char *);
 VALUE getClassInModule(const char *, VALUE);