ibm_db 2.5.26-x86-mingw32 → 2.5.27-x86-mingw32

data/ext/ruby_ibm_db_cli.c

@@ -2,9 +2,9 @@
   +----------------------------------------------------------------------+
   |  Licensed Materials - Property of IBM                                |
   |                                                                      |
-  | (C) Copyright IBM Corporation 2009, 2010, 2012                       |
+  | (C) Copyright IBM Corporation 2009 - 2015                            |
   +----------------------------------------------------------------------+
-  | Authors: Praveen Devarao                                             |
+  | Authors: Praveen Devarao, Arvind Gupta                               |
   +----------------------------------------------------------------------+
 */
 
@@ -21,6 +21,8 @@
     With this the executing thread will become unblocking allowing concurrent threads perform operations simultaneously.
 */
 
+#include "ruby.h"
+
 #include "ruby_ibm_db_cli.h"
 
 /*
@@ -60,7 +62,7 @@ int _ruby_ibm_db_SQLDisconnect_helper(SQLHANDLE *hdbc) {
    Connection level Unblock function. This function is called when a thread interruput is issued while executing a
    connection level SQL call
 */
-void _ruby_ibm_db_Connection_level_UBF(void *data) {
+void _ruby_ibm_db_Connection_level_UBF(void *data) {	
     return;
 }
 
@@ -68,7 +70,10 @@ void _ruby_ibm_db_Connection_level_UBF(void *data) {
     This function will commit and end the inprogress transaction by issuing a SQLCommit
 */
 int _ruby_ibm_db_SQLEndTran(end_tran_args *endtran_args) {
-  return SQLEndTran( endtran_args->handleType, *(endtran_args->hdbc), endtran_args->completionType );  
+  int rc = 0;
+  rc = SQLEndTran( endtran_args->handleType, *(endtran_args->hdbc), endtran_args->completionType );  
+  endtran_args->rc = rc;
+  return rc;
 }
 
 /*
@@ -82,7 +87,7 @@ int _ruby_ibm_db_SQLDescribeParam_helper(describeparam_args *data) {
                 &(data->sql_precision), &(data->sql_scale), &(data->sql_nullable) );
 
   data->stmt_res->is_executing = 0;
-
+  data->rc = rc;
   return rc;
 }
 
@@ -117,7 +122,6 @@ int _ruby_ibm_db_SQLDescribeCol_helper(describecol_args *data) {
 */
 int _ruby_ibm_db_SQLBindCol_helper(bind_col_args *data) {
   int rc = 0;
-
   data->stmt_res->is_executing = 1;
 
   rc = SQLBindCol( (SQLHSTMT) data->stmt_res->hstmt, (SQLUSMALLINT)(data->col_num),
@@ -125,7 +129,6 @@ int _ruby_ibm_db_SQLBindCol_helper(bind_col_args *data) {
           data->out_length );
 
   data->stmt_res->is_executing = 0;
-
   return rc;
 }
 
@@ -148,7 +151,7 @@ int _ruby_ibm_db_SQLColumnPrivileges_helper(metadata_args *data) {
 #endif
 
   data->stmt_res->is_executing = 0;
-
+  data->rc=rc;
   return rc;
 
 }
@@ -172,7 +175,7 @@ int _ruby_ibm_db_SQLColumns_helper(metadata_args *data) {
 #endif
 
   data->stmt_res->is_executing = 0;
-
+  data->rc = rc;
   return rc;
 }
 
@@ -193,7 +196,7 @@ int _ruby_ibm_db_SQLPrimaryKeys_helper(metadata_args *data) {
 #endif
 
   data->stmt_res->is_executing = 0;
-
+  data->rc = rc;
   return rc;
 }
 
@@ -216,7 +219,7 @@ int _ruby_ibm_db_SQLForeignKeys_helper(metadata_args *data) {
 #endif
 
   data->stmt_res->is_executing = 0;
-
+  data->rc = rc;
   return rc;
 }
 
@@ -238,7 +241,7 @@ int _ruby_ibm_db_SQLProcedureColumns_helper(metadata_args *data) {
 #endif
 
   data->stmt_res->is_executing = 0;
-
+  data->rc = rc;
   return rc;
 }
 
@@ -260,7 +263,7 @@ int _ruby_ibm_db_SQLProcedures_helper(metadata_args *data) {
 #endif
 
   data->stmt_res->is_executing = 0;
-
+  data->rc = rc;
   return rc;
 }
 
@@ -284,7 +287,7 @@ int _ruby_ibm_db_SQLSpecialColumns_helper(metadata_args *data) {
 #endif
 
   data->stmt_res->is_executing = 0;
-
+  data->rc = rc;
   return rc;
 }
 
@@ -305,7 +308,7 @@ int _ruby_ibm_db_SQLStatistics_helper(metadata_args *data) {
 #endif
 
   data->stmt_res->is_executing = 0;
-
+  data->rc= rc;
   return rc;
 }
 
@@ -327,7 +330,7 @@ int _ruby_ibm_db_SQLTablePrivileges_helper(metadata_args *data) {
 #endif
 
   data->stmt_res->is_executing = 0;
-
+  data->rc = rc;
   return rc;
 }
 
@@ -349,7 +352,7 @@ int _ruby_ibm_db_SQLTables_helper(metadata_args *data) {
 #endif
 
   data->stmt_res->is_executing = 0;
-
+  data->rc = rc;
   return rc;
 }
 
@@ -362,13 +365,13 @@ int _ruby_ibm_db_SQLExecDirect_helper(exec_cum_prepare_args *data) {
   data->stmt_res->is_executing = 1;
 
 #ifndef UNICODE_SUPPORT_VERSION
-  rc = SQLExecDirect( (SQLHSTMT) data->stmt_res->hstmt, data->stmt_string, (SQLINTEGER)data->stmt_string_len );
+  rc = SQLExecDirect( (SQLHSTMT) data->stmt_res->hstmt, data->stmt_string, (SQLINTEGER)data->stmt_string_len );  
 #else
   rc = SQLExecDirectW( (SQLHSTMT) data->stmt_res->hstmt, data->stmt_string, (SQLINTEGER)data->stmt_string_len );
 #endif
 
   data->stmt_res->is_executing = 0;
-
+  data->rc=rc;
   return rc;
 }
 
@@ -422,7 +425,8 @@ int _ruby_ibm_db_SQLCreateDB_helper(create_drop_db_args *data) {
   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 );
+  data->rc =rc;							
+  DLCLOSE( cliLib );  
   return rc;
 }
 
@@ -506,10 +510,10 @@ int _ruby_ibm_db_SQLFreeStmt_helper(free_stmt_args *data) {
 
   data->stmt_res->is_executing = 1;
 
-  SQLFreeStmt((SQLHSTMT)data->stmt_res->hstmt, data->option );
+  rc = SQLFreeStmt((SQLHSTMT)data->stmt_res->hstmt, data->option );
 
   data->stmt_res->is_executing = 0;
-
+  data->rc = rc;
   return rc;
 }
 
@@ -555,7 +559,7 @@ int _ruby_ibm_db_SQLColAttributes_helper(col_attr_args *data) {
                      data->FieldIdentifier, NULL, 0, NULL, &(data->num_attr) );
 
   data->stmt_res->is_executing = 0;
-
+  data->rc = rc;
   return rc;
 }
 
@@ -639,7 +643,7 @@ int _ruby_ibm_db_SQLNextResult_helper(next_result_args *data) {
   rc = SQLNextResult( (SQLHSTMT) data->stmt_res->hstmt, (SQLHSTMT) *(data->new_hstmt) );
 
   data->stmt_res->is_executing = 0;
-
+  data->rc = rc;
   return rc;
 }
 
@@ -685,7 +689,7 @@ int _ruby_ibm_db_SQLNumResultCols_helper(row_col_count_args *data) {
   rc = SQLNumResultCols( (SQLHSTMT) data->stmt_res->hstmt, (SQLSMALLINT*) &(data->count) );
 
   data->stmt_res->is_executing = 0;
-
+  data->rc = rc;
   return rc;
 }
 
@@ -735,8 +739,10 @@ int _ruby_ibm_db_SQLGetInfo_helper(get_info_args *data) {
 */
 int _ruby_ibm_db_SQLGetDiagRec_helper(get_diagRec_args *data) {
 #ifdef UNICODE_SUPPORT_VERSION
-  return SQLGetDiagRecW( data->hType, data->handle, data->recNum, data->SQLState, data->NativeErrorPtr,
+  int rc= SQLGetDiagRecW( data->hType, data->handle, data->recNum, data->SQLState, data->NativeErrorPtr,
                               data->msgText, data->buff_length, data->text_length_ptr );
+  data->return_code=rc;
+  return rc;  
 #else
   return SQLGetDiagRec(data->hType, data->handle, data->recNum, data->SQLState, data->NativeErrorPtr,
                               data->msgText, data->buff_length, data->text_length_ptr );

data/ext/ruby_ibm_db_cli.h

@@ -2,9 +2,9 @@
   +----------------------------------------------------------------------+
   |  Licensed Materials - Property of IBM                                |
   |                                                                      |
-  | (C) Copyright IBM Corporation 2009, 2010, 2012                       |
+  | (C) Copyright IBM Corporation 2009 - 2015                            |
   +----------------------------------------------------------------------+
-  | Authors: Praveen Devarao                                             |
+  | Authors: Praveen Devarao, Arvind Gupta                               |
   +----------------------------------------------------------------------+
 */
 
@@ -89,7 +89,6 @@ typedef struct _conn_handle_struct {
   SQLSMALLINT  ruby_error_msg_len;
 
   SQLINTEGER   sqlcode;
-
 } conn_handle;
 
 typedef union {
@@ -151,6 +150,7 @@ typedef struct _stmt_handle_struct {
   SQLPOINTER   ruby_stmt_err_state;
   SQLSMALLINT  ruby_stmt_err_msg_len;
   SQLINTEGER   sqlcode;
+  int		   rc;
 } stmt_handle;
 
 /* 
@@ -180,6 +180,7 @@ typedef struct _ibm_db_end_tran_args_struct {
   SQLHANDLE      *hdbc;
   SQLSMALLINT    handleType;
   SQLSMALLINT    completionType;
+  int 			 rc;
 } end_tran_args;
 
 /* 
@@ -192,6 +193,7 @@ typedef struct _ibm_db_describeparam_args_struct {
   SQLUINTEGER   sql_precision;
   SQLSMALLINT   sql_scale;
   SQLSMALLINT   sql_nullable;
+  int 			rc;
 } describeparam_args;
 
 /* 
@@ -232,6 +234,7 @@ typedef struct _ibm_db_metadata_args_struct {
   SQLSMALLINT   table_type_len;
   int           scope;       /*Used in SQLSpecialColumns To determine the scope of the unique row identifier*/
   int           unique;      /*Used in SQLStatistics to determine if only unique indexes are to be fetched or all*/
+  int 			rc;
 
 } metadata_args;
 
@@ -246,6 +249,7 @@ typedef struct _ibm_db_exec_direct_args_struct {
   SQLCHAR       *stmt_string;
 #endif
   long          stmt_string_len;
+  int 			rc;
 } exec_cum_prepare_args;
 
 /* 
@@ -265,6 +269,7 @@ typedef struct _ibm_db_create_drop_db_args_struct {
   long          dbName_string_len;
   long          codeSet_string_len;
   long          mode_string_len;
+  int 			rc;
 } create_drop_db_args;
 
 /* 
@@ -281,7 +286,7 @@ typedef struct _ibm_db_param_and_put_data_struct {
 typedef struct _ibm_db_next_result_args_struct {
   SQLHSTMT      *new_hstmt;
   stmt_handle   *stmt_res;
-
+  int 			rc;
 } next_result_args;
 
 /* 
@@ -290,6 +295,7 @@ typedef struct _ibm_db_next_result_args_struct {
 typedef struct _ibm_db_row_col_count_struct {
   stmt_handle    *stmt_res;
   SQLSMALLINT    count;
+  int 			 rc;
 } row_col_count_args;
 
 /* 
@@ -298,6 +304,7 @@ typedef struct _ibm_db_row_col_count_struct {
 typedef struct _ibm_db_row_count_struct {
   stmt_handle    *stmt_res;
   SQLINTEGER     count;
+  int 			 rc;
 } sql_row_count_args;
 
 /* 
@@ -308,6 +315,7 @@ typedef struct _ibm_db_col_attr_struct {
   SQLSMALLINT    col_num;
   SQLSMALLINT    FieldIdentifier;
   SQLINTEGER     num_attr;
+  int 			 rc;
 } col_attr_args;
 
 /* 
@@ -416,6 +424,7 @@ typedef struct _ibm_db_get_info_struct {
   SQLPOINTER    infoValue;
   SQLSMALLINT   buff_length;
   SQLSMALLINT   *out_length;
+  VALUE 		return_value;
 } get_info_args;
 
 /* 
@@ -430,6 +439,7 @@ typedef struct _ibm_db_get_diagRec_struct {
   SQLINTEGER        *NativeErrorPtr;
   SQLSMALLINT       buff_length;
   SQLSMALLINT       *text_length_ptr;
+  int  				return_code;
 } get_diagRec_args;
 
 /* 
@@ -438,6 +448,7 @@ typedef struct _ibm_db_get_diagRec_struct {
 typedef struct _ibm_db_free_stmt_struct {
   stmt_handle   *stmt_res;
   SQLUSMALLINT  option;
+  int			rc;
 } free_stmt_args;
 
 int _ruby_ibm_db_SQLConnect_helper(connect_args *data);

data/lib/active_record/connection_adapters/ibm_db_adapter.rb

@@ -422,6 +422,7 @@ module ActiveRecord
         @temporary = temporary
         @options = options
         @name = name
+        @foreign_keys = {}
       end
 
       def native

data/lib/mswin32/ibm_db.rb

@@ -14,7 +14,7 @@ elsif (RUBY_VERSION =~ /2.1./)
 machine_bits = ['ibm'].pack('p').size * 8
 	if machine_bits == 64
 	#require 'mswin32/rb21x/x64/ibm_db.so'
-	raise NotImplementedError, "ibm_db with Ruby 2.0 64-bit on Windows platform is not supported. Refer to README for more details"
+	raise NotImplementedError, "ibm_db with Ruby 2.1 64-bit on Windows platform is not supported. Refer to README for more details"
 	else
 	require 'mswin32/rb21x/i386/ibm_db.so'
 	end
@@ -23,7 +23,7 @@ elsif (RUBY_VERSION =~ /2.2./ )
   machine_bits = ['ibm'].pack('p').size * 8
   if machine_bits == 64
     #require 'mswin32/rb22x/x64/ibm_db.so'
-	raise NotImplementedError, "ibm_db with Ruby 2.0 64-bit on Windows platform is not supported. Refer to README for more details"
+	raise NotImplementedError, "ibm_db with Ruby 2.2 64-bit on Windows platform is not supported. Refer to README for more details"
   else
     require 'mswin32/rb22x/i386/ibm_db.so'
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ibm_db
 version: !ruby/object:Gem::Version
-  version: 2.5.26
+  version: 2.5.27
 platform: x86-mingw32
 authors:
 - IBM
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-08 00:00:00.000000000 Z
+date: 2015-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord