cubrid 9.2.0 → 9.3.0

data/README.rdoc

@@ -4,6 +4,7 @@
 
 This is a Ruby Driver and ActiveRecord Adapter for CUBRID Database.
 
+== Installation
 == Installation
 
  1. cd ext/
@@ -22,11 +23,9 @@ This is a Ruby Driver and ActiveRecord Adapter for CUBRID Database.
 
 * Cross-platform.
 
-* Compatible with CUBRID 2.2 x86.
-
-* Compatible with Ruby 1.8.7.
+* Compatible with CUBRID 9.3.0
 
-* Ruby 1.9.1 is not supported yet.
+* Compatible with Ruby 1.8.x and 1.9.x
 
 == Synopsis
 
@@ -36,7 +35,7 @@ Use Case:
 
  #1: @con = Cubrid.connect('dbname')
  #2: @con = Cubrid.connect('dbname', 'host', 'port', 'username', 'password')
- @con = Cubrid.connect('demodb', 'localhost', 30000, 'public', '')
+ @con = Cubrid.connect('demodb', 'test-db-server', 30000, 'public', '')
  
  puts @con.server_version
  

data/ext/build_cci.sh

@@ -6,7 +6,7 @@ if [ -f cci-src/cci/.libs/libcascci.a ];then
   exit 0
 fi
 
-tar xvjf cci.bz2
+tar xvjf cci-src.tar.bz2
 cd cci-src
 chmod +x configure
 chmod +x external/libregex38a/configure

data/ext/conn.c

@@ -56,13 +56,12 @@ cubrid_conn_new(char *host, int port, char *db, char *user, char *passwd)
 {
   VALUE conn;
   Connection *c;
-  int handle;
+  int handle,res;
   T_CCI_ERROR error;
 
   handle = cci_connect_ex(host, port, db, user, passwd,&error);
   if (handle < 0) {
     cubrid_handle_error(handle, &error);
-    return Qnil;
   }
 
   conn = Data_Make_Struct(cConnection, Connection, 0, cubrid_conn_free, c);
@@ -72,7 +71,13 @@ cubrid_conn_new(char *host, int port, char *db, char *user, char *passwd)
   c->port = port;
   strcpy(c->db, db);
   strcpy(c->user, user);
-  c->auto_commit = Qfalse;
+  c->auto_commit = Qtrue;
+  
+  res = cci_set_autocommit(handle,CCI_AUTOCOMMIT_TRUE);
+  if (res < 0)
+  {
+    cubrid_handle_error (res, NULL);
+  }
 
   return conn;
 }
@@ -280,9 +285,8 @@ cubrid_conn_get_last_insert_id(VALUE self)
     {
       strncpy (ret, name, sizeof (ret) - 1);
     }
-
-  return rb_str_new2(ret); 
-
+    
+  return rb_cstr2inum(ret, 10);
 }
 
 

data/ext/cubrid.c

@@ -175,7 +175,7 @@ void Init_cubrid()
   rb_define_method(cStatement, "close", cubrid_stmt_close, 0); /* in stmt.c */
 
   //error
-  cCubrid = rb_define_class("CUBRID", rb_cObject);
+  //cCubrid = rb_define_class("CUBRID", rb_cObject);
   eCubrid = rb_define_class_under(cCubrid, "Error", rb_eStandardError);
 
 }

data/ext/cubrid.h

@@ -34,6 +34,7 @@
 
 #include "ruby.h"
 #include "cas_cci.h"
+#include "stdlib.h"
 
 #define MAX_STR_LEN     255
 
@@ -48,6 +49,28 @@
 #define CUBRID_ER_CREATE_TEMP_FILE              -2010
 #define CUBRID_ER_TRANSFER_FAIL                 -2011
 
+/* Maximum length for the Cubrid data types. 
+ *
+ * The max len of LOB is the max file size creatable in an external storage, 
+ * so we ca't give the max len of LOB type, just use 1G. Please ignore it. 
+ */
+#define MAX_CUBRID_CHAR_LEN   1073741823
+#define MAX_LEN_INTEGER	      (10 + 1)
+#define MAX_LEN_SMALLINT      (5 + 1)
+#define MAX_LEN_BIGINT	      (19 + 1)
+#define MAX_LEN_FLOAT	      (14 + 1)
+#define MAX_LEN_DOUBLE	      (28 + 1)
+#define MAX_LEN_MONETARY      (28 + 2)
+#define MAX_LEN_DATE	      10
+#define MAX_LEN_TIME	      8
+#define MAX_LEN_TIMESTAMP     23
+#define MAX_LEN_DATETIME      MAX_LEN_TIMESTAMP
+#define MAX_LEN_OBJECT	      MAX_CUBRID_CHAR_LEN
+#define MAX_LEN_SET	      MAX_CUBRID_CHAR_LEN
+#define MAX_LEN_MULTISET      MAX_CUBRID_CHAR_LEN
+#define MAX_LEN_SEQUENCE      MAX_CUBRID_CHAR_LEN
+#define MAX_LEN_LOB           MAX_CUBRID_CHAR_LEN
+
 typedef struct {
   int    handle;
   char   host[MAX_STR_LEN];
@@ -119,4 +142,51 @@ extern void cubrid_handle_error(int e, T_CCI_ERROR *error);
       return (rtn); \
     } \
   } while(0)
+  
+typedef struct
+{
+    char *type_name;
+    T_CCI_U_TYPE cubrid_u_type;
+    int len;
+} DB_TYPE_INFO;
+
+/* Define Cubrid supported date types */
+static const DB_TYPE_INFO db_type_info[] = {
+    {"NULL", CCI_U_TYPE_NULL, 0},
+    {"UNKNOWN", CCI_U_TYPE_UNKNOWN, MAX_LEN_OBJECT},
+
+    {"CHAR", CCI_U_TYPE_CHAR, -1},
+    {"STRING", CCI_U_TYPE_STRING, -1},
+    {"NCHAR", CCI_U_TYPE_NCHAR, -1},
+    {"VARNCHAR", CCI_U_TYPE_VARNCHAR, -1},
+
+    {"BIT", CCI_U_TYPE_BIT, -1},
+    {"VARBIT", CCI_U_TYPE_VARBIT, -1},
+
+    {"NUMERIC", CCI_U_TYPE_NUMERIC, -1},
+    {"NUMBER", CCI_U_TYPE_NUMERIC, -1},
+    {"INT", CCI_U_TYPE_INT, MAX_LEN_INTEGER},
+    {"SHORT", CCI_U_TYPE_SHORT, MAX_LEN_SMALLINT},
+    {"BIGINT", CCI_U_TYPE_BIGINT, MAX_LEN_BIGINT},
+    {"MONETARY", CCI_U_TYPE_MONETARY, MAX_LEN_MONETARY},
+
+    {"FLOAT", CCI_U_TYPE_FLOAT, MAX_LEN_FLOAT},
+    {"DOUBLE", CCI_U_TYPE_DOUBLE, MAX_LEN_DOUBLE},
+
+    {"DATE", CCI_U_TYPE_DATE, MAX_LEN_DATE},
+    {"TIME", CCI_U_TYPE_TIME, MAX_LEN_TIME},
+    {"DATETIME", CCI_U_TYPE_DATETIME, MAX_LEN_DATETIME},
+    {"TIMESTAMP", CCI_U_TYPE_TIMESTAMP, MAX_LEN_TIMESTAMP},
+
+    {"SET", CCI_U_TYPE_SET, MAX_LEN_SET},
+    {"MULTISET", CCI_U_TYPE_MULTISET, MAX_LEN_MULTISET},
+    {"SEQUENCE", CCI_U_TYPE_SEQUENCE, MAX_LEN_SEQUENCE},
+    {"RESULTSET", CCI_U_TYPE_RESULTSET, -1},
+
+    {"OBJECT", CCI_U_TYPE_OBJECT, MAX_LEN_OBJECT},
+    {"BLOB", CCI_U_TYPE_BLOB, MAX_LEN_LOB},
+    {"CLOB", CCI_U_TYPE_CLOB, MAX_LEN_LOB},
+    {"ENUM",CCI_U_TYPE_ENUM,-1}
+};
+
 

data/ext/extconf.rb

@@ -50,6 +50,12 @@ if RUBY_PLATFORM.include?"linux"
     
   $INCFLAGS = ($INCFLAGS ? $INCFLAGS : "") + " -I" +  cci_base_inc_path \
                +" -I" +  cci_cci_inc_path +" -I" +  cci_broker_inc_path
+         
+  if(ARGV[0] == "daily")   
+    print "daily test"          
+    $CPPFLAGS =($CPPFLAGS ? $CPPFLAGS : "") + " -fprofile-arcs -ftest-coverage"
+    $LDFLAGS =($LDFLAGS ? $LDFLAGS : "") + " -lgcov"  
+  end
     
   if !$LIBPATH
     $LIBPATH = []

data/ext/stmt.c

@@ -34,6 +34,33 @@ extern VALUE cubrid_conn_end_tran(Connection *con, int type);
 
 extern VALUE cStatement, cOid;
 
