ibm_db 3.0.3 → 5.0.3

data/ext/extconf.rb

@@ -3,6 +3,7 @@ require 'net/http'
 require 'open-uri'
 require 'rubygems/package'
 require 'zlib'
+require 'zip'
 require 'fileutils'
 
 
@@ -42,6 +43,7 @@ module Kernel
 end
 
 DOWNLOADLINK = ''
+ZIP = false
 
 if(RUBY_PLATFORM =~ /aix/i)
   #AIX
@@ -94,6 +96,15 @@ elsif (RUBY_PLATFORM =~ /darwin/i)
   else
         puts "Mac OS 32 bit not supported. Please use an x64 architecture."
   end
+elsif (RUBY_PLATFORM =~ /mswin/ || RUBY_PLATFORM =~ /mingw/)
+  ZIP = true
+  if(is64Bit)
+    puts "Detected platform - windows 64"
+    DOWNLOADLINK= "http://public.dhe.ibm.com/ibmdl/export/pub/software/data/db2/drivers/odbc_cli/ntx64_odbc_cli.zip"
+  else
+    puts "Detected platform - windows 32"
+    DOWNLOADLINK= "http://public.dhe.ibm.com/ibmdl/export/pub/software/data/db2/drivers/odbc_cli/nt32_odbc_cli.zip"
+  end
 end
 
 def downloadCLIPackage(destination, link = nil)
@@ -104,7 +115,11 @@ def downloadCLIPackage(destination, link = nil)
   end
 
   uri = URI.parse(downloadLink)
