Merge pull request #132 from praveen-db2/master

Support for Ruby 3.0 and Rails 6.1

Author: praveen-db2

IBM_DB_Adapter/ibm_db/IBM_DB.gemspec

@@ -1,7 +1,7 @@
 # +----------------------------------------------------------------------+
 # |  Licensed Materials - Property of IBM                                |
 # |                                                                      |
-# | (C) Copyright IBM Corporation 2006- 2018                             |
+# | (C) Copyright IBM Corporation 2006- 2022                             |
 # +----------------------------------------------------------------------+
 
 require 'rubygems'
@@ -10,15 +10,16 @@ require 'pathname'
 Gem::Specification.new do |spec|
   # Required spec
   spec.name     = 'ibm_db'
-  spec.version  = '5.2.0'
+  spec.version  = '5.3.0'
   spec.summary  = 'Rails Driver and Adapter for IBM Data Servers: {DB2 on Linux/Unix/Windows, DB2 on zOS, DB2 on i5/OS, Informix (IDS)}'
 
   # Optional spec
   spec.author = 'IBM'
   spec.email = 'opendev@us.ibm.com'
   spec.homepage = 'https://github.com/ibmdb/ruby-ibmdb'
   spec.required_ruby_version = '>= 2.5.0'
-  spec.add_dependency('activerecord', '>= 5.0.7', '<=6.0.3')
+  spec.add_dependency('zip')
+  spec.add_dependency('activerecord', '>= 5.0.7', '<=6.1')
   spec.requirements << 'ActiveRecord, at least 5.0.7'
 
   candidates = Dir.glob("**/*")

IBM_DB_Adapter/ibm_db/ext/ibm_db.c

@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   |  Licensed Materials - Property of IBM                                |
   |                                                                      |
-  | (C) Copyright IBM Corporation 2006 - 2017                            |
+  | (C) Copyright IBM Corporation 2006 - 2022                            |
   +----------------------------------------------------------------------+
   | Authors: Sushant Koduru, Lynh Nguyen, Kanchana Padmanabhan,          |
   |          Dan Scott, Helmut Tessarek, Sam Ruby, Kellen Bombardier,    |
@@ -12,7 +12,7 @@
   +----------------------------------------------------------------------+
 */
 
-#define MODULE_RELEASE "3.0.5"
+#define MODULE_RELEASE "3.0.6"
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -2885,7 +2885,7 @@ VALUE ruby_ibm_db_createDb_helper(VALUE connection, VALUE dbName, VALUE codeSet,
   VALUE mode_utf16      = Qnil;
 #endif
 
-  int rc;
+  RETCODE rc;
 
   create_drop_db_args *create_db_args = NULL;
   conn_handle *conn_res;
@@ -3041,7 +3041,7 @@ VALUE ruby_ibm_db_dropDb_helper(VALUE connection, VALUE dbName) {
 
   VALUE return_value =  Qfalse;
 
-  int rc;
+  RETCODE rc;
 
   create_drop_db_args *drop_db_args = NULL;
   conn_handle         *conn_res     = NULL;
@@ -9549,8 +9549,6 @@ static VALUE _ruby_ibm_db_bind_fetch_helper(ibm_db_fetch_helper_args *data)
         case SQL_TYPE_DATE:
         case SQL_TYPE_TIME:
         case SQL_TYPE_TIMESTAMP:
-        case SQL_BIGINT:
-
           if ( op & FETCH_ASSOC ) {
             rb_hash_aset(return_value, colName, rb_str_new2((char *)row_data->str_val));
           }
@@ -9561,6 +9559,17 @@ static VALUE _ruby_ibm_db_bind_fetch_helper(ibm_db_fetch_helper_args *data)
           }
           break;
 
+        case SQL_BIGINT:
+          if ( op & FETCH_ASSOC ) {
+            rb_hash_aset(return_value, colName, LONG2NUM(atol((char *)row_data->str_val)));
+          }
+          if ( op == FETCH_INDEX ) {
+            rb_ary_store(return_value, i, LONG2NUM(atol((char *)row_data->str_val)));
+          } else if ( op == FETCH_BOTH ) {
+            rb_hash_aset(return_value, INT2NUM(i), LONG2NUM(atol((char *)row_data->str_val)));
+          }
+          break;
+
         case SQL_DECIMAL:
         case SQL_NUMERIC:
         case SQL_DECFLOAT:
@@ -9572,22 +9581,36 @@ static VALUE _ruby_ibm_db_bind_fetch_helper(ibm_db_fetch_helper_args *data)
            return Qnil; 
           }
 
-          strcpy(tmpStr, "BigDecimal(\'");
-          strcat(tmpStr, row_data->str_val);
-          strcat(tmpStr, "\')");
+          if ((atof(row_data->str_val) - atol(row_data->str_val)) > 0)
+          {
+            strcpy(tmpStr, "BigDecimal(\'");
+            strcat(tmpStr, row_data->str_val);
+            strcat(tmpStr, "\')");
 
-          if ( op & FETCH_ASSOC ) {
-            rb_hash_aset(return_value, colName, rb_eval_string(tmpStr));
+            if ( op & FETCH_ASSOC ) {
+              rb_hash_aset(return_value, colName, rb_eval_string(tmpStr));
+            }
+            if ( op == FETCH_INDEX ) {
+              rb_ary_store(return_value, i, rb_eval_string(tmpStr) );
+            } else if ( op == FETCH_BOTH ) {
+              rb_hash_aset( return_value, INT2NUM(i), rb_eval_string( tmpStr ) );
+            }
+
+            ruby_xfree(tmpStr);
+            tmpStr = NULL;
           }
-          if ( op == FETCH_INDEX ) {
-            rb_ary_store(return_value, i, rb_eval_string(tmpStr) );
-          } else if ( op == FETCH_BOTH ) {
-            rb_hash_aset( return_value, INT2NUM(i), rb_eval_string( tmpStr ) );
+          else
+          {
+            if ( op & FETCH_ASSOC ) {
+              rb_hash_aset(return_value, colName, LONG2NUM(atol((char *)row_data->str_val)));
+            }
+            if ( op == FETCH_INDEX ) {
+              rb_ary_store(return_value, i, LONG2NUM(atol((char *)row_data->str_val)));
+            } else if ( op == FETCH_BOTH ) {
+              rb_hash_aset(return_value, INT2NUM(i), LONG2NUM(atol((char *)row_data->str_val)));
+            }
           }
 
-          ruby_xfree(tmpStr);
-          tmpStr = NULL;
-
           break;
         case SQL_SMALLINT:
           if ( op & FETCH_ASSOC ) {

IBM_DB_Adapter/ibm_db/ext/ruby_ibm_db_cli.c

@@ -494,6 +494,7 @@ int _ruby_ibm_db_SQLDropDB_helper(create_drop_db_args *data) {
 
   rc = (*sqldropdb)( (SQLHSTMT) data->conn_res->hdbc, data->dbName, (SQLINTEGER)data->dbName_string_len );
 
+  data->rc = rc;
   DLCLOSE( cliLib );
   return rc;
 }