+char* 
+get_type_name_by_u_type(T_CCI_COL_INFO * column_info)
+{
+	int i,u_type;
+  int size = sizeof(db_type_info) / sizeof(db_type_info[0]);
+	char buf[64] = {'\0'};
+	int type_buf_len=63;
+	
+	u_type = CCI_GET_COLLECTION_DOMAIN(column_info->type);
+	for (i = 0; i < size; i++) {
+		if (db_type_info[i].cubrid_u_type== u_type) {
+			break;
+		}
+	}
+	
+	if (CCI_IS_SET_TYPE(column_info->type)) {
+	    snprintf(buf, type_buf_len, "set(%s)", db_type_info[i].type_name);
+	} else if (CCI_IS_MULTISET_TYPE(column_info->type)) {
+	    snprintf(buf, type_buf_len, "multiset(%s)", db_type_info[i].type_name);
+	} else if (CCI_IS_SEQUENCE_TYPE(column_info->type)) {
+	    snprintf(buf, type_buf_len, "sequence(%s)", db_type_info[i].type_name);
+	} else {
+	    return db_type_info[i].type_name;
+	}
+	return buf;
+}
+
 void
 cubrid_stmt_free(void *p)
 {
@@ -193,7 +220,7 @@ cubrid_stmt_make_set(VALUE data, int u_type) /* TODO: check if all item has same
               ind[i] = 1;
             }
             else {
-              str_ary[i] =RARRAY_PTR(rb_ary_entry(data, i));// RSTRING(rb_ary_entry(data, i))->ptr;
+              str_ary[i] =RSTRING_PTR(rb_ary_entry(data, i));// RSTRING(rb_ary_entry(data, i))->ptr;
               ind[i] = 0;
             }
           }
@@ -316,7 +343,7 @@ cubrid_stmt_bind_internal(Statement *stmt, int index, VALUE data, int u_type, in
       break;
 
     case T_STRING:
-      str_val = RARRAY_PTR(data);
+      str_val = StringValueCStr(data);
       a_type = CCI_A_TYPE_STR;
       val = str_val;
       if (u_type == CCI_U_TYPE_UNKNOWN) {
@@ -509,7 +536,6 @@ cubrid_stmt_execute(int argc, VALUE* argv, VALUE self)
   stmt->affected_rows = row_count;
 
   if(stmt->con->auto_commit == Qtrue && cubrid_stmt_is_auto_commitable(stmt->sql_type)) {
-    cubrid_stmt_close(self);
     cubrid_conn_end_tran(stmt->con, CCI_TRAN_COMMIT);
   }
 
@@ -527,7 +553,7 @@ cubrid_stmt_affected_rows(VALUE self)
 
   GET_STMT_STRUCT(self, stmt);
   CHECK_HANDLE(stmt, self);
-
+  
   return INT2NUM(stmt->affected_rows);
 }
 
@@ -981,7 +1007,7 @@ cubrid_stmt_column_info(VALUE self)
   char col_name[MAX_STR_LEN];
   int datatype, precision, scale, nullable;
   Statement *stmt;
-
+  char type_name[MAX_STR_LEN]={0};
   GET_STMT_STRUCT(self, stmt);
   CHECK_HANDLE(stmt, self);
 
@@ -989,6 +1015,7 @@ cubrid_stmt_column_info(VALUE self)
 
   for (i = 0; i < stmt->col_count; i++) {
     VALUE item;
+    char* temp;
 
     item = rb_hash_new();
 
@@ -999,7 +1026,12 @@ cubrid_stmt_column_info(VALUE self)
     datatype  = CCI_GET_RESULT_INFO_TYPE(stmt->col_info, i+1);
 
     rb_hash_aset(item, rb_str_new2("name"), rb_str_new2(col_name));
-    rb_hash_aset(item, rb_str_new2("type_name"), INT2NUM(datatype));
+
+    temp = get_type_name_by_u_type(&stmt->col_info[i]);
+    memcpy(type_name,temp,strlen(temp));
+    rb_hash_aset(item, rb_str_new2("type_name"), rb_str_new2(type_name));
+    memset(type_name,0,strlen(temp));
+	
     rb_hash_aset(item, rb_str_new2("precision"), INT2NUM(precision));
     rb_hash_aset(item, rb_str_new2("scale"), INT2NUM(scale));
     rb_hash_aset(item, rb_str_new2("nullable"), INT2NUM(nullable));

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cubrid
 version: !ruby/object:Gem::Version
-  version: 9.2.0
+  version: 9.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-22 00:00:00.000000000 Z
+date: 2014-03-13 00:00:00.000000000 Z
 dependencies: []
 description: This extension is a Ruby connector for CUBRID Database.
 email: cubrid_ruby@nhncorp.com
@@ -26,10 +26,11 @@ files:
 - ext/conn.c
 - ext/stmt.c
 - ext/error.c
-- ext/cci.bz2
+- ext/cci-src.tar.bz2
 - ext/build_cci.sh
 homepage: http://www.cubrid.org/cubrid_ruby_programming
-licenses: []
+licenses:
+- BSD
 post_install_message: 
 rdoc_options:
 - --title