ibm_db 2.5.7 → 2.5.9

data/CHANGES

@@ -1,5 +1,9 @@
 Change Log
 ==============
+2012/01/03 (IBM_DB adapter 2.5.9, driver 2.5.9) :
+  - Support for Create and Drop database on DB2 LUW with DB2 client version V97fp4 and above
+  - Fixed bug #29482 - Fixed bigint being returned as string in the adapter
+  
 2011/09/18 (IBM_DB adapter 2.5.7, driver 2.5.7) :
   - Support for Rails-3.1.0
   - Fixed bug #29052 -> prepare results in empty error message

data/README

@@ -1,5 +1,5 @@
 =====================================================================
-README for the IBM_DB Adapter (2.5.7) and Driver (2.5.7) (2011/09/18)
+README for the IBM_DB Adapter (2.5.9) and Driver (2.5.9) (2012/01/03)
 For ActiveRecord Version >= 1.15.5 (and Rails >= 1.2.5)
 =====================================================================
 

data/ext/extconf.rb

@@ -7,7 +7,7 @@
 # +----------------------------------------------------------------------+
 
 require 'mkmf'
-WIN = RUBY_PLATFORM =~ /mswin/
+WIN = RUBY_PLATFORM =~ /mswin/ || RUBY_PLATFORM =~ /mingw/
 
 # use ENV['DB2DIR'] or latest db2 you can find
 # (we need to revisit default when db2 10.x comes out)

data/ext/ibm_db.c

@@ -12,7 +12,7 @@
   +----------------------------------------------------------------------+
 */
 
-#define MODULE_RELEASE "2.5.7"
+#define MODULE_RELEASE "2.5.9"
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -42,6 +42,7 @@ static void _ruby_ibm_db_clear_stmt_err_cache();
 static int  _ruby_ibm_db_set_decfloat_rounding_mode_client(SQLHANDLE hdbc);
 static char *_ruby_ibm_db_instance_name;
 static int  is_systemi, is_informix;        /* 1 == TRUE; 0 == FALSE; */