-  filename = "#{destination}/clidriver.tar.gz"
+  if ZIP
+    filename = "#{destination}/clidriver.zip"
+  else
+    filename = "#{destination}/clidriver.tar.gz"
+  end
 
   headers = {
     'Accept-Encoding' => 'identity',
@@ -121,6 +136,18 @@ def downloadCLIPackage(destination, link = nil)
   filename
 end
 
+def extract_zip(file, destination)
+  FileUtils.mkdir_p(destination)
+
+  Zip::File.open(file) do |zip_file|
+    zip_file.each do |f|
+      fpath = File.join(destination, f.name)
+      FileUtils.mkdir_p(File.dirname(fpath))
+      zip_file.extract(f, fpath) unless File.exist?(fpath)
+    end
+  end
+end
+
 def untarCLIPackage(archive,destination)
   Gem::Package::TarReader.new( Zlib::GzipReader.open(archive) ) do |tar|
     tar.each do |entry|
@@ -157,8 +184,12 @@ if(IBM_DB_HOME == nil || IBM_DB_HOME == '')
 		puts "Environment variable IBM_DB_HOME is not set. Downloading and setting up the DB2 client driver\n"
 		destination = "#{File.expand_path(File.dirname(File.dirname(__FILE__)))}/../lib"
 	
-		archive = downloadCLIPackage(destination)
-		untarCLIPackage(archive,destination)
+    archive = downloadCLIPackage(destination)
+    if (ZIP)
+      extract_zip(archive, destination)
+    else 
+      untarCLIPackage(archive,destination)
+    end
 	
 		IBM_DB_HOME="#{destination}/clidriver"
 	

data/ext/gil_release_version

@@ -0,0 +1,3 @@
+#ifndef GIL_RELEASE_VERSION
+#define GIL_RELEASE_VERSION
+#endif

data/ext/ibm_db.c

@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   |  Licensed Materials - Property of IBM                                |
   |                                                                      |
-  | (C) Copyright IBM Corporation 2006 - 2016                            |
+  | (C) Copyright IBM Corporation 2006 - 2017                            |
   +----------------------------------------------------------------------+
   | Authors: Sushant Koduru, Lynh Nguyen, Kanchana Padmanabhan,          |
   |          Dan Scott, Helmut Tessarek, Sam Ruby, Kellen Bombardier,    |
@@ -12,7 +12,7 @@
   +----------------------------------------------------------------------+
 */
 
-#define MODULE_RELEASE "3.0.3"
+#define MODULE_RELEASE "3.0.5"
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -687,10 +687,9 @@ static void _ruby_ibm_db_mark_stmt_struct(stmt_handle *handle)
 
 VALUE ibm_Ruby_Thread_Call(rb_blocking_function_t *func, void *data1, rb_unblock_function_t *ubf, void *data2)
 {
-	#ifdef RUBY_API_VERSION_MAJOR 
+	#ifdef RUBY_API_VERSION_MAJOR	
 		if( RUBY_API_VERSION_MAJOR >=2 && RUBY_API_VERSION_MINOR >=2) 
-		{
-			
+		{	
 			#ifdef _WIN32
 				void *(*f)(void*) = (void *(*)(void*))func;
 				return (VALUE)rb_thread_call_without_gvl(f, data1, ubf, data2);
@@ -698,7 +697,7 @@ VALUE ibm_Ruby_Thread_Call(rb_blocking_function_t *func, void *data1, rb_unblock
 				return rb_thread_call_without_gvl(func, data1, ubf, data2);                	   
 			#else
 				rb_thread_call_without_gvl(func, data1, ubf, data2);
-	#endif	
+	                #endif	
 		}		
 		else	
 		{
@@ -706,7 +705,7 @@ VALUE ibm_Ruby_Thread_Call(rb_blocking_function_t *func, void *data1, rb_unblock
 		}
 	#else
 		rb_thread_call_without_gvl(func, data1, ubf, data2);
-	#endif	
+	#endif
   }
   
 
@@ -739,7 +738,7 @@ static void _ruby_ibm_db_free_stmt_handle_and_resources(stmt_handle *handle)
 
 /*  static _ruby_ibm_db_free_stmt_struct */
 static void _ruby_ibm_db_free_stmt_struct(stmt_handle *handle)
-{		
+{ 
   if ( handle != NULL ) {
     _ruby_ibm_db_free_stmt_handle_and_resources( handle );
     ruby_xfree( handle );
@@ -1027,7 +1026,7 @@ static void _ruby_ibm_db_check_sql_errors( void *conn_or_stmt, int resourceType,
 
     #ifdef UNICODE_SUPPORT_VERSION      
 	  ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_SQLGetDiagRec_helper, get_DiagRec_args,
-                                (void *)_ruby_ibm_db_Connection_level_UBF, NULL);
+                                RUBY_UBF_IO, NULL);
 	  return_code  =get_DiagRec_args->return_code; 						
     #else
       return_code  =  _ruby_ibm_db_SQLGetDiagRec_helper( get_DiagRec_args );
@@ -2002,7 +2001,6 @@ static void _ruby_ibm_db_clear_stmt_err_cache()
 /*  static VALUE _ruby_ibm_db_connect_helper2( connect_helper_args *data )
 */
 static VALUE _ruby_ibm_db_connect_helper2( connect_helper_args *data ) {
-
   SQLINTEGER conn_alive;
   SQLINTEGER enable_numeric_literals = 1; /* Enable CLI numeric literals */
 
@@ -2527,8 +2525,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 UNICODE_SUPPORT_VERSION
-	
-	ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_connect_helper2, helper_args, (void *)_ruby_ibm_db_Connection_level_UBF, NULL);	
+	ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_connect_helper2, helper_args, RUBY_UBF_IO, NULL);	
 	
 				
     conn_res = helper_args->conn_res;
@@ -2555,9 +2552,9 @@ static VALUE _ruby_ibm_db_connect_helper( int argc, VALUE *argv, int isPersisten
 			return_value = Data_Wrap_Struct(le_conn_struct, _ruby_ibm_db_mark_conn_struct, _ruby_ibm_db_free_conn_struct, conn_res);
 		}		
 	}			 
-  #else
+ #else
     return_value = _ruby_ibm_db_connect_helper2( helper_args );
-  #endif
+ #endif
   /* Free the memory allocated */
   if(conn_args != NULL) {
     /* Memory to structure elements of helper_args is not allocated explicitly hence it is automatically freed by Ruby.
@@ -2826,10 +2823,8 @@ static void _ruby_ibm_db_clear_conn_err_cache()
  * 
  */
 VALUE ibm_db_connect(int argc, VALUE *argv, VALUE self)
-{
-	
+{	
   _ruby_ibm_db_clear_conn_err_cache();
-
   return _ruby_ibm_db_connect_helper( argc, argv, 0 );
 }
 /*  */
@@ -2975,7 +2970,7 @@ VALUE ruby_ibm_db_createDb_helper(VALUE connection, VALUE dbName, VALUE codeSet,
 
 #ifdef UNICODE_SUPPORT_VERSION        
 		ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_SQLCreateDB_helper, create_db_args,
-                       (void *)_ruby_ibm_db_Connection_level_UBF, NULL );
+                       RUBY_UBF_IO, NULL );
 		rc = create_db_args->rc;
 #else
         rc = _ruby_ibm_db_SQLCreateDB_helper( create_db_args );
@@ -3105,7 +3100,7 @@ VALUE ruby_ibm_db_dropDb_helper(VALUE connection, VALUE dbName) {
 
 #ifdef UNICODE_SUPPORT_VERSION        
 		ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_SQLDropDB_helper, drop_db_args,
-                       (void *)_ruby_ibm_db_Connection_level_UBF, NULL );
+                       RUBY_UBF_IO, NULL );
 		rc = drop_db_args->rc;
 #else
         rc = _ruby_ibm_db_SQLDropDB_helper( drop_db_args );
@@ -3460,10 +3455,9 @@ VALUE ibm_db_bind_param_helper(int argc, char * varname, long varname_len ,long
     /* if argc == 3, then the default value for param_type will be used */
     case 3:
       param_type = SQL_PARAM_INPUT;
-
-      #ifdef UNICODE_SUPPORT_VERSION        
-	  
-		ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_SQLDescribeParam_helper, data,
+      
+      #ifdef UNICODE_SUPPORT_VERSIO
+               	ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_SQLDescribeParam_helper, data,
                          (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res);
 		rc = data->rc;
       #else
@@ -3482,10 +3476,9 @@ VALUE ibm_db_bind_param_helper(int argc, char * varname, long varname_len ,long
       break;
 
     case 4:
-
-      #ifdef UNICODE_SUPPORT_VERSION        
+      #ifdef UNICODE_SUPPORT_VERSION 
 		ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_SQLDescribeParam_helper, data,
-                       (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res);
+                       (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
 		rc = data->rc;
       #else
         rc = _ruby_ibm_db_SQLDescribeParam_helper( data );
@@ -3503,8 +3496,7 @@ VALUE ibm_db_bind_param_helper(int argc, char * varname, long varname_len ,long
       break;
 
     case 5:
-
-      #ifdef UNICODE_SUPPORT_VERSION        
+      #ifdef UNICODE_SUPPORT_VERSION
 		ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_SQLDescribeParam_helper, data,
                        (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
 		rc = data->rc;
@@ -3525,10 +3517,9 @@ VALUE ibm_db_bind_param_helper(int argc, char * varname, long varname_len ,long
       break;
 
     case 6:
-
-      #ifdef UNICODE_SUPPORT_VERSION        
-		ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_SQLDescribeParam_helper, data,
-                       (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
+      #ifdef UNICODE_SUPPORT_VERSION
+                ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_SQLDescribeParam_helper, data,
+                        (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
 		rc = data->rc;
       #else
         rc = _ruby_ibm_db_SQLDescribeParam_helper( data );
@@ -3763,7 +3754,7 @@ VALUE ibm_db_close(int argc, VALUE *argv, VALUE self)
 
         #ifdef UNICODE_SUPPORT_VERSION          
 		  ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_SQLEndTran, end_X_args,
-                         (void *)_ruby_ibm_db_Connection_level_UBF, NULL);
+                         RUBY_UBF_IO, NULL);
 		  rc = end_X_args->rc;
         #else
           rc = _ruby_ibm_db_SQLEndTran( end_X_args );
@@ -3782,7 +3773,7 @@ VALUE ibm_db_close(int argc, VALUE *argv, VALUE self)
 
       #ifdef UNICODE_SUPPORT_VERSION
 	    rc = ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_SQLDisconnect_helper, &(conn_res->hdbc),
-                       (void *)_ruby_ibm_db_Connection_level_UBF, NULL);		
+                       RUBY_UBF_IO, NULL);		
       #else
 		rc = _ruby_ibm_db_SQLDisconnect_helper( &(conn_res->hdbc) );        
       #endif
@@ -3956,10 +3947,9 @@ VALUE ibm_db_column_privileges(int argc, VALUE *argv, VALUE self)
 #endif
           }
           col_privileges_args->stmt_res  =  stmt_res;
-
-          #ifdef UNICODE_SUPPORT_VERSION            
+          #ifdef UNICODE_SUPPORT_VERSION			 
 			ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_SQLColumnPrivileges_helper, col_privileges_args,
-                           (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
+                            (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
 			rc = col_privileges_args->rc;
           #else
             rc = _ruby_ibm_db_SQLColumnPrivileges_helper( col_privileges_args );
@@ -4137,8 +4127,8 @@ VALUE ibm_db_columns(int argc, VALUE *argv, VALUE self)
         }
         col_metadata_args->stmt_res  =  stmt_res;
 
-        #ifdef UNICODE_SUPPORT_VERSION          
-		  ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_SQLColumns_helper, col_metadata_args,
+        #ifdef UNICODE_SUPPORT_VERSION
+                 ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_SQLColumns_helper, col_metadata_args,
                          (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
 		  rc = col_metadata_args->rc;
         #else
@@ -4309,8 +4299,8 @@ VALUE ibm_db_foreign_keys(int argc, VALUE *argv, VALUE self)
 
         col_metadata_args->stmt_res  =  stmt_res;
 
-        #ifdef UNICODE_SUPPORT_VERSION          
-		  ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_SQLForeignKeys_helper, col_metadata_args,
+        #ifdef UNICODE_SUPPORT_VERSION
+  		  ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_SQLForeignKeys_helper, col_metadata_args,
                          (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
 		  rc = col_metadata_args->rc;
         #else
@@ -4465,8 +4455,8 @@ VALUE ibm_db_primary_keys(int argc, VALUE *argv, VALUE self)
         }
         col_metadata_args->stmt_res  =  stmt_res;
 
-        #ifdef UNICODE_SUPPORT_VERSION          
-		  ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_SQLPrimaryKeys_helper, col_metadata_args,
+        #ifdef UNICODE_SUPPORT_VERSION      
+  		  ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_SQLPrimaryKeys_helper, col_metadata_args,
                          (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
 		  rc = col_metadata_args->rc;
         #else
@@ -4656,9 +4646,9 @@ VALUE ibm_db_procedure_columns(int argc, VALUE *argv, VALUE self)
         }
         col_metadata_args->stmt_res  =  stmt_res;
 
-        #ifdef UNICODE_SUPPORT_VERSION          
-		  ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_SQLProcedureColumns_helper, col_metadata_args,
-                         (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res);
+        #ifdef UNICODE_SUPPORT_VERSION         
+  		  ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_SQLProcedureColumns_helper, col_metadata_args,
+                        (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
 		  rc = col_metadata_args->rc;
         #else
           rc = _ruby_ibm_db_SQLProcedureColumns_helper( col_metadata_args );
@@ -4813,8 +4803,8 @@ VALUE ibm_db_procedures(int argc, VALUE *argv, VALUE self)
         }
         proc_metadata_args->stmt_res     =  stmt_res;
 
-        #ifdef UNICODE_SUPPORT_VERSION          
-		  ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_SQLProcedures_helper, proc_metadata_args,
+        #ifdef UNICODE_SUPPORT_VERSION
+                  ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_SQLProcedures_helper, proc_metadata_args,
                          (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res);
 		  rc = proc_metadata_args->rc;
         #else
@@ -4990,9 +4980,9 @@ VALUE ibm_db_special_columns(int argc, VALUE *argv, VALUE self)
         }
         col_metadata_args->stmt_res       =  stmt_res;
 
-        #ifdef UNICODE_SUPPORT_VERSION          
-		  ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_SQLSpecialColumns_helper, col_metadata_args,
-                         (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res);
+        #ifdef UNICODE_SUPPORT_VERSION   
+                  ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_SQLSpecialColumns_helper, col_metadata_args,
+                          (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
 		  rc = col_metadata_args->rc;				 
         #else
           rc = _ruby_ibm_db_SQLSpecialColumns_helper( col_metadata_args );
@@ -5186,9 +5176,9 @@ VALUE ibm_db_statistics(int argc, VALUE *argv, VALUE self)
         }
         col_metadata_args->stmt_res      =  stmt_res;
 
-        #ifdef UNICODE_SUPPORT_VERSION          
+        #ifdef UNICODE_SUPPORT_VERSION         	
 		  ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_SQLStatistics_helper, col_metadata_args,
-                         (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
+                          (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
 		   rc = col_metadata_args->rc;
         #else
           rc = _ruby_ibm_db_SQLStatistics_helper( col_metadata_args );
@@ -5345,9 +5335,9 @@ VALUE ibm_db_table_privileges(int argc, VALUE *argv, VALUE self)
 
         table_privileges_args->stmt_res       =  stmt_res;
 
-        #ifdef UNICODE_SUPPORT_VERSION          
-		  ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_SQLTablePrivileges_helper, table_privileges_args,
-                         (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
+        #ifdef UNICODE_SUPPORT_VERSION      
+ 		  ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_SQLTablePrivileges_helper, table_privileges_args,
+                          (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
 		  rc = table_privileges_args->rc;
         #else
           rc = _ruby_ibm_db_SQLTablePrivileges_helper( table_privileges_args );
@@ -5519,8 +5509,8 @@ VALUE ibm_db_tables(int argc, VALUE *argv, VALUE self)
 
         table_metadata_args->stmt_res      =  stmt_res;
 
-        #ifdef UNICODE_SUPPORT_VERSION          
-		  ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_SQLTables_helper, table_metadata_args,
+        #ifdef UNICODE_SUPPORT_VERSION   
+                  ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_SQLTables_helper, table_metadata_args,
                          (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
 		  rc = table_metadata_args->rc;
         #else
@@ -5603,7 +5593,7 @@ VALUE ibm_db_commit(int argc, VALUE *argv, VALUE self)
 
     #ifdef UNICODE_SUPPORT_VERSION      
 	  ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_SQLEndTran, end_X_args,
-                     (void *)_ruby_ibm_db_Connection_level_UBF, NULL);
+                     RUBY_UBF_IO, NULL);
 	  rc = end_X_args->rc;
     #else
       rc = _ruby_ibm_db_SQLEndTran( end_X_args );
@@ -5681,9 +5671,9 @@ 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 UNICODE_SUPPORT_VERSION      
-	  ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_SQLPrepare_helper, prepare_args,
-                     (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
+    #ifdef UNICODE_SUPPORT_VERSION     
+          ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_SQLPrepare_helper, prepare_args,
+                      (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
 	  rc = prepare_args->rc;
     #else
       rc = _ruby_ibm_db_SQLPrepare_helper( prepare_args );
@@ -5823,9 +5813,9 @@ VALUE ibm_db_exec(int argc, VALUE *argv, VALUE self)
       exec_direct_args->stmt_res    =  stmt_res;
 
 	  
-      #ifdef UNICODE_SUPPORT_VERSION        
-		ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_SQLExecDirect_helper, exec_direct_args,
-                       (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
+      #ifdef UNICODE_SUPPORT_VERSION     
+ 		ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_SQLExecDirect_helper, exec_direct_args,
+                        (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
 		rc = exec_direct_args->rc;
       #else
         rc = _ruby_ibm_db_SQLExecDirect_helper( exec_direct_args );
@@ -5897,8 +5887,8 @@ VALUE ibm_db_free_result(int argc, VALUE *argv, VALUE self)
       freeStmt_args->stmt_res  =  stmt_res;
       freeStmt_args->option    =  SQL_CLOSE;
 
-      #ifdef UNICODE_SUPPORT_VERSION        
-		ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_SQLFreeStmt_helper, freeStmt_args, 
+      #ifdef UNICODE_SUPPORT_VERSION       
+  		ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_SQLFreeStmt_helper, freeStmt_args, 
                        (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
 		rc = freeStmt_args->rc;
       #else
@@ -7015,9 +7005,9 @@ VALUE ibm_db_execute(int argc, VALUE *argv, VALUE self)
     bind_array->num               =  0;
     bind_array->error             =  &error;
 
-    #ifdef UNICODE_SUPPORT_VERSION      
-	  ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_execute_helper, bind_array,
-                            (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
+    #ifdef UNICODE_SUPPORT_VERSION     
+  	  ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_execute_helper, bind_array,
+                            RUBY_UBF_IO, NULL );
 	  ret_value = bind_array->return_value;
     #else
       ret_value = _ruby_ibm_db_execute_helper( bind_array );
@@ -7801,9 +7791,9 @@ VALUE ibm_db_next_result(int argc, VALUE *argv, VALUE self)
       nextresultparams->stmt_res  =  stmt_res;
       nextresultparams->new_hstmt =  &new_hstmt;
 
-      #ifdef UNICODE_SUPPORT_VERSION        
-		ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_SQLNextResult_helper, nextresultparams,
-                       (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
+      #ifdef UNICODE_SUPPORT_VERSION       
+  		ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_SQLNextResult_helper, nextresultparams,
+                        (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
 		rc = nextresultparams->rc;
       #else
         rc = _ruby_ibm_db_SQLNextResult_helper( nextresultparams );
@@ -7903,8 +7893,8 @@ VALUE ibm_db_num_fields(int argc, VALUE *argv, VALUE self)
     result_cols_args->count     =  0;
 
     #ifdef UNICODE_SUPPORT_VERSION      
-	  ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_SQLNumResultCols_helper, result_cols_args,
-                     (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
+  	  ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_SQLNumResultCols_helper, result_cols_args,
+                      (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
 	  rc = result_cols_args->rc;
     #else
       rc = _ruby_ibm_db_SQLNumResultCols_helper( result_cols_args );
@@ -7995,9 +7985,9 @@ VALUE ibm_db_num_rows(int argc, VALUE *argv, VALUE self)
     row_count_args->stmt_res  =  stmt_res;
     row_count_args->count     =  0;
 
-    #ifdef UNICODE_SUPPORT_VERSION      
-	  ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_SQLRowCount_helper, row_count_args,
-                     (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
+    #ifdef UNICODE_SUPPORT_VERSION
+          ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_SQLRowCount_helper, row_count_args,
+                      RUBY_UBF_IO, NULL );
 	  rc = row_count_args->rc;
     #else
       rc = _ruby_ibm_db_SQLRowCount_helper( row_count_args );
@@ -8053,8 +8043,8 @@ static int _ruby_ibm_db_get_column_by_name(stmt_handle *stmt_res, VALUE column,
     if ( release_gil == 1 ) {
 
       #ifdef UNICODE_SUPPORT_VERSION        
-		ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_get_result_set_info, stmt_res,
-                      (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
+        	ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_get_result_set_info, stmt_res,
+                       (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
 		rc = stmt_res->rc;
       #else
         rc = _ruby_ibm_db_get_result_set_info( stmt_res );
@@ -8216,9 +8206,9 @@ 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 UNICODE_SUPPORT_VERSION      
-	  ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_SQLColAttributes_helper, colattr_args,
-                     (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
+    #ifdef UNICODE_SUPPORT_VERSION
+  	  ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_SQLColAttributes_helper, colattr_args,
+                      (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
 	  rc = colattr_args->rc;
     #else
       rc = _ruby_ibm_db_SQLColAttributes_helper( colattr_args );
@@ -8537,9 +8527,9 @@ VALUE ibm_db_field_width(int argc, VALUE *argv, VALUE self)
     colattr_args->col_num          =  col+1;
     colattr_args->FieldIdentifier  =  SQL_DESC_LENGTH;
 
-    #ifdef UNICODE_SUPPORT_VERSION      
+    #ifdef UNICODE_SUPPORT_VERSION     
 	  ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_SQLColAttributes_helper, colattr_args,
-                     (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
+                      (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res);
 	  rc = colattr_args->rc;
     #else
       rc = _ruby_ibm_db_SQLColAttributes_helper( colattr_args );
@@ -8641,7 +8631,7 @@ VALUE ibm_db_rollback(int argc, VALUE *argv, VALUE self)
     end_X_args->completionType  =  SQL_ROLLBACK;    /*Remeber you are Rollingback the transaction*/
     #ifdef UNICODE_SUPPORT_VERSION
 	  ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_SQLEndTran, end_X_args,
-                     (void *)_ruby_ibm_db_Connection_level_UBF, NULL);
+                     RUBY_UBF_IO, NULL);
 	  rc = end_X_args->rc;
     #else
       rc = _ruby_ibm_db_SQLEndTran( end_X_args );
@@ -9262,8 +9252,8 @@ VALUE ibm_db_result(int argc, VALUE *argv, VALUE self)
     Data_Get_Struct(stmt, stmt_handle, result_args->stmt_res);
 
     #ifdef UNICODE_SUPPORT_VERSION      
-	  ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_result_helper, result_args,
-                          (void *)_ruby_ibm_db_Statement_level_UBF, result_args->stmt_res );
+  	  ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_result_helper, result_args,
+                           (void *)_ruby_ibm_db_Statement_level_UBF, result_args->stmt_res );
 	  ret_val = result_args->return_value;
     #else
       ret_val = _ruby_ibm_db_result_helper( result_args );
@@ -9600,7 +9590,7 @@ static VALUE _ruby_ibm_db_bind_fetch_helper(ibm_db_fetch_helper_args *data)
            return Qnil; 
           }
 
-          strcpy(tmpStr, "BigDecimal.new(\'");
+          strcpy(tmpStr, "BigDecimal(\'");
           strcat(tmpStr, row_data->str_val);
           strcat(tmpStr, "\')");
 
@@ -10082,9 +10072,9 @@ VALUE ibm_db_fetch_row(int argc, VALUE *argv, VALUE self)
   helper_args->arg_count   =  argc;
   helper_args->error       =  &error;
 
-  #ifdef UNICODE_SUPPORT_VERSION    
+  #ifdef UNICODE_SUPPORT_VERSION
 	ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_fetch_row_helper, helper_args,
-                        (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
+                        RUBY_UBF_IO, NULL );
 	ret_val = helper_args->return_value;
   #else
     ret_val = _ruby_ibm_db_fetch_row_helper( helper_args );
@@ -10251,9 +10241,9 @@ VALUE ibm_db_fetch_assoc(int argc, VALUE *argv, VALUE self) {
   helper_args->error      =  &error;
   helper_args->funcType   =  FETCH_ASSOC;
 
-  #ifdef UNICODE_SUPPORT_VERSION    
-	ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_bind_fetch_helper, helper_args,
-                        (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
+  #ifdef UNICODE_SUPPORT_VERSION  
+  	ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_bind_fetch_helper, helper_args,
+                         RUBY_UBF_IO, NULL );
 	ret_val = helper_args->return_value;
 						
   #else
@@ -10340,9 +10330,9 @@ VALUE ibm_db_fetch_object(int argc, VALUE *argv, VALUE self)
   helper_args->error      =  &error;
   helper_args->funcType   =  FETCH_ASSOC;
 
-  #ifdef UNICODE_SUPPORT_VERSION    
+  #ifdef UNICODE_SUPPORT_VERSION   
 	ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_bind_fetch_helper, helper_args,
-                              (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
+                                (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
 	row_res->hash = helper_args->return_value;
   #else
     row_res->hash = _ruby_ibm_db_bind_fetch_helper( helper_args );
@@ -10422,15 +10412,16 @@ VALUE ibm_db_fetch_array(int argc, VALUE *argv, VALUE self)
   helper_args->arg_count   =  argc;
   helper_args->error       =  &error;
   helper_args->funcType    =  FETCH_INDEX;
-
-  #ifdef UNICODE_SUPPORT_VERSION    
-	ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_bind_fetch_helper, helper_args,
-                        (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
-    ret_val = helper_args->return_value;
-						
-  #else
-    ret_val = _ruby_ibm_db_bind_fetch_helper( helper_args );
-  #endif
+  //Call without thread API to avoid the Thread lock.
+  ret_val = _ruby_ibm_db_bind_fetch_helper( helper_args );
+  //#ifdef UNICODE_SUPPORT_VERSION
+  	//ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_bind_fetch_helper, helper_args,
+          //               RUBY_UBF_IO, NULL );
+    //ret_val = helper_args->return_value;
+  					
+  //#else
+    //ret_val = _ruby_ibm_db_bind_fetch_helper( helper_args );
+  //#endif
 
   /*Free Memory Allocated*/
   if ( helper_args != NULL) {
@@ -10501,9 +10492,9 @@ VALUE ibm_db_fetch_both(int argc, VALUE *argv, VALUE self)
   helper_args->error       =  &error;
   helper_args->funcType    =  FETCH_BOTH;
 
-  #ifdef UNICODE_SUPPORT_VERSION    
+  #ifdef UNICODE_SUPPORT_VERSIO 
 	 ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_bind_fetch_helper, helper_args,
-                        (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
+                        RUBY_UBF_IO, NULL  );
 	ret_val = helper_args->return_value;
   #else
     ret_val = _ruby_ibm_db_bind_fetch_helper( helper_args );
@@ -11269,8 +11260,9 @@ VALUE ibm_db_server_info(int argc, VALUE *argv, VALUE self)
     getInfo_args->infoValue    =  NULL;
     getInfo_args->buff_length  =  0;
     #ifdef UNICODE_SUPPORT_VERSION
-	  ibm_Ruby_Thread_Call ( (void *)ibm_db_server_info_helper, getInfo_args,
-                                 (void *)_ruby_ibm_db_Connection_level_UBF, NULL);
+    //	  Thread.current.report_on_exception = Qfalse;
+          ibm_Ruby_Thread_Call ( (void *)ibm_db_server_info_helper, getInfo_args,
+                                RUBY_UBF_IO, NULL);
 	  return_value  = getInfo_args->return_value;
     #else
       return_value = ibm_db_server_info_helper( getInfo_args );
@@ -11564,10 +11556,10 @@ VALUE ibm_db_client_info(int argc, VALUE *argv, VALUE self)
     getInfo_args->infoType     =  0;
     getInfo_args->infoValue    =  NULL;
     getInfo_args->buff_length  =  0;
-
+ // using the default unblock funtion RUBY_UBF_IO instead of defined unblock function
     #ifdef UNICODE_SUPPORT_VERSION      
 	  ibm_Ruby_Thread_Call ( (void *)ibm_db_client_info_helper, getInfo_args,
-                               (void *)_ruby_ibm_db_Connection_level_UBF, NULL);
+                               RUBY_UBF_IO, NULL);
 	  return_value = getInfo_args->return_value;
 							   
     #else
@@ -11882,3 +11874,6 @@ VALUE ibm_db_get_last_serial_value(int argc, VALUE *argv, VALUE self)
  * vim600: noet sw=4 ts=4 fdm=marker
  * vim<600: noet sw=4 ts=4
  */
+
+/*
+  +----------------------------------------------------------------------+*/