ibm_db 2.5.18 → 2.5.25

data/CHANGES

@@ -1,5 +1,9 @@
 Change Log
 ==============
+2015/03/24 (IBM_DB adapter 2.5.25, driver 2.5.25)
+  - Support for Rails 4.2.x
+  - Support for Ruby  2.2.x
+
 2014/08/03 (IBM_DB adapter 2.5.18, driver 2.5.14) :
   - Support for Rails 4.1.x
   - Enhanced installation to pull IBM Data Server Driver automatically if not present

data/README

@@ -1,5 +1,5 @@
 =====================================================================
-README for the IBM_DB Adapter (2.5.14) and Driver (2.5.14) (2014/02/11)
+README for the IBM_DB Adapter (2.5.25) and Driver (2.5.25) (2015/03/24)
 For ActiveRecord Version >= 1.15.5 (and Rails >= 1.2.5)
 =====================================================================
 

data/ext/extconf.rb

@@ -5,6 +5,7 @@ require 'rubygems/package'
 require 'zlib'
 require 'fileutils'
 
+
 # +----------------------------------------------------------------------+
 # |  Licensed Materials - Property of IBM                                |
 # |                                                                      |
@@ -227,16 +228,32 @@ step 3: - Retry gem install
 EOL
 end
 
+if(RUBY_VERSION =~ /2./)
+	require 'rbconfig'
+end
+
 alias :libpathflag0 :libpathflag
 def libpathflag(libpath)
-  ldflags =  case Config::CONFIG["arch"]
-    when /solaris2/
+if(RUBY_VERSION =~ /2./)
+  ldflags =  case RbConfig::CONFIG["arch"]
+  when /solaris2/
+      libpath[0..-2].map {|path| " -R#{path}"}.join
+    when /linux/
+      libpath[0..-2].map {|path| " -R#{path} "}.join
+    else
+      ""
+  end
+else
+	ldflags =  case Config::CONFIG["arch"]
+	when /solaris2/
       libpath[0..-2].map {|path| " -R#{path}"}.join
     when /linux/
       libpath[0..-2].map {|path| " -R#{path} "}.join
     else
       ""
   end
+end  
+    
   #libpathflag0 + " '-Wl,-R$$ORIGIN/clidriver/lib #{ldflags}' "
   libpathflag0 + " '-Wl,-R$$ORIGIN/clidriver/lib' "
 end

data/ext/ibm_db.c

@@ -2,17 +2,17 @@
   +----------------------------------------------------------------------+
   |  Licensed Materials - Property of IBM                                |
   |                                                                      |
-  | (C) Copyright IBM Corporation 2006, 2007,2008, 2009, 2010            |
+  | (C) Copyright IBM Corporation 2006 - 2015                            |
   +----------------------------------------------------------------------+
   | Authors: Sushant Koduru, Lynh Nguyen, Kanchana Padmanabhan,          |
   |          Dan Scott, Helmut Tessarek, Sam Ruby, Kellen Bombardier,    |
   |          Tony Cairns, Manas Dadarkar, Swetha Patel, Salvador Ledezma |
   |          Mario Ds Briggs, Praveen Devarao, Ambrish Bhargava,         |
-  |          Tarun Pasrija                                               |
+  |          Tarun Pasrija, Arvind Gupta                                 |
   +----------------------------------------------------------------------+
 */
 
-#define MODULE_RELEASE "2.5.14"
+#define MODULE_RELEASE "2.5.25"
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -28,6 +28,12 @@
 #include "ruby_ibm_db.h"
 #include <ctype.h>
 
+#ifdef RUBY_THREAD_H
+	#include <ruby/thread.h>
+#endif
+
+#include <ruby/version.h>
+
 /* True global resources - no need for thread safety here */
 static VALUE   le_conn_struct, le_stmt_struct, le_pconn_struct, le_row_struct;
 static VALUE   le_client_info, le_server_info;
@@ -105,6 +111,9 @@ static VALUE id_id2name;
 #define RUBY_FALIAS(alias, function) \
   rb_define_singleton_method(mDB, #alias, ibm_db_##function, -1);
 
+
+ 
+
 #ifdef UNICODE_SUPPORT_VERSION
   const int _check_i = 1;
   #define arch_is_bigendian() ( (*(char*)&_check_i) == 0 ) /* returns 0 if the machine is of little endian architecture, 1 if the machine is of bigendian architecture*/
@@ -672,6 +681,25 @@ static void _ruby_ibm_db_mark_stmt_struct(stmt_handle *handle)
 {
 }
 
+
+//VALUE ibm_Ruby_Thread_Call(void *(*func)(void *), void *data1, rb_unblock_function_t *ubf, void *data2)
+VALUE ibm_Ruby_Thread_Call(rb_blocking_function_t *func, void *data1, rb_unblock_function_t *ubf, void *data2)
+  {	
+#ifdef RUBY_API_VERSION_MAJOR 
+	if( RUBY_API_VERSION_MAJOR >=2 && RUBY_API_VERSION_MINOR >=2) 
+	{
+		rb_thread_call_without_gvl(func, data1, ubf, data2);
+	}
+	else	
+	{
+		return rb_thread_blocking_region(func, data1, ubf, data2);	
+	}
+#else 	
+		return rb_thread_blocking_region(func, data1, ubf, data2);	
+#endif	
+  }
+  
+
 /*  */
 
 /*  static _ruby_ibm_db_free_stmt_handle_and_resources */
@@ -988,7 +1016,8 @@ static void _ruby_ibm_db_check_sql_errors( void *conn_or_stmt, int resourceType,
   if( release_gil == 1 ){
 
     #ifdef UNICODE_SUPPORT_VERSION
-      return_code  =  rb_thread_blocking_region( (void *)_ruby_ibm_db_SQLGetDiagRec_helper, get_DiagRec_args,
+      //return_code  = rb_thread_call_without_gvl ( (void *)_ruby_ibm_db_SQLGetDiagRec_helper, get_DiagRec_args,
+	  return_code  = ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_SQLGetDiagRec_helper, get_DiagRec_args,
                                 (void *)_ruby_ibm_db_Connection_level_UBF, NULL);
     #else
       return_code  =  _ruby_ibm_db_SQLGetDiagRec_helper( get_DiagRec_args );
@@ -2501,7 +2530,8 @@ 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
-    return_value = rb_thread_blocking_region( (void *)_ruby_ibm_db_connect_helper2, helper_args,
+    //return_value = rb_thread_call_without_gvl ( (void *)_ruby_ibm_db_connect_helper2, helper_args,
+	return_value = ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_connect_helper2, helper_args,
                              (void *)_ruby_ibm_db_Connection_level_UBF, NULL);
   #else
     return_value = _ruby_ibm_db_connect_helper2( helper_args );
@@ -2919,7 +2949,8 @@ VALUE ruby_ibm_db_createDb_helper(VALUE connection, VALUE dbName, VALUE codeSet,
 	_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,
+        //rc = rb_thread_call_without_gvl ( (void *)_ruby_ibm_db_SQLCreateDB_helper, create_db_args,
+		rc = ibm_Ruby_Thread_Call ( (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 );
@@ -3048,7 +3079,8 @@ VALUE ruby_ibm_db_dropDb_helper(VALUE connection, VALUE dbName) {
 	_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,
+        //rc = rb_thread_call_without_gvl ( (void *)_ruby_ibm_db_SQLDropDB_helper, drop_db_args,
+		rc = ibm_Ruby_Thread_Call ( (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 );
@@ -3410,7 +3442,8 @@ VALUE ibm_db_bind_param_helper(int argc, char * varname, long varname_len ,long
       param_type = SQL_PARAM_INPUT;
 
       #ifdef UNICODE_SUPPORT_VERSION
-        rc  =  rb_thread_blocking_region( (void *)_ruby_ibm_db_SQLDescribeParam_helper, data,
+        //rc  = rb_thread_call_without_gvl ( (void *)_ruby_ibm_db_SQLDescribeParam_helper, data,
+		rc  = ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_SQLDescribeParam_helper, data,
                          (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res);
       #else
         rc  =  _ruby_ibm_db_SQLDescribeParam_helper( data );
@@ -3430,7 +3463,8 @@ VALUE ibm_db_bind_param_helper(int argc, char * varname, long varname_len ,long
     case 4:
 
       #ifdef UNICODE_SUPPORT_VERSION
-        rc = rb_thread_blocking_region( (void *)_ruby_ibm_db_SQLDescribeParam_helper, data,
+        //rc = rb_thread_call_without_gvl ( (void *)_ruby_ibm_db_SQLDescribeParam_helper, data,
+		rc = ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_SQLDescribeParam_helper, data,
                        (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res);
       #else
         rc = _ruby_ibm_db_SQLDescribeParam_helper( data );
@@ -3450,7 +3484,8 @@ VALUE ibm_db_bind_param_helper(int argc, char * varname, long varname_len ,long
     case 5:
 
       #ifdef UNICODE_SUPPORT_VERSION
-        rc = rb_thread_blocking_region( (void *)_ruby_ibm_db_SQLDescribeParam_helper, data,
+        //rc = rb_thread_call_without_gvl ( (void *)_ruby_ibm_db_SQLDescribeParam_helper, data,
+		rc = ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_SQLDescribeParam_helper, data,
                        (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
       #else
         rc = _ruby_ibm_db_SQLDescribeParam_helper( data );
@@ -3471,7 +3506,8 @@ VALUE ibm_db_bind_param_helper(int argc, char * varname, long varname_len ,long
     case 6:
 
       #ifdef UNICODE_SUPPORT_VERSION
-        rc = rb_thread_blocking_region( (void *)_ruby_ibm_db_SQLDescribeParam_helper, data,
+        //rc = rb_thread_call_without_gvl ( (void *)_ruby_ibm_db_SQLDescribeParam_helper, data,
+		rc = ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_SQLDescribeParam_helper, data,
                        (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
       #else
         rc = _ruby_ibm_db_SQLDescribeParam_helper( data );
@@ -3703,7 +3739,8 @@ VALUE ibm_db_close(int argc, VALUE *argv, VALUE self)
         end_X_args->completionType  =  SQL_ROLLBACK;        /*Remeber you are rolling back the transaction*/
 
         #ifdef UNICODE_SUPPORT_VERSION
-          rc = rb_thread_blocking_region( (void *)_ruby_ibm_db_SQLEndTran, end_X_args,
+          //rc = rb_thread_call_without_gvl ( (void *)_ruby_ibm_db_SQLEndTran, end_X_args,
+		  rc = ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_SQLEndTran, end_X_args,
                          (void *)_ruby_ibm_db_Connection_level_UBF, NULL);
         #else
           rc = _ruby_ibm_db_SQLEndTran( end_X_args );
@@ -3721,7 +3758,8 @@ VALUE ibm_db_close(int argc, VALUE *argv, VALUE self)
       }
 
       #ifdef UNICODE_SUPPORT_VERSION
-        rc = rb_thread_blocking_region( (void *)_ruby_ibm_db_SQLDisconnect_helper, &(conn_res->hdbc),
+        //rc = rb_thread_call_without_gvl ( (void *)_ruby_ibm_db_SQLDisconnect_helper, &(conn_res->hdbc),
+		rc = ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_SQLDisconnect_helper, &(conn_res->hdbc),
                        (void *)_ruby_ibm_db_Connection_level_UBF, NULL);
       #else
         rc = _ruby_ibm_db_SQLDisconnect_helper( &(conn_res->hdbc) );
@@ -3898,7 +3936,8 @@ VALUE ibm_db_column_privileges(int argc, VALUE *argv, VALUE self)
           col_privileges_args->stmt_res  =  stmt_res;
 
           #ifdef UNICODE_SUPPORT_VERSION
-            rc = rb_thread_blocking_region( (void *)_ruby_ibm_db_SQLColumnPrivileges_helper, col_privileges_args,
+            //rc = rb_thread_call_without_gvl ( (void *)_ruby_ibm_db_SQLColumnPrivileges_helper, col_privileges_args,
+			rc = ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_SQLColumnPrivileges_helper, col_privileges_args,
                            (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
           #else
             rc = _ruby_ibm_db_SQLColumnPrivileges_helper( col_privileges_args );
@@ -4078,7 +4117,8 @@ VALUE ibm_db_columns(int argc, VALUE *argv, VALUE self)
         col_metadata_args->stmt_res  =  stmt_res;
 
         #ifdef UNICODE_SUPPORT_VERSION
-          rc = rb_thread_blocking_region( (void *)_ruby_ibm_db_SQLColumns_helper, col_metadata_args,
+          //rc = rb_thread_call_without_gvl ( (void *)_ruby_ibm_db_SQLColumns_helper, col_metadata_args,
+		  rc = ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_SQLColumns_helper, col_metadata_args,
                          (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
         #else
           rc = _ruby_ibm_db_SQLColumns_helper( col_metadata_args );
@@ -4244,7 +4284,8 @@ VALUE ibm_db_foreign_keys(int argc, VALUE *argv, VALUE self)
         col_metadata_args->stmt_res  =  stmt_res;
 
         #ifdef UNICODE_SUPPORT_VERSION
-          rc = rb_thread_blocking_region( (void *)_ruby_ibm_db_SQLForeignKeys_helper, col_metadata_args,
+          //rc = rb_thread_call_without_gvl ( (void *)_ruby_ibm_db_SQLForeignKeys_helper, col_metadata_args,
+		  rc = ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_SQLForeignKeys_helper, col_metadata_args,
                          (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
         #else
           rc = _ruby_ibm_db_SQLForeignKeys_helper( col_metadata_args );
@@ -4400,7 +4441,8 @@ VALUE ibm_db_primary_keys(int argc, VALUE *argv, VALUE self)
         col_metadata_args->stmt_res  =  stmt_res;
 
         #ifdef UNICODE_SUPPORT_VERSION
-          rc = rb_thread_blocking_region( (void *)_ruby_ibm_db_SQLPrimaryKeys_helper, col_metadata_args,
+          //rc = rb_thread_call_without_gvl ( (void *)_ruby_ibm_db_SQLPrimaryKeys_helper, col_metadata_args,
+		  rc = ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_SQLPrimaryKeys_helper, col_metadata_args,
                          (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
         #else
           rc = _ruby_ibm_db_SQLPrimaryKeys_helper( col_metadata_args );
@@ -4591,7 +4633,8 @@ VALUE ibm_db_procedure_columns(int argc, VALUE *argv, VALUE self)
         col_metadata_args->stmt_res  =  stmt_res;
 
         #ifdef UNICODE_SUPPORT_VERSION
-          rc = rb_thread_blocking_region( (void *)_ruby_ibm_db_SQLProcedureColumns_helper, col_metadata_args,
+          //rc = rb_thread_call_without_gvl ( (void *)_ruby_ibm_db_SQLProcedureColumns_helper, col_metadata_args,
+		  rc = ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_SQLProcedureColumns_helper, col_metadata_args,
                          (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res);
         #else
           rc = _ruby_ibm_db_SQLProcedureColumns_helper( col_metadata_args );
@@ -4748,7 +4791,8 @@ VALUE ibm_db_procedures(int argc, VALUE *argv, VALUE self)
         proc_metadata_args->stmt_res     =  stmt_res;
 
         #ifdef UNICODE_SUPPORT_VERSION
-          rc = rb_thread_blocking_region( (void *)_ruby_ibm_db_SQLProcedures_helper, proc_metadata_args,
+          //rc = rb_thread_call_without_gvl ( (void *)_ruby_ibm_db_SQLProcedures_helper, proc_metadata_args,
+		  rc = ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_SQLProcedures_helper, proc_metadata_args,
                          (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res);
         #else
           rc = _ruby_ibm_db_SQLProcedures_helper( proc_metadata_args );
@@ -4925,7 +4969,8 @@ VALUE ibm_db_special_columns(int argc, VALUE *argv, VALUE self)
         col_metadata_args->stmt_res       =  stmt_res;
 
         #ifdef UNICODE_SUPPORT_VERSION
-          rc = rb_thread_blocking_region( (void *)_ruby_ibm_db_SQLSpecialColumns_helper, col_metadata_args,
+          //rc = rb_thread_call_without_gvl ( (void *)_ruby_ibm_db_SQLSpecialColumns_helper, col_metadata_args,
+		  rc = ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_SQLSpecialColumns_helper, col_metadata_args,
                          (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res);
         #else
           rc = _ruby_ibm_db_SQLSpecialColumns_helper( col_metadata_args );
@@ -5120,7 +5165,8 @@ VALUE ibm_db_statistics(int argc, VALUE *argv, VALUE self)
         col_metadata_args->stmt_res      =  stmt_res;
 
         #ifdef UNICODE_SUPPORT_VERSION
-          rc = rb_thread_blocking_region( (void *)_ruby_ibm_db_SQLStatistics_helper, col_metadata_args,
+          //rc = rb_thread_call_without_gvl ( (void *)_ruby_ibm_db_SQLStatistics_helper, col_metadata_args,
+		  rc = ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_SQLStatistics_helper, col_metadata_args,
                          (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
         #else
           rc = _ruby_ibm_db_SQLStatistics_helper( col_metadata_args );
@@ -5279,7 +5325,8 @@ VALUE ibm_db_table_privileges(int argc, VALUE *argv, VALUE self)
         table_privileges_args->stmt_res       =  stmt_res;
 
         #ifdef UNICODE_SUPPORT_VERSION
-          rc = rb_thread_blocking_region( (void *)_ruby_ibm_db_SQLTablePrivileges_helper, table_privileges_args,
+          //rc = rb_thread_call_without_gvl ( (void *)_ruby_ibm_db_SQLTablePrivileges_helper, table_privileges_args,
+		  rc = ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_SQLTablePrivileges_helper, table_privileges_args,
                          (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
         #else
           rc = _ruby_ibm_db_SQLTablePrivileges_helper( table_privileges_args );
@@ -5453,7 +5500,8 @@ VALUE ibm_db_tables(int argc, VALUE *argv, VALUE self)
         table_metadata_args->stmt_res      =  stmt_res;
 
         #ifdef UNICODE_SUPPORT_VERSION
-          rc = rb_thread_blocking_region( (void *)_ruby_ibm_db_SQLTables_helper, table_metadata_args,
+          //rc = rb_thread_call_without_gvl ( (void *)_ruby_ibm_db_SQLTables_helper, table_metadata_args,
+		  rc = ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_SQLTables_helper, table_metadata_args,
                          (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
         #else
           rc = _ruby_ibm_db_SQLTables_helper( table_metadata_args );
@@ -5535,7 +5583,8 @@ VALUE ibm_db_commit(int argc, VALUE *argv, VALUE self)
     end_X_args->completionType  =  SQL_COMMIT;        /*Remeber you are Commiting the transaction*/
 
     #ifdef UNICODE_SUPPORT_VERSION
-      rc = rb_thread_blocking_region( (void *)_ruby_ibm_db_SQLEndTran, end_X_args,
+      //rc = rb_thread_call_without_gvl ( (void *)_ruby_ibm_db_SQLEndTran, end_X_args,
+	  rc = ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_SQLEndTran, end_X_args,
                      (void *)_ruby_ibm_db_Connection_level_UBF, NULL);
     #else
       rc = _ruby_ibm_db_SQLEndTran( end_X_args );
@@ -5615,7 +5664,8 @@ static int _ruby_ibm_db_do_prepare(conn_handle *conn_res, VALUE stmt, stmt_handl
 
     /* Prepare the stmt. The cursor type requested has already been set in _ruby_ibm_db_assign_options */
     #ifdef UNICODE_SUPPORT_VERSION
-      rc = rb_thread_blocking_region( (void *)_ruby_ibm_db_SQLPrepare_helper, prepare_args,
+      //rc = rb_thread_call_without_gvl ( (void *)_ruby_ibm_db_SQLPrepare_helper, prepare_args,
+	  rc = ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_SQLPrepare_helper, prepare_args,
                      (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
     #else
       rc = _ruby_ibm_db_SQLPrepare_helper( prepare_args );
@@ -5753,7 +5803,8 @@ VALUE ibm_db_exec(int argc, VALUE *argv, VALUE self)
       exec_direct_args->stmt_res    =  stmt_res;
 
       #ifdef UNICODE_SUPPORT_VERSION
-        rc = rb_thread_blocking_region( (void *)_ruby_ibm_db_SQLExecDirect_helper, exec_direct_args,
+        //rc = rb_thread_call_without_gvl ( (void *)_ruby_ibm_db_SQLExecDirect_helper, exec_direct_args,
+		rc = ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_SQLExecDirect_helper, exec_direct_args,
                        (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
       #else
         rc = _ruby_ibm_db_SQLExecDirect_helper( exec_direct_args );
@@ -5828,7 +5879,8 @@ VALUE ibm_db_free_result(int argc, VALUE *argv, VALUE self)
       freeStmt_args->option    =  SQL_CLOSE;
 
       #ifdef UNICODE_SUPPORT_VERSION
-        rc = rb_thread_blocking_region( (void *)_ruby_ibm_db_SQLFreeStmt_helper, freeStmt_args, 
+        //rc = rb_thread_call_without_gvl ( (void *)_ruby_ibm_db_SQLFreeStmt_helper, freeStmt_args, 
+		rc = ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_SQLFreeStmt_helper, freeStmt_args, 
                        (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
       #else
         rc = _ruby_ibm_db_SQLFreeStmt_helper( freeStmt_args );
@@ -6933,7 +6985,8 @@ VALUE ibm_db_execute(int argc, VALUE *argv, VALUE self)
     bind_array->error             =  &error;
 
     #ifdef UNICODE_SUPPORT_VERSION
-      ret_value = rb_thread_blocking_region( (void *)_ruby_ibm_db_execute_helper, bind_array,
+      //ret_value = rb_thread_call_without_gvl ( (void *)_ruby_ibm_db_execute_helper, bind_array,
+	  ret_value = ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_execute_helper, bind_array,
                             (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
     #else
       ret_value = _ruby_ibm_db_execute_helper( bind_array );
@@ -7718,7 +7771,8 @@ VALUE ibm_db_next_result(int argc, VALUE *argv, VALUE self)
       nextresultparams->new_hstmt =  &new_hstmt;
 
       #ifdef UNICODE_SUPPORT_VERSION
-        rc = rb_thread_blocking_region( (void *)_ruby_ibm_db_SQLNextResult_helper, nextresultparams,
+        //rc = rb_thread_call_without_gvl ( (void *)_ruby_ibm_db_SQLNextResult_helper, nextresultparams,
+		rc = ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_SQLNextResult_helper, nextresultparams,
                        (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
       #else
         rc = _ruby_ibm_db_SQLNextResult_helper( nextresultparams );
@@ -7817,7 +7871,8 @@ VALUE ibm_db_num_fields(int argc, VALUE *argv, VALUE self)
     result_cols_args->count     =  0;
 
     #ifdef UNICODE_SUPPORT_VERSION
-      rc = rb_thread_blocking_region( (void *)_ruby_ibm_db_SQLNumResultCols_helper, result_cols_args,
+      //rc = rb_thread_call_without_gvl ( (void *)_ruby_ibm_db_SQLNumResultCols_helper, result_cols_args,
+	  rc = ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_SQLNumResultCols_helper, result_cols_args,
                      (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
     #else
       rc = _ruby_ibm_db_SQLNumResultCols_helper( result_cols_args );
@@ -7910,7 +7965,8 @@ VALUE ibm_db_num_rows(int argc, VALUE *argv, VALUE self)
     row_count_args->count     =  0;
 
     #ifdef UNICODE_SUPPORT_VERSION
-      rc = rb_thread_blocking_region( (void *)_ruby_ibm_db_SQLRowCount_helper, row_count_args,
+      //rc = rb_thread_call_without_gvl ( (void *)_ruby_ibm_db_SQLRowCount_helper, row_count_args,
+	  rc = ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_SQLRowCount_helper, row_count_args,
                      (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
     #else
       rc = _ruby_ibm_db_SQLRowCount_helper( row_count_args );
@@ -7966,7 +8022,8 @@ static int _ruby_ibm_db_get_column_by_name(stmt_handle *stmt_res, VALUE column,
     if ( release_gil == 1 ) {
 
       #ifdef UNICODE_SUPPORT_VERSION
-        rc = rb_thread_blocking_region( (void *)_ruby_ibm_db_get_result_set_info, stmt_res,
+        //rc = rb_thread_call_without_gvl ( (void *)_ruby_ibm_db_get_result_set_info, stmt_res,
+		rc = ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_get_result_set_info, stmt_res,
                       (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
       #else
         rc = _ruby_ibm_db_get_result_set_info( stmt_res );
@@ -8129,7 +8186,8 @@ VALUE ibm_db_field_display_size(int argc, VALUE *argv, VALUE self)
     colattr_args->FieldIdentifier =  SQL_DESC_DISPLAY_SIZE;
 
     #ifdef UNICODE_SUPPORT_VERSION
-      rc = rb_thread_blocking_region( (void *)_ruby_ibm_db_SQLColAttributes_helper, colattr_args,
+      //rc = rb_thread_call_without_gvl ( (void *)_ruby_ibm_db_SQLColAttributes_helper, colattr_args,
+	  rc = ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_SQLColAttributes_helper, colattr_args,
                      (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
     #else
       rc = _ruby_ibm_db_SQLColAttributes_helper( colattr_args );
@@ -8449,7 +8507,8 @@ VALUE ibm_db_field_width(int argc, VALUE *argv, VALUE self)
     colattr_args->FieldIdentifier  =  SQL_DESC_LENGTH;
 
     #ifdef UNICODE_SUPPORT_VERSION
-      rc = rb_thread_blocking_region( (void *)_ruby_ibm_db_SQLColAttributes_helper, colattr_args,
+      //rc = rb_thread_call_without_gvl ( (void *)_ruby_ibm_db_SQLColAttributes_helper, colattr_args,
+	  rc = ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_SQLColAttributes_helper, colattr_args,
                      (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
     #else
       rc = _ruby_ibm_db_SQLColAttributes_helper( colattr_args );
@@ -8555,7 +8614,8 @@ 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
-      rc = rb_thread_blocking_region( (void *)_ruby_ibm_db_SQLEndTran, end_X_args,
+      //rc = rb_thread_call_without_gvl ( (void *)_ruby_ibm_db_SQLEndTran, end_X_args,
+	  rc = ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_SQLEndTran, end_X_args,
                      (void *)_ruby_ibm_db_Connection_level_UBF, NULL);
     #else
       rc = _ruby_ibm_db_SQLEndTran( end_X_args );
@@ -9144,7 +9204,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
-      ret_val = rb_thread_blocking_region( (void *)_ruby_ibm_db_result_helper, result_args,
+      //ret_val = rb_thread_call_without_gvl ( (void *)_ruby_ibm_db_result_helper, result_args,
+	  ret_val = ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_result_helper, result_args,
                           (void *)_ruby_ibm_db_Statement_level_UBF, result_args->stmt_res );
     #else
       ret_val = _ruby_ibm_db_result_helper( result_args );
@@ -9947,7 +10008,8 @@ VALUE ibm_db_fetch_row(int argc, VALUE *argv, VALUE self)
   helper_args->error       =  &error;
 
   #ifdef UNICODE_SUPPORT_VERSION
-    ret_val = rb_thread_blocking_region( (void *)_ruby_ibm_db_fetch_row_helper, helper_args,
+    //ret_val = rb_thread_call_without_gvl ( (void *)_ruby_ibm_db_fetch_row_helper, helper_args,
+	ret_val = ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_fetch_row_helper, helper_args,
                         (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
   #else
     ret_val = _ruby_ibm_db_fetch_row_helper( helper_args );
@@ -10115,7 +10177,8 @@ VALUE ibm_db_fetch_assoc(int argc, VALUE *argv, VALUE self) {
   helper_args->funcType   =  FETCH_ASSOC;
 
   #ifdef UNICODE_SUPPORT_VERSION
-    ret_val = rb_thread_blocking_region( (void *)_ruby_ibm_db_bind_fetch_helper, helper_args,
+    //ret_val = rb_thread_call_without_gvl ( (void *)_ruby_ibm_db_bind_fetch_helper, helper_args,
+	ret_val = ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_bind_fetch_helper, helper_args,
                         (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
   #else
     ret_val = _ruby_ibm_db_bind_fetch_helper( helper_args );
@@ -10202,7 +10265,8 @@ VALUE ibm_db_fetch_object(int argc, VALUE *argv, VALUE self)
   helper_args->funcType   =  FETCH_ASSOC;
 
   #ifdef UNICODE_SUPPORT_VERSION
-    row_res->hash = rb_thread_blocking_region( (void *)_ruby_ibm_db_bind_fetch_helper, helper_args,
+    //row_res->hash = rb_thread_call_without_gvl ( (void *)_ruby_ibm_db_bind_fetch_helper, helper_args,
+	row_res->hash = ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_bind_fetch_helper, helper_args,
                               (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
   #else
     row_res->hash = _ruby_ibm_db_bind_fetch_helper( helper_args );
@@ -10284,7 +10348,8 @@ VALUE ibm_db_fetch_array(int argc, VALUE *argv, VALUE self)
   helper_args->funcType    =  FETCH_INDEX;
 
   #ifdef UNICODE_SUPPORT_VERSION
-    ret_val = rb_thread_blocking_region( (void *)_ruby_ibm_db_bind_fetch_helper, helper_args,
+    //ret_val = rb_thread_call_without_gvl ( (void *)_ruby_ibm_db_bind_fetch_helper, helper_args,
+	ret_val = ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_bind_fetch_helper, helper_args,
                         (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
   #else
     ret_val = _ruby_ibm_db_bind_fetch_helper( helper_args );
@@ -10360,7 +10425,8 @@ VALUE ibm_db_fetch_both(int argc, VALUE *argv, VALUE self)
   helper_args->funcType    =  FETCH_BOTH;
 
   #ifdef UNICODE_SUPPORT_VERSION
-    ret_val = rb_thread_blocking_region( (void *)_ruby_ibm_db_bind_fetch_helper, helper_args,
+    //ret_val = rb_thread_call_without_gvl ( (void *)_ruby_ibm_db_bind_fetch_helper, helper_args,
+	ret_val = ibm_Ruby_Thread_Call ( (void *)_ruby_ibm_db_bind_fetch_helper, helper_args,
                         (void *)_ruby_ibm_db_Statement_level_UBF, stmt_res );
   #else
     ret_val = _ruby_ibm_db_bind_fetch_helper( helper_args );
@@ -11111,7 +11177,8 @@ VALUE ibm_db_server_info(int argc, VALUE *argv, VALUE self)
     getInfo_args->buff_length  =  0;
 
     #ifdef UNICODE_SUPPORT_VERSION
-      return_value  =  rb_thread_blocking_region( (void *)ibm_db_server_info_helper, getInfo_args,
+      //return_value  = rb_thread_call_without_gvl ( (void *)ibm_db_server_info_helper, getInfo_args,
+	  return_value  = ibm_Ruby_Thread_Call ( (void *)ibm_db_server_info_helper, getInfo_args,
                                  (void *)_ruby_ibm_db_Connection_level_UBF, NULL);
     #else
       return_value = ibm_db_server_info_helper( getInfo_args );
@@ -11398,7 +11465,8 @@ VALUE ibm_db_client_info(int argc, VALUE *argv, VALUE self)
     getInfo_args->buff_length  =  0;
 
     #ifdef UNICODE_SUPPORT_VERSION
-      return_value = rb_thread_blocking_region( (void *)ibm_db_client_info_helper, getInfo_args,
+      //return_value = rb_thread_call_without_gvl ( (void *)ibm_db_client_info_helper, getInfo_args,
+	  return_value = ibm_Ruby_Thread_Call ( (void *)ibm_db_client_info_helper, getInfo_args,
                                (void *)_ruby_ibm_db_Connection_level_UBF, NULL);
     #else
       return_value = ibm_db_client_info_helper( getInfo_args );
@@ -11706,6 +11774,7 @@ VALUE ibm_db_get_last_serial_value(int argc, VALUE *argv, VALUE self)
     rb_warn("Supplied statement handle is invalid");
     return Qfalse;
   }
+  
 }
 
 

data/lib/active_record/connection_adapters/ibm_db_adapter.rb

@@ -1,11 +1,12 @@
 # +----------------------------------------------------------------------+
 # |  Licensed Materials - Property of IBM                                |
 # |                                                                      |
-# | (C) Copyright IBM Corporation 2006, 2007, 2008, 2009, 2010           |
+# | (C) Copyright IBM Corporation 2006- 2015           					 |
 # +----------------------------------------------------------------------+
 # |  Authors: Antonio Cangiano <cangiano@ca.ibm.com>                     |
 # |         : Mario Ds Briggs  <mario.briggs@in.ibm.com>                 |
 # |         : Praveen Devarao  <praveendrl@in.ibm.com>                   |
+# |         : Arvind Gupta     <arvindgu@in.ibm.com>                     |
 # +----------------------------------------------------------------------+
 
 require 'active_record/connection_adapters/abstract_adapter'
@@ -725,17 +726,24 @@ module ActiveRecord
       def self.visitor_for(pool)
         Arel::Visitors::IBM_DB.new(pool)
       end
-      
-      def to_sql(arel, binds = [])
-        if arel.respond_to?(:ast)
-          visitor.accept(arel.ast) do
-            quote(*binds.shift.reverse)
-          end
-        else
-          arel
-        end
+    
+	#Check Arel version
+      begin
+        @arelVersion = Arel::VERSION.to_i
+      rescue
+        @arelVersion = 0
       end
-
+	if(@arelVersion < 6)	  
+		  def to_sql(arel, binds = [])
+			if arel.respond_to?(:ast)
+			  visitor.accept(arel.ast) do
+				quote(*binds.shift.reverse)
+			  end
+			else
+			  arel
+			end
+		  end
+	end
       # This adapter supports migrations.
       # Current limitations:
       # +rename_column+ is not currently supported by the IBM data servers
@@ -1118,7 +1126,11 @@ module ActiveRecord
       end
 
       def insert(arel, name = nil, pk = nil, id_value = nil, sequence_name = nil, binds = [] )
-        sql, binds = [to_sql(arel),binds]
+        if(@arelVersion <  6 )
+		 sql, binds = [to_sql(arel),binds]
+		else
+		 sql, binds = sql_for_insert(to_sql(arel, binds), pk, id_value, sequence_name, binds) #[to_sql(arel),binds]
+		end
 
         #unless IBM_DBAdapter.respond_to?(:exec_insert)
         if binds.nil? || binds.empty?
@@ -1278,7 +1290,11 @@ module ActiveRecord
       alias_method :prepared_delete, :prepared_update
 
       def update(arel, name = nil, binds = [])
-        sql = to_sql(arel)
+        if(@arelVersion <  6 )
+		sql = to_sql(arel)
+		else
+		sql = to_sql(arel,binds)
+		end
 
         # Make sure the WHERE clause handles NULL's correctly
         sqlarray = sql.split(/\s*WHERE\s*/)
@@ -1335,6 +1351,13 @@ module ActiveRecord
         IBM_DB.autocommit @connection, IBM_DB::SQL_AUTOCOMMIT_ON
       end
 
+      def get_limit_offset_clauses(limit,offset)
+        if limit && limit == 0
+          clauses = @servertype.get_limit_offset_clauses(limit,0)
+        else
+          clauses = @servertype.get_limit_offset_clauses(limit, offset)
+        end
+      end
 
       # Modifies a sql statement in order to implement a LIMIT and an OFFSET.
       # A LIMIT defines the number of rows that should be fetched, while
@@ -1459,7 +1482,7 @@ module ActiveRecord
               end
           elsif column && column.type.to_sym == :text
               unless caller[0] =~ /add_column_options/i
-                "'@@@IBMTEXT@@@'"
+                "'<ibm>@@@IBMTEXT@@@</ibm>'"
               else
                 @servertype.set_text_default(quote_string(value))
               end
@@ -1879,7 +1902,8 @@ module ActiveRecord
               if !(column_name =~ /db2_generated_rowid_for_lobs/i)
                 # Pushes into the array the *IBM_DBColumn* object, created by passing to the initializer
                 # +column_name+, +default_value+, +column_type+ and +column_nullable+.
-                columns << IBM_DBColumn.new(column_name, column_default_value, column_type, column_nullable)
+                cast_type = lookup_cast_type(column_type)
+                columns << IBM_DBColumn.new(column_name, column_default_value, cast_type, column_type, column_nullable)
               end
             end
           rescue StandardError => fetch_error # Handle driver fetch errors
@@ -2009,6 +2033,47 @@ module ActiveRecord
       def remove_index(table_name, options = {})
         execute("DROP INDEX #{index_name(table_name, options)}")
       end
+
+      protected
+      def initialize_type_map(m) # :nodoc:
+        register_class_with_limit m, %r(boolean)i,   Type::Boolean
+        register_class_with_limit m, %r(char)i,      Type::String
+        register_class_with_limit m, %r(binary)i,    Type::Binary
+        register_class_with_limit m, %r(text)i,      Type::Text
+        register_class_with_limit m, %r(date)i,      Type::Date
+        register_class_with_limit m, %r(time)i,      Type::Time
+        register_class_with_limit m, %r(datetime)i,  Type::DateTime
+        register_class_with_limit m, %r(float)i,     Type::Float
+        register_class_with_limit m, %r(int)i,       Type::Integer
+
+        m.alias_type %r(blob)i,      'binary'
+        m.alias_type %r(clob)i,      'text'
+        m.alias_type %r(timestamp)i, 'datetime'
+        m.alias_type %r(numeric)i,   'decimal'
+        m.alias_type %r(number)i,    'decimal'
+        m.alias_type %r(double)i,    'float'
+
+        m.register_type(%r(decimal)i) do |sql_type|
+          scale = extract_scale(sql_type)
+          precision = extract_precision(sql_type)
+
+          if scale == 0
+            # FIXME: Remove this class as well
+            Type::DecimalWithoutScale.new(precision: precision)
+          else
+            Type::Decimal.new(precision: precision, scale: scale)
+          end
+        end
+
+        m.alias_type %r(xml)i,      'text'
+        m.alias_type %r(for bit data)i,      'binary'
+        m.alias_type %r(smallint)i,      'boolean'
+        m.alias_type %r(serial)i,      'int'
+        m.alias_type %r(decfloat)i,      'decimal'
+        m.alias_type %r(real)i,      'decimal'
+        m.alias_type %r(graphic)i,      'binary'
+        m.alias_type %r(rowid)i,      'int'
+      end
     end # class IBM_DBAdapter
 
     # This class contains common code across DB's (DB2 LUW, zOS, i5 and IDS)
@@ -2145,6 +2210,9 @@ To remove the column, the table must be dropped and recreated without the #{colu
       def query_offset_limit(sql, offset, limit)
       end
 
+      def get_limit_offset_clauses(limit, offset)
+      end
+
       def query_offset_limit!(sql, offset, limit, options)
       end
       
@@ -2507,6 +2575,30 @@ SET WITH DEFAULT #{@adapter.quote(default)}"
         end
       end
 =end
+      def get_limit_offset_clauses(limit, offset)
+        retHash = {"endSegment"=> "", "startSegment" => ""}
+        if(offset.nil? && limit.nil?)
+          return retHash
+        end
+
+        if (offset.nil?)
+           retHash["endSegment"] = " FETCH FIRST #{limit} ROWS ONLY"
+           return retHash
+        end
+
+        if(limit.nil?)
+          retHash["startSegment"] = "SELECT O.* FROM (SELECT I.*, ROW_NUMBER() OVER () sys_row_num FROM ( SELECT "
+          retHash["endSegment"] = " ) AS I) AS O WHERE sys_row_num > #{offset}"
+          return retHash
+        end
+
+        # Defines what will be the last record
+        last_record = offset.to_i + limit.to_i
+        retHash["startSegment"] = "SELECT O.* FROM (SELECT I.*, ROW_NUMBER() OVER () sys_row_num FROM ( SELECT "
+        retHash["endSegment"] = " ) AS I) AS O WHERE sys_row_num BETWEEN #{offset+1} AND #{last_record}"
+        return retHash
+      end
+
       def query_offset_limit(sql, offset, limit)
         if(offset.nil? && limit.nil?)
           return sql
@@ -2727,6 +2819,14 @@ SET WITH DEFAULT #{@adapter.quote(default)}"
     class IBM_DB2_ZOS_8 < IBM_DB2_ZOS
       include HostedDataServer
 
+      def get_limit_offset_clauses(limit, offset)
+        retHash = {"startSegment" => "", "endSegment" => ""}
+        if (!limit.nil?)
+           retHash["endSegment"] = " FETCH FIRST #{limit} ROWS ONLY"
+        end
+        return retHash
+      end
+
       def query_offset_limit(sql, offset, limit)
         if (!limit.nil?)
            sql << " FETCH FIRST #{limit} ROWS ONLY"
@@ -2889,6 +2989,22 @@ SET WITH DEFAULT #{@adapter.quote(default)}"
         return "double precision"
       end
 
+      def get_limit_offset_clauses(limit, offset)
+        retHash = {"startSegment" => "", "endSegment" => ""}
+        if limit != 0
+          if !offset.nil?
+            # Modifying the SQL to utilize the skip and limit amounts
+            retHash["startSegment"] = " SELECT SKIP #{offset} LIMIT #{limit} "
+          else
+            # Modifying the SQL to retrieve only the first #{limit} rows
+            retHash["startSegment"] = " SELECT FIRST #{limit} "
+          end
+        else
+          retHash["startSegment"] = " SELECT * FROM (SELECT "
+          retHash["endSegment"] = " ) WHERE 0 = 1 "
+        end
+      end
+
       # Handling offset/limit as per Informix requirements
       def query_offset_limit(sql, offset, limit)
         if limit != 0
@@ -2968,11 +3084,39 @@ SET WITH DEFAULT #{@adapter.quote(default)}"
 end # module ActiveRecord
 
 module Arel
+#Check Arel version
+      begin
+        arelVersion = Arel::VERSION.to_i
+      rescue
+        arelVersion = 0
+      end
+if(arelVersion >= 6)
+module Collectors
+    class Bind
+      def changeFirstSegment(segment)
+        @parts[0] = segment
+      end
+
+      def changeEndSegment(segment)
+        len = @parts.length
+        @parts[len] = segment
+      end
+    end
+  end
+end  
+  
   module Visitors
     class Visitor #opening and closing the class to ensure backward compatibility
     end
-
-    class ToSql < Arel::Visitors::Visitor #opening and closing the class to ensure backward compatibility
+	
+#Check Arel version
+      begin
+        arelVersion = Arel::VERSION.to_i
+      rescue
+        arelVersion = 0
+      end
+if(arelVersion >= 6)	
+    class ToSql < Arel::Visitors::Reduce #opening and closing the class to ensure backward compatibility
       # In case when using Rails-2.3.x there is no arel used due to which the constructor has to be defined explicitly
       # to ensure the same code works on any version of Rails
       
@@ -2985,6 +3129,7 @@ module Arel
 
       if(@arelVersion >= 3)
         def initialize connection
+          super()
           @connection     = connection
           @schema_cache   = connection.schema_cache if(connection.respond_to?(:schema_cache))
           @quoted_tables  = {}
@@ -2993,18 +3138,52 @@ module Arel
         end
       end
     end
+else
+	class ToSql < Arel::Visitors::Visitor #opening and closing the class to ensure backward compatibility    
+	# In case when using Rails-2.3.x there is no arel used due to which the constructor has to be defined explicitly
+      # to ensure the same code works on any version of Rails
+                         
+		#Check Arel version
+		  begin
+			@arelVersion = Arel::VERSION.to_i
+		  rescue
+			@arelVersion = 0
+		  end
+	     if(@arelVersion >= 3)	
+		 def initialize connection
+			super()		 
+          @connection     = connection
+          @schema_cache   = connection.schema_cache if(connection.respond_to?(:schema_cache))
+          @quoted_tables  = {}
+          @quoted_columns = {}
+          @last_column    = nil
+        end
+			  
+      end
+    end
+	
+end	
+      
 
     class IBM_DB < Arel::Visitors::ToSql
       private
 
-      def visit_Arel_Nodes_Limit o, a=nil
+
+#Check Arel version
+      begin
+        @arelVersion = Arel::VERSION.to_i
+      rescue
+        @arelVersion = 0
+      end      
+if(@arelVersion < 6)
+
+	  def visit_Arel_Nodes_Limit o, a=nil
         visit o.expr
       end
 
       def visit_Arel_Nodes_Offset o, a=nil
         visit o.expr
       end
-
       def visit_Arel_Nodes_SelectStatement o, a=nil
         #Interim  fix for backward compatibility [Arel 4.0.0 and below]
         if self.method(:visit_Arel_Nodes_SelectCore).arity == 1
@@ -3036,7 +3215,71 @@ module Arel
         sql << " #{(visit(o.lock) if o.lock)}"
         return sql
       end
+else
+      def visit_Arel_Nodes_Limit o,collector
+        visit o.expr, collector
+      end
 
+      def visit_Arel_Nodes_Offset o,collector
+        visit o.expr,collector
+      end
+
+      def visit_Arel_Nodes_SelectStatement o, collector
+
+        if o.with
+          collector = visit o.with, collector
+          collector << SPACE
+        end
+
+        collector = o.cores.inject(collector) { |c,x|
+          visit_Arel_Nodes_SelectCore(x, c)
+        }
+
+        unless o.orders.empty?
+          collector << SPACE
+          collector << ORDER_BY
+          len = o.orders.length - 1
+          o.orders.each_with_index { |x, i|
+            collector = visit(x, collector)
+            collector << COMMA unless len == i
+          }
+        end
+
+        if o.limit
+          limcoll = Arel::Collectors::SQLString.new
+          visit(o.limit,limcoll)
+          limit = limcoll.value.to_i
+        else
+          limit = nil
+        end
+
+        if o.offset
+          offcoll = Arel::Collectors::SQLString.new
+          visit(o.offset,offcoll)
+          offset = offcoll.value.to_i
+        else
+          offset = nil
+        end
+
+        limOffClause = @connection.get_limit_offset_clauses(limit,offset)
+
+        if( !limOffClause["startSegment"].empty? ) 
+          collector.changeFirstSegment(limOffClause["startSegment"])
+        end
+        
+        if( !limOffClause["endSegment"].empty? )
+          collector.changeEndSegment(limOffClause["endSegment"])
+        end
+
+        #Initialize a new Collector and set its value to the sql string built so far with any limit and ofset modifications
+        #collector.reset(sql)
+
+        collector = maybe_visit o.lock, collector
+
+	return collector
+      end
+end	  
+	
     end
   end
 end

metadata

@@ -1,27 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: ibm_db
 version: !ruby/object:Gem::Version
-  version: 2.5.18
+  version: 2.5.25
+  prerelease: 
 platform: ruby
 authors:
 - IBM
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-03 00:00:00.000000000 Z
+date: 2015-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.15.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.15.1
 description: 
@@ -34,78 +37,91 @@ extra_rdoc_files:
 - README
 - MANIFEST
 files:
-- CHANGES
-- LICENSE
-- MANIFEST
-- ParameterizedQueries README
 - README
-- ext/Makefile.nt32
-- ext/Makefile.nt32.191
-- ext/extconf.rb
-- ext/ibm_db.c
-- ext/ruby_ibm_db.h
-- ext/ruby_ibm_db_cli.c
-- ext/ruby_ibm_db_cli.h
-- init.rb
-- lib/IBM_DB.rb
+- lib/active_record/connection_adapters/ibmdb_adapter.rb
 - lib/active_record/connection_adapters/ibm_db_adapter.rb
 - lib/active_record/connection_adapters/ibm_db_pstmt.rb
-- lib/active_record/connection_adapters/ibmdb_adapter.rb
 - lib/active_record/vendor/db2-i5-zOS.yaml
-- test/cases/adapter_test.rb
-- test/cases/associations/belongs_to_associations_test.rb
-- test/cases/associations/cascaded_eager_loading_test.rb
-- test/cases/associations/has_and_belongs_to_many_associations_test.rb
-- test/cases/associations/join_model_test.rb
+- lib/IBM_DB.rb
+- test/connections/native_ibm_db/connection.rb
+- test/models/warehouse_thing.rb
 - test/cases/attribute_methods_test.rb
-- test/cases/base_test.rb
-- test/cases/calculations_test.rb
-- test/cases/migration_test.rb
-- test/cases/persistence_test.rb
-- test/cases/query_cache_test.rb
 - test/cases/relations_test.rb
 - test/cases/schema_dumper_test.rb
 - test/cases/transaction_callbacks_test.rb
-- test/cases/validations/uniqueness_validation_test.rb
 - test/cases/xml_serialization_test.rb
+- test/cases/validations/uniqueness_validation_test.rb
+- test/cases/persistence_test.rb
+- test/cases/calculations_test.rb
+- test/cases/query_cache_test.rb
+- test/cases/migration_test.rb
+- test/cases/base_test.rb
+- test/cases/associations/belongs_to_associations_test.rb
+- test/cases/associations/has_and_belongs_to_many_associations_test.rb
+- test/cases/associations/cascaded_eager_loading_test.rb
+- test/cases/associations/join_model_test.rb
+- test/cases/adapter_test.rb
 - test/config.yml
-- test/connections/native_ibm_db/connection.rb
-- test/ibm_db_test.rb
-- test/models/warehouse_thing.rb
-- test/schema/i5/ibm_db_specific_schema.rb
+- test/schema/zOS/ibm_db_specific_schema.rb
 - test/schema/ids/ibm_db_specific_schema.rb
-- test/schema/luw/ibm_db_specific_schema.rb
+- test/schema/i5/ibm_db_specific_schema.rb
 - test/schema/schema.rb
-- test/schema/zOS/ibm_db_specific_schema.rb
+- test/schema/luw/ibm_db_specific_schema.rb
+- test/ibm_db_test.rb
+- ParameterizedQueries README
+- ext/ruby_ibm_db.h
+- ext/Makefile.nt32
+- ext/ruby_ibm_db_cli.c
+- ext/ruby_ibm_db_cli.h
+- ext/extconf.rb
+- ext/ibm_db.c
+- ext/Makefile.nt32.191
+- LICENSE
+- init.rb
+- CHANGES
+- MANIFEST
 homepage: https://github.com/ibmdb/ruby-ibmdb
 licenses: []
-metadata: {}
-post_install_message: |2+
+post_install_message: ! '
 
   *****************************************************************************
-  Successfully installed ibm_db, the Ruby gem for IBM DB2/Informix.  The Ruby gem is licensed under the MIT License.   The package also includes IBM ODBC and CLI Driver from IBM, which could have been automatically downloaded as the Ruby gem is installed on your system/device.   The license agreement to the IBM driver is available in the folder "$GEM_HOME/ibm_db-*/lib/clidriver/license".  Check for additional dependencies, which may come with their own license agreement(s). Your use of the components of the package and dependencies constitutes your acceptance of their respective license agreements.  If you do not accept the terms of any license agreement(s), then delete the relevant component(s) from your system/device.
+
+  Successfully installed ibm_db, the Ruby gem for IBM DB2/Informix.  The Ruby gem
+  is licensed under the MIT License.   The package also includes IBM ODBC and CLI
+  Driver from IBM, which could have been automatically downloaded as the Ruby gem
+  is installed on your system/device.   The license agreement to the IBM driver is
+  available in the folder "$GEM_HOME/ibm_db-*/lib/clidriver/license".  Check for additional
+  dependencies, which may come with their own license agreement(s). Your use of the
+  components of the package and dependencies constitutes your acceptance of their
+  respective license agreements.  If you do not accept the terms of any license agreement(s),
+  then delete the relevant component(s) from your system/device.
+
   *****************************************************************************
 
+
+'
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.8.6
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
 - ActiveRecord, at least 1.15.1
 rubyforge_project: rubyibm
-rubygems_version: 2.2.2
+rubygems_version: 1.8.23.2
 signing_key: 
-specification_version: 4
-summary: 'Rails Driver and Adapter for IBM Data Servers: {DB2 on Linux/Unix/Windows,
+specification_version: 3
+summary: ! 'Rails Driver and Adapter for IBM Data Servers: {DB2 on Linux/Unix/Windows,
   DB2 on zOS, DB2 on i5/OS, Informix (IDS)}'
 test_files:
 - test/ibm_db_test.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 91ff663db933ec69c03095b1a0a50347055fe634
-  data.tar.gz: 22d1654982d6f4467ac8e9b107868d4533b5a825
-SHA512:
-  metadata.gz: 8c97c793aef0305f16c530dd61055589382108468b3df1582dcca3e790197b52fa7810509cd086a3a6962bf9f2d7259af6038096293a2177c7b3d643af459aec
-  data.tar.gz: da889c3f8cb89b64fea6f5de482e69ad108003e282d70282daece50100928b34571a64ae37b872d1cd70378e2339be7b95ca75977648967ebf9ae3a50b613d70