+static int  createDbSupported, dropDbSupported; /*1 == TRUE; 0 == FALSE*/
 
 /* Strucure holding the necessary data to be passed to bind the list of elements passed to the execute function*/
 typedef struct _stmt_bind_data_array {
@@ -188,6 +189,9 @@ void Init_ibm_db(void) {
   mDB = rb_define_module("IBM_DB");
 
   rb_define_module_function(mDB, "connect", ibm_db_connect, -1);
+  rb_define_module_function(mDB, "createDB", ibm_db_createDB, -1);
+  rb_define_module_function(mDB, "dropDB", ibm_db_dropDB, -1);
+  rb_define_module_function(mDB, "createDBNX", ibm_db_createDBNX, -1);
   rb_define_module_function(mDB, "commit", ibm_db_commit, -1);
   rb_define_module_function(mDB, "pconnect", ibm_db_pconnect, -1);
   rb_define_module_function(mDB, "autocommit", ibm_db_autocommit, -1);
@@ -326,6 +330,54 @@ static void ruby_ibm_db_load_necessary_libs() {
   rb_eval_string("require \'bigdecimal\'");
 }
 
+#ifdef _WIN32
+static void ruby_ibm_db_check_sqlcreatedb(HINSTANCE cliLib) {
+   FARPROC sqlcreatedb;
+   sqlcreatedb =  DLSYM( cliLib, "SQLCreateDbW" );
+#else
+static void ruby_ibm_db_check_sqlcreatedb(void *cliLib) {
+   typedef int (*sqlcreatedbType)( SQLHDBC, SQLWCHAR *, SQLINTEGER, SQLWCHAR *, SQLINTEGER, SQLWCHAR *, SQLINTEGER );
+   sqlcreatedbType sqlcreatedb;
+   sqlcreatedb = (sqlcreatedbType) DLSYM( cliLib, "SQLCreateDbW" );
+#endif
+     if ( sqlcreatedb == NULL )  {
+        createDbSupported = 0;
+        dropDbSupported   = 0;
+	 } else {
+        createDbSupported = 1;
+        dropDbSupported   = 1;
+	 }
+}
+/*Check if specific functions are supported or not based on CLI being used
+ * For Eg: SQLCreateDB and SQLDropDB is supported only from V97fp3 onwards. In this function we open the CLI library 
+ * using DLOpen and check if the function is defined. If yes then we allow the user to use the function, 
+ * else throw a warning saying this is not supported 
+ */
+static void ruby_ibm_db_check_if_cli_func_supported() {
+#ifdef _WIN32
+   HINSTANCE cliLib = NULL;
+#else
+   void *cliLib = NULL;
+#endif
+
+#ifdef _WIN32
+    cliLib = DLOPEN( LIBDB2 );
+#elif _AIX
+/* On AIX CLI library is in archive. Hence we will need to specify flags in DLOPEN to load a member of the archive*/
+    cliLib = DLOPEN( LIBDB2, RTLD_MEMBER | RTLD_LAZY );
+#else
+    cliLib = DLOPEN( LIBDB2, RTLD_LAZY );
+#endif
+  if ( !cliLib ) {
+    rb_warn("Could not load CLI library to check functionality support");
+    createDbSupported = 0;
+    dropDbSupported   = 0;
+    return;
+  }
+  ruby_ibm_db_check_sqlcreatedb(cliLib);
+  DLCLOSE( cliLib );
+}
+
 static void ruby_ibm_db_init_globals(struct _ibm_db_globals *ibm_db_globals)
 {
   /* env handle */
@@ -848,6 +900,8 @@ void ruby_init_ibm_db()
   rb_attr(le_server_info, rb_intern("NON_NULLABLE_COLUMNS"), 1, 0, 0);
 
   ruby_ibm_db_load_necessary_libs();
+
+  ruby_ibm_db_check_if_cli_func_supported();
 }
 /*  */
 
@@ -932,7 +986,7 @@ static void _ruby_ibm_db_check_sql_errors( void *conn_or_stmt, int resourceType,
 
   if( release_gil == 1 ){
 
-    #ifdef GIL_RELEASE_VERSION
+    #ifdef UNICODE_SUPPORT_VERSION
       return_code  =  rb_thread_blocking_region( (void *)_ruby_ibm_db_SQLGetDiagRec_helper, get_DiagRec_args,
                                 (void *)_ruby_ibm_db_Connection_level_UBF, NULL);
     #else
@@ -1042,6 +1096,7 @@ static void _ruby_ibm_db_check_sql_errors( void *conn_or_stmt, int resourceType,
               strncpy(conn_res->ruby_error_msg, (char*)errMsg, length );
 #endif
               conn_res->ruby_error_msg_len  =  length;
+              conn_res->sqlcode             =  sqlcode;
               break;
 
             case SQL_HANDLE_STMT:
@@ -1082,6 +1137,7 @@ static void _ruby_ibm_db_check_sql_errors( void *conn_or_stmt, int resourceType,
                   strncpy(conn_res->ruby_error_msg, (char*)errMsg, length );
 #endif
                   conn_res->ruby_error_msg_len  =  length;
+                  conn_res->sqlcode             =  sqlcode;
                   break;
 
                 case DB_STMT:
@@ -1119,6 +1175,7 @@ static void _ruby_ibm_db_check_sql_errors( void *conn_or_stmt, int resourceType,
                   strncpy(stmt_res->ruby_stmt_err_msg, (char*)errMsg, length );
 #endif
                   stmt_res->ruby_stmt_err_msg_len  =  length;
+                  stmt_res->sqlcode                =  sqlcode;
                   break; 
 
               }  /*End of switch( resourceType )*/
@@ -2435,7 +2492,7 @@ static VALUE _ruby_ibm_db_connect_helper( int argc, VALUE *argv, int isPersisten
   }
 
   /* Call the function where the actual logic is being run*/
-  #ifdef GIL_RELEASE_VERSION
+  #ifdef UNICODE_SUPPORT_VERSION
     return_value = rb_thread_blocking_region( (void *)_ruby_ibm_db_connect_helper2, helper_args,
                              (void *)_ruby_ibm_db_Connection_level_UBF, NULL);
   #else
@@ -2776,6 +2833,366 @@ VALUE ibm_db_pconnect(int argc, VALUE *argv, VALUE self)
 
   return _ruby_ibm_db_connect_helper( argc, argv, 1);
 }
+/*
+ * CreateDB helper
+ */
+VALUE ruby_ibm_db_createDb_helper(VALUE connection, VALUE dbName, VALUE codeSet, VALUE mode, int createNX) {
+  
+  VALUE return_value    =  Qfalse;
+#ifdef UNICODE_SUPPORT_VERSION
+  VALUE dbName_utf16    = Qnil;
+  VALUE codeSet_utf16   = Qnil;
+  VALUE mode_utf16      = Qnil;
+#endif
+
+  int rc;
+
+  create_drop_db_args *create_db_args = NULL;
+  conn_handle *conn_res;
+
+  if (!NIL_P(connection)) {
+    Data_Get_Struct(connection, conn_handle, conn_res);
+
+	if( 0 == createDbSupported ) {
+      rb_warn("Create Database not supported: This function is only supported from DB2 Client v97fp4 version and onwards");
+	  return Qfalse;
+    }
+
+    if (!conn_res->handle_active) {
+      rb_warn("Connection is not active");
+      return Qfalse;
+    }
+
+	if (!NIL_P(dbName)) {
+      create_db_args = ALLOC( create_drop_db_args );
+	  memset(create_db_args,'\0',sizeof(struct _ibm_db_create_drop_db_args_struct));
+
+#ifdef UNICODE_SUPPORT_VERSION
+      dbName_utf16               =  _ruby_ibm_db_export_str_to_utf16(dbName);
+
+	  create_db_args->dbName     =  (SQLWCHAR*)RSTRING_PTR(dbName_utf16);
+      create_db_args->dbName_string_len =  RSTRING_LEN(dbName_utf16)/sizeof(SQLWCHAR); /*RSTRING_LEN returns number of bytes*/
+
+	  if(!NIL_P(codeSet)){
+        codeSet_utf16            =  _ruby_ibm_db_export_str_to_utf16(codeSet); 
+        create_db_args->codeSet  =  (SQLWCHAR*)RSTRING_PTR(codeSet_utf16);
+        create_db_args->codeSet_string_len =  RSTRING_LEN(codeSet_utf16)/sizeof(SQLWCHAR); /*RSTRING_LEN returns number of bytes*/
+	  } else {
+        create_db_args->codeSet  =  NULL;
+	  }
+
+	  if(!NIL_P(mode)) {
+	    mode_utf16               =  _ruby_ibm_db_export_str_to_utf16(mode);
+		create_db_args->mode     =  (SQLWCHAR*)RSTRING_PTR(mode_utf16);
+        create_db_args->mode_string_len =  RSTRING_LEN(mode_utf16)/sizeof(SQLWCHAR); /*RSTRING_LEN returns number of bytes*/
+	  } else {
+        create_db_args->mode     =  NULL;
+	  }
+#else
+      create_db_args->dbName     = (SQLCHAR*)rb_str2cstr(dbName, &(create_db_args->dbName_string_len));
+	  if(!NIL_P(codeSet)){
+        create_db_args->codeSet  = (SQLCHAR*)rb_str2cstr(codeSet, &(create_db_args->codeSet_string_len));
+	  } else {
+        create_db_args->codeSet  = NULL;
+	  }
+	  if(!NIL_P(mode)) {
+        create_db_args->mode     = (SQLCHAR*)rb_str2cstr(mode, &(create_db_args->mode_string_len));
+	  } else {
+        create_db_args->mode     = NULL;
+	  }
+#endif
+	} else {
+		rb_warn("Invalid Parameter: Database Name cannot be nil");
+		return Qfalse;
+	}
+
+	create_db_args->conn_res = conn_res;
+
+	_ruby_ibm_db_clear_conn_err_cache();
+
+#ifdef UNICODE_SUPPORT_VERSION
+        rc = rb_thread_blocking_region( (void *)_ruby_ibm_db_SQLCreateDB_helper, create_db_args,
+                       (void *)_ruby_ibm_db_Connection_level_UBF, NULL );
+#else
+        rc = _ruby_ibm_db_SQLCreateDB_helper( create_db_args );
+#endif
+
+      if ( rc == SQL_ERROR ) {
+        conn_res->error_recno_tracker    =  1;
+        conn_res->errormsg_recno_tracker =  1;
+        _ruby_ibm_db_check_sql_errors( conn_res, DB_CONN, conn_res->hdbc, SQL_HANDLE_DBC, rc, 1, NULL, NULL, -1, 1, 0 );
+		if(conn_res->sqlcode == -1005 && 1 == createNX) {
+          return_value = Qtrue; /*Return true if database already exists and Create if not existing called*/
+		  /*Clear the error messages*/
+#ifdef UNICODE_SUPPORT_VERSION
+          memset( conn_res->ruby_error_state, '\0', (SQL_SQLSTATE_SIZE + 1) * sizeof(SQLWCHAR) );
+          memset( conn_res->ruby_error_msg, '\0', (DB2_MAX_ERR_MSG_LEN + 1) * sizeof(SQLWCHAR) );
+#else
+          memset( conn_res->ruby_error_state, '\0', SQL_SQLSTATE_SIZE + 1 );
+          memset( conn_res->ruby_error_msg, '\0', DB2_MAX_ERR_MSG_LEN + 1 );
+#endif
+		} else {
+          return_value = Qfalse;
+		}
+      } else {
+        return_value = Qtrue;
+      }
+  }
+
+  /*Free memory allocated*/
+  if( create_db_args != NULL ) {
+    ruby_xfree( create_db_args );
+    create_db_args = NULL;
+  }
+
+  return return_value;  
+}
+/*  */
+/*
+ * IBM_DB.createDB -- Creates a Database
+ *
+ * ===Description
+ * bool IBM_DB.createDB ( resource connection , string dbName [, String codeSet, String mode] )
+ *
+ * Creates a database with the specified name. Returns true if operation successful else false
+ *
+ * ===Parameters
+ * 
+ * connection
+ *     A valid database connection resource variable as returned from IBM_DB.connect() or IBM_DB.pconnect() with parameter ATTACH=true specified.
+ *     IBM_DB.connect('DRIVER={IBM DB2 ODBC DRIVER};ATTACH=true;HOSTNAME=myhost;PORT=1234;PROTOCOL=TCPIP;UID=user;PWD=secret;','','')
+ *     Note: Database is not specified. In this case we connect to the instance only.
+ *
+ * dbName
+ *     Name of the database that is to be created.
+ *
+ * codeSet
+ *      Database code set information.
+ *      Note: If the value of the codeSet argument is not specified, 
+ *      the database is created in the Unicode code page for DB2 data servers and in the UTF-8 code page for IDS data servers
+ *
+ * mode
+ *      Database logging mode.
+ *      Note: This value is applicable only to IDS data servers
+ *
+ * ===Return Values
+ * 
+ * Returns TRUE on success or FALSE on failure. 
+ */
+VALUE ibm_db_createDB(int argc, VALUE *argv, VALUE self)
+{
+  VALUE connection   = Qnil;
+  VALUE dbName       = Qnil;
+  VALUE codeSet      = Qnil;
+  VALUE mode         = Qnil;
+
+  rb_scan_args(argc, argv, "22", &connection, &dbName, &codeSet, &mode);
+
+  return ruby_ibm_db_createDb_helper(connection, dbName, codeSet, mode, 0);  
+}
+/*
+ *  DropDb helper
+ */
+VALUE ruby_ibm_db_dropDb_helper(VALUE connection, VALUE dbName) {
+#ifdef UNICODE_SUPPORT_VERSION
+  VALUE dbName_utf16    = Qnil;
+#endif
+
+  VALUE return_value =  Qfalse;
+
+  int rc;
+
+  create_drop_db_args *drop_db_args = NULL;
+  conn_handle         *conn_res     = NULL;
+
+  if (!NIL_P(connection)) {
+    Data_Get_Struct(connection, conn_handle, conn_res);
+
+	if( 0 == dropDbSupported ) {
+      rb_warn("Drop Database not supported: This function is only supported from DB2 Client v97fp4 version and onwards");
+	  return Qfalse;
+    }
+
+    if (!conn_res->handle_active) {
+      rb_warn("Connection is not active");
+      return Qfalse;
+    }
+
+	if (!NIL_P(dbName)) {
+      drop_db_args = ALLOC( create_drop_db_args );
+	  memset(drop_db_args,'\0',sizeof(struct _ibm_db_create_drop_db_args_struct));
+
+#ifdef UNICODE_SUPPORT_VERSION
+      dbName_utf16             =  _ruby_ibm_db_export_str_to_utf16(dbName);
+
+	  drop_db_args->dbName     =  (SQLWCHAR*)RSTRING_PTR(dbName_utf16);
+      drop_db_args->dbName_string_len =  RSTRING_LEN(dbName_utf16)/sizeof(SQLWCHAR); /*RSTRING_LEN returns number of bytes*/
+#else
+      drop_db_args->dbName     =  (SQLCHAR*)rb_str2cstr(dbName, &(drop_db_args->dbName_string_len));
+#endif
+	} else {
+		rb_warn("Invalid Parameter: Database Name cannot be nil");
+		return Qfalse;
+	}
+
+	drop_db_args->conn_res = conn_res;
+
+	_ruby_ibm_db_clear_conn_err_cache();
+
+#ifdef UNICODE_SUPPORT_VERSION
+        rc = rb_thread_blocking_region( (void *)_ruby_ibm_db_SQLDropDB_helper, drop_db_args,
+                       (void *)_ruby_ibm_db_Connection_level_UBF, NULL );
+#else
+        rc = _ruby_ibm_db_SQLDropDB_helper( drop_db_args );
+#endif
+
+      if ( rc == SQL_ERROR ) {
+        conn_res->error_recno_tracker    =  1;
+        conn_res->errormsg_recno_tracker =  1;
+        _ruby_ibm_db_check_sql_errors( conn_res, DB_CONN, conn_res->hdbc, SQL_HANDLE_DBC, rc, 1, NULL, NULL, -1, 1, 0 );
+        return_value = Qfalse;
+      } else {
+        return_value = Qtrue;
+      }
+  }
+
+  /*Free memory allocated*/
+  if( drop_db_args != NULL ) {
+    ruby_xfree( drop_db_args );
+    drop_db_args = NULL;
+  }
+
+  return return_value;  
+}
+/*  */
+/*
+ * IBM_DB.dropDB -- Drops the mentioned Database
+ *
+ * ===Description
+ * bool IBM_DB.dropDB ( resource connection , string dbName [, String codeSet, String mode] )
+ *
+ * Drops a database with the specified name. Returns true if operation successful else false
+ *
+ * ===Parameters
+ * 
+ * connection
+ *     A valid database connection resource variable as returned from IBM_DB.connect() or IBM_DB.pconnect() with parameter ATTACH=true specified.
+ *     IBM_DB.connect('DRIVER={IBM DB2 ODBC DRIVER};ATTACH=true;HOSTNAME=myhost;PORT=1234;PROTOCOL=TCPIP;UID=user;PWD=secret;','','')
+ *     Note: Database is not specified. In this case we connect to the instance only.
+ * dbName
+ *     Name of the database that is to be created.
+ *
+ * ===Return Values
+ * 
+ * Returns TRUE on success or FALSE on failure. 
+ */
+VALUE ibm_db_dropDB(int argc, VALUE *argv, VALUE self)
+{
+  VALUE connection      = Qnil;
+  VALUE dbName          = Qnil;
+
+  rb_scan_args(argc, argv, "2", &connection, &dbName);
+
+  return ruby_ibm_db_dropDb_helper(connection, dbName);
+}
+/*  */
+/*
+ * IBM_DB.recreateDB -- Recreates an Existing database
+ *
+ * ===Description
+ * bool IBM_DB.recreateDB ( resource connection , string dbName [, String codeSet, String mode] )
+ *
+ * Recreates a database with the specified name. This method will drop an existing database and then re-create it.
+ * If database doesnot exist the method will return false.
+ * Returns true if operation successful else false
+ *
+ * ===Parameters
+ * 
+ * connection
+ *     A valid database connection resource variable as returned from IBM_DB.connect() or IBM_DB.pconnect() with parameter ATTACH=true specified.
+ *     IBM_DB.connect('DRIVER={IBM DB2 ODBC DRIVER};ATTACH=true;HOSTNAME=myhost;PORT=1234;PROTOCOL=TCPIP;UID=user;PWD=secret;','','')
+ *     Note: Database is not specified. In this case we connect to the instance only.
+ *
+ * dbName
+ *     Name of the database that is to be created.
+ *
+ * codeSet
+ *      Database code set information.
+ *      Note: If the value of the codeSet argument is not specified, 
+ *      the database is created in the Unicode code page for DB2 data servers and in the UTF-8 code page for IDS data servers
+ *
+ * mode
+ *      Database logging mode.
+ *      Note: This value is applicable only to IDS data servers
+ *
+ * ===Return Values
+ * 
+ * Returns TRUE on success or FALSE on failure. 
+ */
+/*VALUE ibm_db_recreateDB(int argc, VALUE *argv, VALUE self)
+{
+  VALUE connection   = Qnil;
+  VALUE dbName       = Qnil;
+  VALUE codeSet      = Qnil;
+  VALUE mode         = Qnil;
+  VALUE return_value = Qnil;
+
+  rb_scan_args(argc, argv, "22", &connection, &dbName, &codeSet, &mode);
+
+  return_value = ruby_ibm_db_dropDb_helper(connection, dbName);
+
+  if(return_value == Qfalse) {
+    return Qfalse;
+  }
+
+  return ruby_ibm_db_createDb_helper(connection, dbName, codeSet, mode);  
+}*/
+/*  */
+/*
+ * IBM_DB.createDBNX -- creates a database if it does not exist aleady
+ *
+ * ===Description
+ * bool IBM_DB.createDBNX ( resource connection , string dbName [, String codeSet, String mode] )
+ *
+ * Creates a database with the specified name, if it does not exist already. This method will drop an existing database and then re-create it.
+ * If database doesnot exist the method will return false.
+ * Returns true if operation successful else false
+ *
+ * ===Parameters
+ * 
+ * connection
+ *     A valid database connection resource variable as returned from IBM_DB.connect() or IBM_DB.pconnect() with parameter ATTACH=true specified.
+ *     IBM_DB.connect('DRIVER={IBM DB2 ODBC DRIVER};ATTACH=true;HOSTNAME=myhost;PORT=1234;PROTOCOL=TCPIP;UID=user;PWD=secret;','','')
+ *     Note: Database is not specified. In this case we connect to the instance only.
+ *
+ * dbName
+ *     Name of the database that is to be created.
+ *
+ * codeSet
+ *      Database code set information.
+ *      Note: If the value of the codeSet argument is not specified, 
+ *      the database is created in the Unicode code page for DB2 data servers and in the UTF-8 code page for IDS data servers
+ *
+ * mode
+ *      Database logging mode.
+ *      Note: This value is applicable only to IDS data servers
+ *
+ * ===Return Values
+ * 
+ * Returns TRUE on success or FALSE on failure. 
+ */
+VALUE ibm_db_createDBNX(int argc, VALUE *argv, VALUE self)
+{
+  VALUE connection   = Qnil;
+  VALUE dbName       = Qnil;
+  VALUE codeSet      = Qnil;
+  VALUE mode         = Qnil;
+  VALUE return_value = Qnil;
+
+  rb_scan_args(argc, argv, "22", &connection, &dbName, &codeSet, &mode);
+
+  return ruby_ibm_db_createDb_helper(connection, dbName, codeSet, mode, 1);  
+}
 /*  */
 
 /*
@@ -2984,7 +3401,7 @@ VALUE ibm_db_bind_param_helper(int argc, char * varname, long varname_len ,long
     case 3:
       param_type = SQL_PARAM_INPUT;
 
-      #ifdef GIL_RELEASE_VERSION
+      #ifdef UNICODE_SUPPORT_VERSION
         rc  =  rb_thread_blocking_region( (void *)_ruby_ibm_db_SQLDescribeParam_helper, data,
                          (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res);
       #else
@@ -3004,7 +3421,7 @@ VALUE ibm_db_bind_param_helper(int argc, char * varname, long varname_len ,long
 
     case 4:
 
-      #ifdef GIL_RELEASE_VERSION
+      #ifdef UNICODE_SUPPORT_VERSION
         rc = rb_thread_blocking_region( (void *)_ruby_ibm_db_SQLDescribeParam_helper, data,
                        (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res);
       #else
@@ -3024,7 +3441,7 @@ VALUE ibm_db_bind_param_helper(int argc, char * varname, long varname_len ,long
 
     case 5:
 
-      #ifdef GIL_RELEASE_VERSION
+      #ifdef UNICODE_SUPPORT_VERSION
         rc = rb_thread_blocking_region( (void *)_ruby_ibm_db_SQLDescribeParam_helper, data,
                        (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
       #else
@@ -3045,7 +3462,7 @@ VALUE ibm_db_bind_param_helper(int argc, char * varname, long varname_len ,long
 
     case 6:
 
-      #ifdef GIL_RELEASE_VERSION
+      #ifdef UNICODE_SUPPORT_VERSION
         rc = rb_thread_blocking_region( (void *)_ruby_ibm_db_SQLDescribeParam_helper, data,
                        (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
       #else
@@ -3277,7 +3694,7 @@ VALUE ibm_db_close(int argc, VALUE *argv, VALUE self)
         end_X_args->handleType      =  SQL_HANDLE_DBC;
         end_X_args->completionType  =  SQL_ROLLBACK;        /*Remeber you are rolling back the transaction*/
 
-        #ifdef GIL_RELEASE_VERSION
+        #ifdef UNICODE_SUPPORT_VERSION
           rc = rb_thread_blocking_region( (void *)_ruby_ibm_db_SQLEndTran, end_X_args,
                          (void *)_ruby_ibm_db_Connection_level_UBF, NULL);
         #else
@@ -3295,7 +3712,7 @@ VALUE ibm_db_close(int argc, VALUE *argv, VALUE self)
         }
       }
 
-      #ifdef GIL_RELEASE_VERSION
+      #ifdef UNICODE_SUPPORT_VERSION
         rc = rb_thread_blocking_region( (void *)_ruby_ibm_db_SQLDisconnect_helper, &(conn_res->hdbc),
                        (void *)_ruby_ibm_db_Connection_level_UBF, NULL);
       #else
@@ -3472,7 +3889,7 @@ VALUE ibm_db_column_privileges(int argc, VALUE *argv, VALUE self)
           }
           col_privileges_args->stmt_res  =  stmt_res;
 
-          #ifdef GIL_RELEASE_VERSION
+          #ifdef UNICODE_SUPPORT_VERSION
             rc = rb_thread_blocking_region( (void *)_ruby_ibm_db_SQLColumnPrivileges_helper, col_privileges_args,
                            (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
           #else
@@ -3652,7 +4069,7 @@ VALUE ibm_db_columns(int argc, VALUE *argv, VALUE self)
         }
         col_metadata_args->stmt_res  =  stmt_res;
 
-        #ifdef GIL_RELEASE_VERSION
+        #ifdef UNICODE_SUPPORT_VERSION
           rc = rb_thread_blocking_region( (void *)_ruby_ibm_db_SQLColumns_helper, col_metadata_args,
                          (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
         #else
@@ -3818,7 +4235,7 @@ VALUE ibm_db_foreign_keys(int argc, VALUE *argv, VALUE self)
 
         col_metadata_args->stmt_res  =  stmt_res;
 
-        #ifdef GIL_RELEASE_VERSION
+        #ifdef UNICODE_SUPPORT_VERSION
           rc = rb_thread_blocking_region( (void *)_ruby_ibm_db_SQLForeignKeys_helper, col_metadata_args,
                          (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
         #else
@@ -3974,7 +4391,7 @@ VALUE ibm_db_primary_keys(int argc, VALUE *argv, VALUE self)
         }
         col_metadata_args->stmt_res  =  stmt_res;
 
-        #ifdef GIL_RELEASE_VERSION
+        #ifdef UNICODE_SUPPORT_VERSION
           rc = rb_thread_blocking_region( (void *)_ruby_ibm_db_SQLPrimaryKeys_helper, col_metadata_args,
                          (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
         #else
@@ -4165,7 +4582,7 @@ VALUE ibm_db_procedure_columns(int argc, VALUE *argv, VALUE self)
         }
         col_metadata_args->stmt_res  =  stmt_res;
 
-        #ifdef GIL_RELEASE_VERSION
+        #ifdef UNICODE_SUPPORT_VERSION
           rc = rb_thread_blocking_region( (void *)_ruby_ibm_db_SQLProcedureColumns_helper, col_metadata_args,
                          (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res);
         #else
@@ -4322,7 +4739,7 @@ VALUE ibm_db_procedures(int argc, VALUE *argv, VALUE self)
         }
         proc_metadata_args->stmt_res     =  stmt_res;
 
-        #ifdef GIL_RELEASE_VERSION
+        #ifdef UNICODE_SUPPORT_VERSION
           rc = rb_thread_blocking_region( (void *)_ruby_ibm_db_SQLProcedures_helper, proc_metadata_args,
                          (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res);
         #else
@@ -4499,7 +4916,7 @@ VALUE ibm_db_special_columns(int argc, VALUE *argv, VALUE self)
         }
         col_metadata_args->stmt_res       =  stmt_res;
 
-        #ifdef GIL_RELEASE_VERSION
+        #ifdef UNICODE_SUPPORT_VERSION
           rc = rb_thread_blocking_region( (void *)_ruby_ibm_db_SQLSpecialColumns_helper, col_metadata_args,
                          (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res);
         #else
@@ -4694,7 +5111,7 @@ VALUE ibm_db_statistics(int argc, VALUE *argv, VALUE self)
         }
         col_metadata_args->stmt_res      =  stmt_res;
 
-        #ifdef GIL_RELEASE_VERSION
+        #ifdef UNICODE_SUPPORT_VERSION
           rc = rb_thread_blocking_region( (void *)_ruby_ibm_db_SQLStatistics_helper, col_metadata_args,
                          (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
         #else
@@ -4853,7 +5270,7 @@ VALUE ibm_db_table_privileges(int argc, VALUE *argv, VALUE self)
 
         table_privileges_args->stmt_res       =  stmt_res;
 
-        #ifdef GIL_RELEASE_VERSION
+        #ifdef UNICODE_SUPPORT_VERSION
           rc = rb_thread_blocking_region( (void *)_ruby_ibm_db_SQLTablePrivileges_helper, table_privileges_args,
                          (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
         #else
@@ -5027,7 +5444,7 @@ VALUE ibm_db_tables(int argc, VALUE *argv, VALUE self)
 
         table_metadata_args->stmt_res      =  stmt_res;
 
-        #ifdef GIL_RELEASE_VERSION
+        #ifdef UNICODE_SUPPORT_VERSION
           rc = rb_thread_blocking_region( (void *)_ruby_ibm_db_SQLTables_helper, table_metadata_args,
                          (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
         #else
@@ -5109,7 +5526,7 @@ VALUE ibm_db_commit(int argc, VALUE *argv, VALUE self)
     end_X_args->handleType      =  SQL_HANDLE_DBC;
     end_X_args->completionType  =  SQL_COMMIT;        /*Remeber you are Commiting the transaction*/
 
-    #ifdef GIL_RELEASE_VERSION
+    #ifdef UNICODE_SUPPORT_VERSION
       rc = rb_thread_blocking_region( (void *)_ruby_ibm_db_SQLEndTran, end_X_args,
                      (void *)_ruby_ibm_db_Connection_level_UBF, NULL);
     #else
@@ -5189,7 +5606,7 @@ static int _ruby_ibm_db_do_prepare(conn_handle *conn_res, VALUE stmt, stmt_handl
     prepare_args->stmt_res    =  stmt_res;
 
     /* Prepare the stmt. The cursor type requested has already been set in _ruby_ibm_db_assign_options */
-    #ifdef GIL_RELEASE_VERSION
+    #ifdef UNICODE_SUPPORT_VERSION
       rc = rb_thread_blocking_region( (void *)_ruby_ibm_db_SQLPrepare_helper, prepare_args,
                      (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
     #else
@@ -5327,7 +5744,7 @@ VALUE ibm_db_exec(int argc, VALUE *argv, VALUE self)
 
       exec_direct_args->stmt_res    =  stmt_res;
 
-      #ifdef GIL_RELEASE_VERSION
+      #ifdef UNICODE_SUPPORT_VERSION
         rc = rb_thread_blocking_region( (void *)_ruby_ibm_db_SQLExecDirect_helper, exec_direct_args,
                        (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
       #else
@@ -5402,7 +5819,7 @@ VALUE ibm_db_free_result(int argc, VALUE *argv, VALUE self)
       freeStmt_args->stmt_res  =  stmt_res;
       freeStmt_args->option    =  SQL_CLOSE;
 
-      #ifdef GIL_RELEASE_VERSION
+      #ifdef UNICODE_SUPPORT_VERSION
         rc = rb_thread_blocking_region( (void *)_ruby_ibm_db_SQLFreeStmt_helper, freeStmt_args, 
                        (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
       #else
@@ -6507,7 +6924,7 @@ VALUE ibm_db_execute(int argc, VALUE *argv, VALUE self)
     bind_array->num               =  0;
     bind_array->error             =  &error;
 
-    #ifdef GIL_RELEASE_VERSION
+    #ifdef UNICODE_SUPPORT_VERSION
       ret_value = rb_thread_blocking_region( (void *)_ruby_ibm_db_execute_helper, bind_array,
                             (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
     #else
@@ -7292,7 +7709,7 @@ VALUE ibm_db_next_result(int argc, VALUE *argv, VALUE self)
       nextresultparams->stmt_res  =  stmt_res;
       nextresultparams->new_hstmt =  &new_hstmt;
 
-      #ifdef GIL_RELEASE_VERSION
+      #ifdef UNICODE_SUPPORT_VERSION
         rc = rb_thread_blocking_region( (void *)_ruby_ibm_db_SQLNextResult_helper, nextresultparams,
                        (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
       #else
@@ -7391,7 +7808,7 @@ VALUE ibm_db_num_fields(int argc, VALUE *argv, VALUE self)
     result_cols_args->stmt_res  =  stmt_res;
     result_cols_args->count     =  0;
 
-    #ifdef GIL_RELEASE_VERSION
+    #ifdef UNICODE_SUPPORT_VERSION
       rc = rb_thread_blocking_region( (void *)_ruby_ibm_db_SQLNumResultCols_helper, result_cols_args,
                      (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
     #else
@@ -7484,7 +7901,7 @@ VALUE ibm_db_num_rows(int argc, VALUE *argv, VALUE self)
     row_count_args->stmt_res  =  stmt_res;
     row_count_args->count     =  0;
 
-    #ifdef GIL_RELEASE_VERSION
+    #ifdef UNICODE_SUPPORT_VERSION
       rc = rb_thread_blocking_region( (void *)_ruby_ibm_db_SQLRowCount_helper, row_count_args,
                      (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
     #else
@@ -7540,7 +7957,7 @@ static int _ruby_ibm_db_get_column_by_name(stmt_handle *stmt_res, VALUE column,
   if ( stmt_res->column_info == NULL ) {
     if ( release_gil == 1 ) {
 
-      #ifdef GIL_RELEASE_VERSION
+      #ifdef UNICODE_SUPPORT_VERSION
         rc = rb_thread_blocking_region( (void *)_ruby_ibm_db_get_result_set_info, stmt_res,
                       (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
       #else
@@ -7703,7 +8120,7 @@ VALUE ibm_db_field_display_size(int argc, VALUE *argv, VALUE self)
     colattr_args->col_num         =  col+1;
     colattr_args->FieldIdentifier =  SQL_DESC_DISPLAY_SIZE;
 
-    #ifdef GIL_RELEASE_VERSION
+    #ifdef UNICODE_SUPPORT_VERSION
       rc = rb_thread_blocking_region( (void *)_ruby_ibm_db_SQLColAttributes_helper, colattr_args,
                      (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
     #else
@@ -8023,7 +8440,7 @@ VALUE ibm_db_field_width(int argc, VALUE *argv, VALUE self)
     colattr_args->col_num          =  col+1;
     colattr_args->FieldIdentifier  =  SQL_DESC_LENGTH;
 
-    #ifdef GIL_RELEASE_VERSION
+    #ifdef UNICODE_SUPPORT_VERSION
       rc = rb_thread_blocking_region( (void *)_ruby_ibm_db_SQLColAttributes_helper, colattr_args,
                      (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
     #else
@@ -8129,7 +8546,7 @@ VALUE ibm_db_rollback(int argc, VALUE *argv, VALUE self)
     end_X_args->handleType      =  SQL_HANDLE_DBC;
     end_X_args->completionType  =  SQL_ROLLBACK;    /*Remeber you are Rollingback the transaction*/
 
-    #ifdef GIL_RELEASE_VERSION
+    #ifdef UNICODE_SUPPORT_VERSION
       rc = rb_thread_blocking_region( (void *)_ruby_ibm_db_SQLEndTran, end_X_args,
                      (void *)_ruby_ibm_db_Connection_level_UBF, NULL);
     #else
@@ -8710,7 +9127,7 @@ VALUE ibm_db_result(int argc, VALUE *argv, VALUE self)
   if ( !NIL_P( stmt ) ) {
     Data_Get_Struct(stmt, stmt_handle, result_args->stmt_res);
 
-    #ifdef GIL_RELEASE_VERSION
+    #ifdef UNICODE_SUPPORT_VERSION
       ret_val = rb_thread_blocking_region( (void *)_ruby_ibm_db_result_helper, result_args,
                           (void *)_ruby_ibm_db_Statement_level_UBF, result_args->stmt_res );
     #else
@@ -9513,7 +9930,7 @@ VALUE ibm_db_fetch_row(int argc, VALUE *argv, VALUE self)
   helper_args->arg_count   =  argc;
   helper_args->error       =  &error;
 
-  #ifdef GIL_RELEASE_VERSION
+  #ifdef UNICODE_SUPPORT_VERSION
     ret_val = rb_thread_blocking_region( (void *)_ruby_ibm_db_fetch_row_helper, helper_args,
                         (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
   #else
@@ -9586,7 +10003,7 @@ VALUE ibm_db_fetch_assoc(int argc, VALUE *argv, VALUE self) {
   helper_args->error      =  &error;
   helper_args->funcType   =  FETCH_ASSOC;
 
-  #ifdef GIL_RELEASE_VERSION
+  #ifdef UNICODE_SUPPORT_VERSION
     ret_val = rb_thread_blocking_region( (void *)_ruby_ibm_db_bind_fetch_helper, helper_args,
                         (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
   #else
@@ -9673,7 +10090,7 @@ VALUE ibm_db_fetch_object(int argc, VALUE *argv, VALUE self)
   helper_args->error      =  &error;
   helper_args->funcType   =  FETCH_ASSOC;
 
-  #ifdef GIL_RELEASE_VERSION
+  #ifdef UNICODE_SUPPORT_VERSION
     row_res->hash = rb_thread_blocking_region( (void *)_ruby_ibm_db_bind_fetch_helper, helper_args,
                               (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
   #else
@@ -9755,7 +10172,7 @@ VALUE ibm_db_fetch_array(int argc, VALUE *argv, VALUE self)
   helper_args->error       =  &error;
   helper_args->funcType    =  FETCH_INDEX;
 
-  #ifdef GIL_RELEASE_VERSION
+  #ifdef UNICODE_SUPPORT_VERSION
     ret_val = rb_thread_blocking_region( (void *)_ruby_ibm_db_bind_fetch_helper, helper_args,
                         (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
   #else
@@ -9831,7 +10248,7 @@ VALUE ibm_db_fetch_both(int argc, VALUE *argv, VALUE self)
   helper_args->error       =  &error;
   helper_args->funcType    =  FETCH_BOTH;
 
-  #ifdef GIL_RELEASE_VERSION
+  #ifdef UNICODE_SUPPORT_VERSION
     ret_val = rb_thread_blocking_region( (void *)_ruby_ibm_db_bind_fetch_helper, helper_args,
                         (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
   #else
@@ -10582,7 +10999,7 @@ VALUE ibm_db_server_info(int argc, VALUE *argv, VALUE self)
     getInfo_args->infoValue    =  NULL;
     getInfo_args->buff_length  =  0;
 
-    #ifdef GIL_RELEASE_VERSION
+    #ifdef UNICODE_SUPPORT_VERSION
       return_value  =  rb_thread_blocking_region( (void *)ibm_db_server_info_helper, getInfo_args,
                                  (void *)_ruby_ibm_db_Connection_level_UBF, NULL);
     #else
@@ -10869,7 +11286,7 @@ VALUE ibm_db_client_info(int argc, VALUE *argv, VALUE self)
     getInfo_args->infoValue    =  NULL;
     getInfo_args->buff_length  =  0;
 
-    #ifdef GIL_RELEASE_VERSION
+    #ifdef UNICODE_SUPPORT_VERSION
       return_value = rb_thread_blocking_region( (void *)ibm_db_client_info_helper, getInfo_args,
                                (void *)_ruby_ibm_db_Connection_level_UBF, NULL);
     #else

data/ext/ruby_ibm_db.h

@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   |  Licensed Materials - Property of IBM                                |
   |                                                                      |
-  | (C) Copyright IBM Corporation 2006, 2007, 2008, 2009, 2010           |
+  | (C) Copyright IBM Corporation 2006, 2007, 2008, 2009, 2010, 2012     |
   +----------------------------------------------------------------------+
   | Authors: Sushant Koduru, Lynh Nguyen, Kanchana Padmanabhan,          |
   |          Dan Scott, Helmut Tessarek, Kellen Bombardier, Sam Ruby     |
@@ -135,6 +135,9 @@ void Init_ibm_db();
 /* Function Declarations */
 
 VALUE ibm_db_connect(int argc, VALUE *argv, VALUE self);
+VALUE ibm_db_createDB(int argc, VALUE *argv, VALUE self);
+VALUE ibm_db_dropDB(int argc, VALUE *argv, VALUE self);
+VALUE ibm_db_createDBNX(int argc, VALUE *argv, VALUE self);
 VALUE ibm_db_commit(int argc, VALUE *argv, VALUE self);
 VALUE ibm_db_pconnect(int argc, VALUE *argv, VALUE self);
 VALUE ibm_db_autocommit(int argc, VALUE *argv, VALUE self);

data/ext/ruby_ibm_db_cli.c

@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   |  Licensed Materials - Property of IBM                                |
   |                                                                      |
-  | (C) Copyright IBM Corporation 2009, 2010                             |
+  | (C) Copyright IBM Corporation 2009, 2010, 2012                       |
   +----------------------------------------------------------------------+
   | Authors: Praveen Devarao                                             |
   +----------------------------------------------------------------------+
@@ -372,6 +372,113 @@ int _ruby_ibm_db_SQLExecDirect_helper(exec_cum_prepare_args *data) {
   return rc;
 }
 
+/*
+   This function calls SQLCreateDb cli call
+*/
+int _ruby_ibm_db_SQLCreateDB_helper(create_drop_db_args *data) {
+  int rc = 0;
+#ifndef UNICODE_SUPPORT_VERSION
+  #ifdef _WIN32
+    HINSTANCE cliLib = NULL;
+    FARPROC sqlcreatedb;
+    cliLib = DLOPEN( LIBDB2 );
+    sqlcreatedb =  DLSYM( cliLib, "SQLCreateDb" );
+  #elif _AIX
+    void *cliLib = NULL;
+    typedef int (*sqlcreatedbType)( SQLHDBC, SQLCHAR *, SQLINTEGER, SQLCHAR *, SQLINTEGER, SQLCHAR *, SQLINTEGER );
+    sqlcreatedbType sqlcreatedb;
+  /* On AIX CLI library is in archive. Hence we will need to specify flags in DLOPEN to load a member of the archive*/
+    cliLib = DLOPEN( LIBDB2, RTLD_MEMBER | RTLD_LAZY );
+    sqlcreatedb = (sqlcreatedbType) DLSYM( cliLib, "SQLCreateDb" );
+  #else
+    void *cliLib = NULL;
+    typedef int (*sqlcreatedbType)( SQLHDBC, SQLCHAR *, SQLINTEGER, SQLCHAR *, SQLINTEGER, SQLCHAR *, SQLINTEGER );
+    sqlcreatedbType sqlcreatedb;
+    cliLib = DLOPEN( LIBDB2, RTLD_LAZY );
+    sqlcreatedb = (sqlcreatedbType) DLSYM( cliLib, "SQLCreateDb" );
+  #endif
+#else
+  #ifdef _WIN32
+    HINSTANCE cliLib = NULL;
+    FARPROC sqlcreatedb;
+    cliLib = DLOPEN( LIBDB2 );
+    sqlcreatedb =  DLSYM( cliLib, "SQLCreateDbW" );
+  #elif _AIX
+    void *cliLib = NULL;
+    typedef int (*sqlcreatedbType)( SQLHDBC, SQLWCHAR *, SQLINTEGER, SQLWCHAR *, SQLINTEGER, SQLWCHAR *, SQLINTEGER );
+    sqlcreatedbType sqlcreatedb;
+  /* On AIX CLI library is in archive. Hence we will need to specify flags in DLOPEN to load a member of the archive*/
+    cliLib = DLOPEN( LIBDB2, RTLD_MEMBER | RTLD_LAZY );
+    sqlcreatedb = (sqlcreatedbType) DLSYM( cliLib, "SQLCreateDbW" );
+  #else
+    void *cliLib = NULL;
+    typedef int (*sqlcreatedbType)( SQLHDBC, SQLWCHAR *, SQLINTEGER, SQLWCHAR *, SQLINTEGER, SQLWCHAR *, SQLINTEGER );
+    sqlcreatedbType sqlcreatedb;
+    cliLib = DLOPEN( LIBDB2, RTLD_LAZY );
+    sqlcreatedb = (sqlcreatedbType) DLSYM( cliLib, "SQLCreateDbW" );
+  #endif
+#endif
+
+  rc = (*sqlcreatedb)( (SQLHSTMT) data->conn_res->hdbc, data->dbName, (SQLINTEGER)data->dbName_string_len, 
+                            data->codeSet, (SQLINTEGER)data->codeSet_string_len,
+							data->mode, (SQLINTEGER)data->mode_string_len );
+  DLCLOSE( cliLib );
+  return rc;
+}
+
+/*
+   This function calls SQLDropDb cli call
+*/
+int _ruby_ibm_db_SQLDropDB_helper(create_drop_db_args *data) {
+  int rc = 0;
+#ifndef UNICODE_SUPPORT_VERSION
+  #ifdef _WIN32
+    HINSTANCE cliLib = NULL;
+    FARPROC sqldropdb;
+    cliLib = DLOPEN( LIBDB2 );
+    sqldropdb =  DLSYM( cliLib, "SQLDropDb" );
+  #elif _AIX
+    void *cliLib = NULL;
+    typedef int (*sqldropdbType)( SQLHDBC, SQLCHAR *, SQLINTEGER);
+    sqldropdbType sqldropdb;
+  /* On AIX CLI library is in archive. Hence we will need to specify flags in DLOPEN to load a member of the archive*/
+    cliLib = DLOPEN( LIBDB2, RTLD_MEMBER | RTLD_LAZY );
+    sqldropdb = (sqldropdbType) DLSYM( cliLib, "SQLDropDb" );
+  #else
+    void *cliLib = NULL;
+    typedef int (*sqldropdbType)( SQLHDBC, SQLCHAR *, SQLINTEGER);
+    sqldropdbType sqldropdb;
+    cliLib = DLOPEN( LIBDB2, RTLD_LAZY );
+    sqldropdb = (sqldropdbType) DLSYM( cliLib, "SQLDropDb" );
+  #endif
+#else
+  #ifdef _WIN32
+    HINSTANCE cliLib = NULL;
+    FARPROC sqldropdb;
+    cliLib = DLOPEN( LIBDB2 );
+    sqldropdb =  DLSYM( cliLib, "SQLDropDbW" );
+  #elif _AIX
+    void *cliLib = NULL;
+    typedef int (*sqldropdbType)( SQLHDBC, SQLWCHAR *, SQLINTEGER);
+    sqldropdbType sqldropdb;
+  /* On AIX CLI library is in archive. Hence we will need to specify flags in DLOPEN to load a member of the archive*/
+    cliLib = DLOPEN( LIBDB2, RTLD_MEMBER | RTLD_LAZY );
+    sqldropdb = (sqldropdbType) DLSYM( cliLib, "SQLDropDbW" );
+  #else
+    void *cliLib = NULL;
+    typedef int (*sqldropdbType)( SQLHDBC, SQLWCHAR *, SQLINTEGER);
+    sqldropdbType sqldropdb;
+    cliLib = DLOPEN( LIBDB2, RTLD_LAZY );
+    sqldropdb = (sqldropdbType) DLSYM( cliLib, "SQLDropDbW" );
+  #endif
+#endif
+
+  rc = (*sqldropdb)( (SQLHSTMT) data->conn_res->hdbc, data->dbName, (SQLINTEGER)data->dbName_string_len );
+
+  DLCLOSE( cliLib );
+  return rc;
+}
+
 /*
    This function calls SQLPrepare cli call to prepare the given statement
 */

data/ext/ruby_ibm_db_cli.h

@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   |  Licensed Materials - Property of IBM                                |
   |                                                                      |
-  | (C) Copyright IBM Corporation 2009, 2010                             |
+  | (C) Copyright IBM Corporation 2009, 2010, 2012                       |
   +----------------------------------------------------------------------+
   | Authors: Praveen Devarao                                             |
   +----------------------------------------------------------------------+
@@ -11,6 +11,35 @@
 #ifndef RUBY_IBM_DB_CLI_H
 #define RUBY_IBM_DB_CLI_H
 
+#ifdef _WIN32
+#include <windows.h>
+#else
+#include <dlfcn.h>
+#endif
+
+#ifdef _WIN32
+#define DLOPEN LoadLibrary
+#define DLSYM GetProcAddress
+#define DLCLOSE FreeLibrary
+#define LIBDB2 "db2cli.dll"
+#elif _AIX
+#define DLOPEN dlopen
+#define DLSYM dlsym
+#define DLCLOSE dlclose
+#ifdef __64BIT__
+/*64-bit library in the archive libdb2.a*/
+#define LIBDB2 "libdb2.a(shr_64.o)"
+#else
+/*32-bit library in the archive libdb2.a*/
+#define LIBDB2 "libdb2.a(shr.o)"
+#endif
+#else
+#define DLOPEN dlopen
+#define DLSYM dlsym
+#define DLCLOSE dlclose
+#define LIBDB2 "libdb2.so.1"
+#endif
+
 #include <ruby.h>
 #include <stdio.h>
 #include <string.h>
@@ -54,6 +83,8 @@ typedef struct _conn_handle_struct {
   SQLPOINTER   ruby_error_state;
   SQLSMALLINT  ruby_error_msg_len;
 
+  SQLINTEGER   sqlcode;
+
 } conn_handle;
 
 typedef union {
@@ -114,6 +145,7 @@ typedef struct _stmt_handle_struct {
   SQLPOINTER   ruby_stmt_err_msg;
   SQLPOINTER   ruby_stmt_err_state;
   SQLSMALLINT  ruby_stmt_err_msg_len;
+  SQLINTEGER   sqlcode;
 } stmt_handle;
 
 /* 
@@ -211,6 +243,25 @@ typedef struct _ibm_db_exec_direct_args_struct {
   long          stmt_string_len;
 } exec_cum_prepare_args;
 
+/* 
+    Structure holding the necessary info to be passed to SQLCreateDB and SQLDropDB CLI call
+*/
+typedef struct _ibm_db_create_drop_db_args_struct {
+  conn_handle   *conn_res;
+#ifdef UNICODE_SUPPORT_VERSION
+  SQLWCHAR      *dbName;
+  SQLWCHAR      *codeSet;
+  SQLWCHAR      *mode;
+#else
+  SQLCHAR       *dbName;
+  SQLCHAR       *codeSet;
+  SQLCHAR       *mode;
+#endif
+  long          dbName_string_len;
+  long          codeSet_string_len;
+  long          mode_string_len;
+} create_drop_db_args;
+
 /* 
     Structure holding the necessary info to be passed to SQLParamData and SQLPutData CLI call
 */
@@ -427,5 +478,7 @@ int _ruby_ibm_db_SQLGetConnectAttr_helper(get_handle_attr_args *data);
 int _ruby_ibm_db_SQLBindFileToParam_helper(stmt_handle *stmt_res, param_node *curr);
 int _ruby_ibm_db_SQLBindParameter_helper(bind_parameter_args *data);
 void _ruby_ibm_db_Statement_level_UBF(stmt_handle *stmt_res);
+int _ruby_ibm_db_SQLCreateDB_helper(create_drop_db_args *data);
+int _ruby_ibm_db_SQLDropDB_helper(create_drop_db_args *data);
 
 #endif  /* RUBY_IBM_DB_CLI_H */

data/lib/active_record/connection_adapters/ibm_db_adapter.rb

@@ -117,24 +117,31 @@ module ActiveRecord
       # Flag to decide if quoted literal replcement should take place. By default it is ON. Set it to OFF if using Pstmt
       set_quoted_literal_replacement = IBM_DB::QUOTED_LITERAL_REPLACEMENT_ON
 
-      # Retrieves the database alias (local catalog name) or remote name
-      # (for remote TCP/IP connections) from the +config+ hash
-      # or raises ArgumentError in case of failure.
-      if config.has_key?(:database)
-        database = config[:database].to_s
-      else
-        raise ArgumentError, "Missing argument: a database name needs to be specified."
-      end
-
       # Retrieves database user credentials from the +config+ hash
       # or raises ArgumentError in case of failure.
       if !config.has_key?(:username) || !config.has_key?(:password)
         raise ArgumentError, "Missing argument(s): Username/Password for #{config[:database]} is not specified"
       else
+        if(config[:username].to_s.nil? || config[:password].to_s.nil?)
+          raise ArgumentError, "Username/Password cannot be nil"
+        end
         username = config[:username].to_s
         password = config[:password].to_s
       end
 
+      if(config.has_key?(:dbops) && config[:dbops] == true)
+        return ConnectionAdapters::IBM_DBAdapter.new(nil, logger, config, {})
+      end
+
+      # Retrieves the database alias (local catalog name) or remote name
+      # (for remote TCP/IP connections) from the +config+ hash
+      # or raises ArgumentError in case of failure.
+      if config.has_key?(:database)
+        database = config[:database].to_s
+      else
+        raise ArgumentError, "Missing argument: a database name needs to be specified."
+      end
+
       # Providing default schema (username) when not specified
       config[:schema] = config.has_key?(:schema) ? config[:schema].to_s : config[:username].to_s
 
@@ -232,8 +239,6 @@ module ActiveRecord
             :binary
           when /smallint/i
             :boolean
-          when /bigint/i
-            :bigint
           when /int|serial/i
             :integer
           when /decimal|numeric|decfloat/i
@@ -652,6 +657,10 @@ module ActiveRecord
       # It connects to the database with the initially provided credentials
       def connect
         # If the type of connection is net based
+        if(@username.nil? || @password.nil?)
+          raise ArgumentError, "Username/Password cannot be nil"
+        end
+
         begin
           if @host
             @conn_string = "DRIVER={IBM DB2 ODBC DRIVER};\
@@ -694,6 +703,7 @@ module ActiveRecord
         # * true if succesfull
         # * false if the connection is already closed
         # * nil if an error is raised
+        return nil if @connection.nil? || @connection == false
         IBM_DB.close(@connection) rescue nil
       end
 
@@ -1387,6 +1397,63 @@ module ActiveRecord
         }
       end
 
+      def build_conn_str_for_dbops()
+        connect_str = "DRIVER={IBM DB2 ODBC DRIVER};ATTACH=true;"
+        if(!@host.nil?)
+          connect_str << "HOSTNAME=#{@host};"
+          connect_str << "PORT=#{@port};"
+          connect_str << "PROTOCOL=TCPIP;"
+        end
+        connect_str << "UID=#{@username};PWD=#{@password};"
+        return connect_str
+      end
+
+      def drop_database(dbName)
+        connect_str = build_conn_str_for_dbops()
+
+        #Ensure connection is closed before trying to drop a database. 
+        #As a connect call would have been made by call seeing connection in active
+        disconnect!
+
+        begin
+          dropConn = IBM_DB.connect(connect_str, '', '')
+        rescue StandardError => connect_err
+          raise "Failed to connect to server due to: #{connect_err}"
+        end
+
+        if(IBM_DB.dropDB(dropConn,dbName))
+          IBM_DB.close(dropConn)
+          return true
+        else
+          error = IBM_DB.getErrormsg(dropConn, IBM_DB::DB_CONN)
+          IBM_DB.close(dropConn)
+          raise "Could not drop Database due to: #{error}"
+        end
+      end
+
+      def create_database(dbName, codeSet=nil, mode=nil)
+        connect_str = build_conn_str_for_dbops()
+
+        #Ensure connection is closed before trying to drop a database.
+        #As a connect call would have been made by call seeing connection in active
+        disconnect!
+
+        begin
+          createConn = IBM_DB.connect(connect_str, '', '')
+        rescue StandardError => connect_err
+          raise "Failed to connect to server due to: #{connect_err}"
+        end
+
+        if(IBM_DB.createDB(createConn,dbName,codeSet,mode))
+          IBM_DB.close(createConn)
+          return true
+        else
+          error = IBM_DB.getErrormsg(createConn, IBM_DB::DB_CONN)
+          IBM_DB.close(createConn)
+          raise "Could not create Database due to: #{error}"
+        end
+      end
+
       # IBM data servers do not support limits on certain data types (unlike MySQL)
       # Limit is supported for the {float, decimal, numeric, varchar, clob, blob, graphic, vargraphic} data types.
       def type_to_sql(type, limit = nil, precision = nil, scale = nil)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 2
   - 5
-  - 7
-  version: 2.5.7
+  - 9
+  version: 2.5.9
 platform: ruby
 authors: 
 - IBM
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-20 00:00:00 +05:30
+date: 2012-01-03 00:00:00 +05:30
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency