ibm_db 2.5.9-x86-mswin32-60 → 2.5.10-x86-mswin32-60

data/CHANGES

@@ -1,5 +1,12 @@
 Change Log
 ==============
+2012/05/01 (IBM_DB adapter 2.5.10, driver 2.5.10) :
+  - Support for Rails-3.2
+  - Changes in installation process. Now user should set only one environment variable IBM_DB_HOME to DB2/IBM_Data_Server_Driver installation directory
+  - Fixed bug #29541 - Serialize data when corresponding field maps to CLOB type on Database
+  - Fixed bug #29561 - Fixed data truncation error when client and server codepages are different
+  - Updated IBM_DB specifics of AR test suite as per Rails-3.2.3
+  
 2012/01/03 (IBM_DB adapter 2.5.9, driver 2.5.9) :
   - Support for Create and Drop database on DB2 LUW with DB2 client version V97fp4 and above
   - Fixed bug #29482 - Fixed bigint being returned as string in the adapter

data/README

@@ -1,5 +1,5 @@
 =====================================================================
-README for the IBM_DB Adapter (2.5.9) and Driver (2.5.9) (2012/01/03)
+README for the IBM_DB Adapter (2.5.10) and Driver (2.5.10) (2012/04/30)
 For ActiveRecord Version >= 1.15.5 (and Rails >= 1.2.5)
 =====================================================================
 
@@ -14,11 +14,11 @@ Supported Operating Systems
 
 Supported Databases
 ====================
-  - IBM DB2 Universal Database on Linux/Unix/Windows versions 8 Fixpak15 or 9 Fixpak2 and above
+  - IBM DB2 Universal Database on Linux/Unix/Windows versions 9 Fixpak2 and above
   - Remote connections to IBM DB2 Universal Database on i5/OS versions V5R3 and V5R4. 
     Please ensure PTF SI27358 (includes SI27250) is installed in i5/OS version 5R3 and
     and PTF SI27256 is installed while using i5/OS version 5R4.
-  - Remote connections to IBM DB2 Universal Database on z/OS version 8 and 9
+  - Remote connections to IBM DB2 Universal Database on z/OS version 8, 9 and 10
   - Informix Dynamic Server 11.10 and beyond.
     Please ensure that the IBM DataServer Viper 2 client is installed.
 
@@ -37,32 +37,18 @@ Note : -	1)	If using activerecord version below 2.0 then it requires that the ib
   INSTALL (as Ruby gem)
    To remove previous gem version (optionally):
     D:\>gem uninstall ibm_db
-    Successfully uninstalled ibm_db version 0.6.0
+    Successfully uninstalled ibm_db version 1.0.0
 
   Example:
     D:\>gem install ibm_db
-    Bulk updating gem source index for: http://gems.rubyforge.org
-    Select which gem to install for your platform (i386-mswin32)
-    1. ibm_db 1.0.0 (mswin32)
-    2. ibm_db 1.0.0 (ruby)
-    3. ibm_db 0.10.0 (mswin32)
-    4. ibm_db 0.10.0 (ruby)
-
-  Running gem install ibm_db you are presented with two choices for each release 
-  (mswin32 or ruby)choose mswin32. This will install the IBM_DB gem containing 
-  the pre-built binary file of the driver which is a C-extension of Ruby.
-
-  TEST (simple gem install verification)
-   Note: The manual step after install if using activerecord version below 2.0:
+    Fetching: ibm_db-2.5.9-x86-mingw32.gem (100%)
+    Successfully installed ibm_db-2.5.9-x86-mingw32
+    1 gem installed
+    Installing ri documentation for ibm_db-2.5.9-x86-mingw32...
+    Installing RDoc documentation for ibm_db-2.5.9-x86-mingw32...
+    
+    Note: The manual step after install if using activerecord version below 2.0:
          add ibm_db into GEM_HOME\1.8\gems\activerecord-1.15.3\lib\active_record.rb (Line 77)
-   D:\rails NewApp
-   D:\cd NewApp      
-   D:\NewApp>irb
-     irb(main):001:0> gem 'ibm_db'
-     irb(main):002:0> require 'mswin32/ibm_db'   // notice the [mswin32] in the library path
-     irb(main):003:0> IBM_DB.connect 'sample', 'db2admin', 'secret'
-   D:\NewApp>ruby script\console
-
 
 2. Linux and Unix platforms:
 ============================
@@ -75,32 +61,13 @@ Note : -	1)	If using activerecord version below 2.0 then it requires that the ib
    Note: DB2 environment is required while using an arbitrary user account
          (other than the DB2 install user account)
    $ . /home/db2inst1/sqllib/db2profile
-   $ export IBM_DB_INCLUDE=DB2HOME/include (eg. /home/db2inst1/sqllib/include or /opt/ibm/db2/v9.5/include)
-   $ export IBM_DB_LIB=DB2HOME/lib     (eg. /home/db2inst1/sqllib/lib or /opt/ibm/db2/V9.5/lib32)
+   $ export IBM_DB_DIR=DB2HOME (eg. /home/db2inst1/sqllib or /opt/ibm/db2/v9.5)
    $ gem install ibm_db
-     Select which gem to install for your platform (i686-linux)
-     1. ibm_db 1.0.0 (mswin32)
-     2. ibm_db 1.0.0 (ruby)
-     3. ibm_db 0.10.0 (ruby)
-     4. ibm_db 0.10.0 (mswin32)
-     ...
-     Running gem install ibm_db you are presented with two choices for each release
-     (mswin32 or ruby) choose ruby. This will build the native extension (ibm_db driver) and installs the ibm_db gem.
-     ...
-     > 2
      Building native extensions.  This could take a while...
-     Successfully installed ibm_db-0.6.5
-     Installing ri documentation for ibm_db-0.6.5...
-     Installing RDoc documentation for ibm_db-0.6.5...
-     
-  TEST (simple gem install verification)
-   Note: The manual step after install, if using activerecord version below 2.0 is:
-         add ibm_db into GEM_HOME\1.8\gems\activerecord-1.15.3\lib\active_record.rb (Line 77)
-   $ irb
-     irb(main):001:0> gem 'ibm_db'
-     irb(main):002:0> require 'ibm_db'    // notice the library path (different on win32, use require 'mswin32/ibm_db')
-     irb(main):003:0> IBM_DB.connect 'sample', 'db2admin', 'secret'
-   $ 
+     Successfully installed ibm_db-2.5.9
+     1 gem installed
+     Installing ri documentation for ibm_db-2.5.9...
+     Installing RDoc documentation for ibm_db-2.5.9...
 
   BUILD (optionally) ibm_db gem  from sources (ibm_db-x.x.x.tar.gz):
   1. Download source from Rubyforge
@@ -109,80 +76,84 @@ Note : -	1)	If using activerecord version below 2.0 then it requires that the ib
      $ cd IBM_DB_Adapter/ibm_db
      $ gem build IBM_DB.gemspec
 
+   Note: The manual step after install if using activerecord version below 2.0:
+         add ibm_db into GEM_HOME\1.8\gems\activerecord-1.15.3\lib\active_record.rb (Line 77)
 
+TEST (simple gem install verification)
+======================================
+   $ rails new myApp -d ibm_db
+   $ cd myApp      
+   $ rails generate scaffold Wood name:string price:float
+   $ vi config/database.yml
+   $ rake db:migrate
+   $ rails console #rails server
+   
 Instructions for building and installing the IBM_DB driver from source
 =======================================================================
 Building the driver manually as described below is not required if the install
 process above has been pursued. This manual procedure is in fact automated
 on Linux and UNIX platforms by the IBM_DB gem install, but is presented
-here only for reference, and also involves running the unit tests.
+here only for reference.
 
  Prerequisites:
   Install Ruby from:
     http://rubyforge.org
 
-  Linux and Unix platforms:
-   Note: commands may vary depending on the shell used
-    - To setup DB2 environment while using an arbitrary user account
-      (other than the DB2 install user account):
-      Example:
-        $ . /home/db2inst1/sqllib/db2profile
-
-    - To configure test database:
-      DB2 v9.x: some IBM_DB driver tests require a UTF-8 database:
-        $ db2 CREATE DATABASE testdrv USING CODESET UTF-8 \
-          TERRITORY US COLLATE USING SYSTEM PAGESIZE 32768 
-      DB2 v8.x: driver tests 195 and 52949 requires XML functionality
-      only available in DB2 v9.x
-
-    - To configure database connection parameters edit config.yaml
-      Example:
-        database: testdrv 
-        user:     db2inst1
-        password: password
-        hostname: localhost
-        port:     50000
-
-    - To compile and link with DB2 client libraries:
-       $ export IBM_DB_INCLUDE=DB2HOME/include (eg. /home/db2inst1/sqllib/include or /opt/ibm/db2/v9.5/include)
-       $ export IBM_DB_LIB=DB2HOME/lib     (eg. /home/db2inst1/sqllib/lib or /opt/ibm/db2/V9.5/lib32)
-
-  Windows platforms:
-    - Install Visual C++ 2005, Platform SDK (latest), .Net SDK (latest)
-    - Set environment:
-      CALL "C:\Program Files\Microsoft Platform SDK for Windows Server 2005\SetEnv.Cmd"
-      CALL "C:\Program Files\Microsoft Visual C++ Toolkit 2005\vcvars32.bat"
-      SET LIB=%LIB%;C:\Program Files\Microsoft Visual Studio .NET 2005\Vc8\lib
-    - To configure database connection parameters edit config.yml
+  Setup the environment
   
- Build and Execution:
-  rake 
-
- Execution of tests without compilation (must have .so in ibm_db source directory):
-  rake onlytests
-
- Execution of a single test inside the tests directory can be done by the following:
-  export SINGLE_RUBY_TEST=test_001_CtlgConn.rb
-  rake 
-
+    Linux and Unix platforms:
+     Note: commands may vary depending on the shell used
+      - To setup DB2 environment while using an arbitrary user account
+        (other than the DB2 install user account):
+        Example:
+          $ . /home/db2inst1/sqllib/db2profile
+
+      - To compile and link with DB2 client libraries:
+         $ export IBM_DB_DIR=DB2HOME (eg. /home/db2inst1/sqllib or /opt/ibm/db2/v9.5)
+
+    Windows platforms:
+      - Set ruby devkit environment:
+      - To compile and link with DB2 client libraries:
+         $ set IBM_DB_DIR=DB2HOME (eg. C:\Program Files\IBM\SQLLIB)
+    
+  Build the driver:
+    - $ cd rubyibm_source/IBM_DB_Adapter/ibm_db/ext
+    - $ ruby extconf.rb
+    - $ make
+
+  Build the ibm_db gem
+    - $ cp rubyibm_source/IBM_DB_Adapter/ibm_db/ext/ibm_db.so rubyibm_source/IBM_DB_Adapter/ibm_db/lib 
+    	# Not on windows separate binaries are generated for 1.8 and 1.9 version of ruby
+    	# and placed under rb18x and rb19x directories respectively. The file ibm_db_mswin32.rb is renamed to ibm_db.rb to ensure proper binary is loaded based on runtime
+    	# You will need to similarly ensure that the generated binary is placed on rb18x or rb19x directory under lib based on ruby version being used
+    - $ cd rubyibm_source/IBM_DB_Adapter/ibm_db
+    - $ gem build IBM_DB.gemspec
+    
+Running tests
+=============
+Testing the IBM_DB Adapter
+
+1) a) Copy the files under test directory of ibm_db gem to the test directory of Activerecord following the same directory structure. 
+	These files contain modifications in some test files of AR suite to handle ibm_db specifics. Hence make sure these files are replaced in the AR test suite properly.
+   b) Rename warhouse-things.yml to warehouse_things.yml under fixtures directory
+2) Edit the Rakefile to include ibm_db in list of adapters
+	%w( mysql mysql2 postgresql sqlite3 sqlite3_mem firebird db2 oracle sybase openbase ibm_db frontbase jdbcmysql jdbcpostgresql jdbcsqlite3 jdbcderby jdbch2 jdbchsqldb )
+3) Configure the connection information in test/config.yml for ibm_db
+4) run the test suite - rake test_ibm_db
+
+Running IBM_DB driver test suite
+
+1) Copy over the test directory under source to lib directory of installed ibm_db under $GEM_HOME
+2) Edit config.yml file to provide database connection information
+3) Run the test suite
+	$ rake onlytests
+4) To run single test
+	export SINGLE_RUBY_TEST=<test file name> #Eg: export SINGLE_RUBY_TEST=test_000_PrepareDb.rb
+	rake onlytests
 
 Limitations and known problems
 ==============================
- - ActiveRecord rename_column method is not supported for DB2 LUW, zOS and i5
  - ActiveRecord remove_column method is not supported for DB2 zOS
- - The following tests from the ActiveRecord 1.15.3 test suite with ibm_db gem < 0.9.5 are expected to fail
-    - test_limited_eager_with_multiple_order_columns
-    - test_limited_eager_with_order
-    - test_assign_ids_ignoring_blanks
-    - test_build_by_new_record
-    - test_get_ids
-    - test_select_limited_ids_list
-    - test_add_index
- - The following tests from the driver test suite are expected to fail on DB2 version 8
-   on Linux/Unix/Windows and Informix Dynamic Server because of missing native XML support. If you want to
-   make use of the native XML features in DB2, please upgrade to version 9 or later
-    - test_195.rb
-    - test_52949.rb
  - The driver returns an error when you try to insert a TIMESTAMP value into a DATE column. 
    To fix this, please ensure that the following configuration keyword PATCH2=58 is set 
    in the COMMON section of your DB2 CLI initialization file (db2cli.ini):
@@ -191,7 +162,7 @@ Limitations and known problems
    Please refer to http://publib.boulder.ibm.com/infocenter/db2luw/v9/topic/com.ibm.db2.udb.apdv.cli.doc/doc/c0007882.htm
    for more information.
  - The behaviour of ActiveRecord::Base.find(:first) without an :order attribute can be unpredictable.
-   The first record (i.e. the record with the minimum id) may be not be retrieved. In a relational model,
+   The first record (i.e. the record with the minimum id) may be not retrieved. In a relational model,
    the order of the rows returned is unpredictable and independent of the order of insertion.
    This issue may be addressed in a future release. 
  - Rails applications on DB2 9 require the APPLHEAPSZ database configuration parameter to be
@@ -202,32 +173,17 @@ Limitations and known problems
    To enable this parameter, you need to restart your DB2 instance.
  - If you see connectivity issues with Informix Dynamic Server, please ensure that the server is configured to accept DRDA connections.
    Please refer to http://publib.boulder.ibm.com/infocenter/idshelp/v111/index.jsp?topic=/com.ibm.admin.doc/admin154.htm for more information.
- - The following tests from the ActiveRecord 1.15.3 test suite with ibm_db gem < 0.9.5 are expected to fail on Informix Dynamic Server
-    - test_quote
-    - test_to_xml
-    - test_should_calculate_grouped_by_function
-    - test_should_calculate_grouped_by_function_with_table_alias
-    - test_inserts_with_pre_and_suffix
-    - test_add_table_with_decimals
-    - test_no_limits_datatypes_IBM_DB
-    - test_instance_update_should_quote_pkey
-    - test_integer_columns
-    - test_arguments_line_up
-    - test_no_dump_errors
-    - test_schema_dump_includes_decimal_options
  - IBM_DB is not supported on JRuby. As stated in the JRuby Wiki, "Basics of Getting JRuby Running":
    'You may install other gems, but keep in mind that libraries with C extension dependencies 
    will not work in JRuby.' http://www.headius.com/jrubywiki/index.php/Getting_Started
    The IBM_DB adapter relies on IBM_DB driver (C extension) and the IBM Driver for ODBC and
    CLI to access databases on IBM data servers. Alternatively, you can either use the regular C
    implementation of Ruby, or use ActiveRecord-JDBC adapter to access databases.
- - Query caching feature of ActiveRecord-2.0 not supported 
  - When using ActiveRecord-2.1.0 it requires that ActiveRecord be patched, with the patch in the link below:
  		http://rails.lighthouseapp.com/attachments/26975/association_preloading.diff
  	The patch is required because, ActiveRecord 2.1.0 generates a non-standard SQL identifier,while preloading has_and_belongs_to_many associations,
  	which standard compliant databases like DB2 do not support. The bug report, against ActiveRecord, can be found in the link below
  		http://rails.lighthouseapp.com/projects/8994/tickets/394-patch-fixed-non-standard-sql-generated-by-preloading-has_and_belongs_to_many-associations
- - ActiveRecord-2.1.0 test suite changes appropriate for DB2/IDS will be updated in the next release of the gem.(Updated in release 0.10.0)
  - The following tests from the ActiveRecord 2.1.0 test suite with ibm_db gem 0.10.0 are expected to fail on DB2 LUW
  	- test_read_attributes_before_type_cast_on_datetime
  	- test_to_xml
@@ -241,24 +197,6 @@ Limitations and known problems
  			the complete suite. However they pass when run standalone.
  		2)	Also there are two test cases (test_validate_uniqueness_with_non_standard_table_names, test_update_all_with_non_standard_table_name)which run against table with non-standard name. Given that DB2/IDS is standard compliant these test cases are expected to fail.
  			To have these test cases passing rename the fixtures file warehouse-things to warehouse_things.
- - The following tests from the ActiveRecord 2.1.0 test suite with ibm_db gem 0.10.0 are expected to fail on Informix Dynamic Server
- 	- test_attributes_on_dummy_time
- 	- test_quote
- 	- test_read_attributes_before_type_cast_on_datetime
- 	- test_save_for_record_with_only_primary_key
- 	- test_save_for_record_with_only_primary_key_that_is_provided
- 	- test_to_xml
- 	- test_utc_as_time_zone
- 	- test_should_calculate_grouped_by_function
- 	- test_should_calculate_grouped_by_function_with_table_alias
- 	- test_include_query
- 	- test_binary_in_fixtures
- 	- test_inserts_with_pre_and_suffix
- 	- test_create
- 	- test_add_column_with_precision_and_scale
- 	- test_add_table_with_decimals
- 	- test_native_types
- 	- test_schema_dump_includes_decimal_options
  - Usage with Rails-3.0.3/Rails-3.0.4
 	- To use with Rails-3.0.3/4 patch latest Arel with the patch available at https://gist.github.com/814491
 	

data/ext/extconf.rb

@@ -3,19 +3,81 @@
 # +----------------------------------------------------------------------+
 # |  Licensed Materials - Property of IBM                                |
 # |                                                                      |
-# | (C) Copyright IBM Corporation 2006, 2007,2008                        |
+# | (C) Copyright IBM Corporation 2006 - 2012                            |
 # +----------------------------------------------------------------------+
 
-require 'mkmf'
 WIN = RUBY_PLATFORM =~ /mswin/ || RUBY_PLATFORM =~ /mingw/
 
-# use ENV['DB2DIR'] or latest db2 you can find
-# (we need to revisit default when db2 10.x comes out)
-IBM_DB_INCLUDE = (ENV['IBM_DB_INCLUDE'] or 
-          (Dir['/opt/*/db2/*/include'].sort_by {|f| File.basename(f)}).last )
-IBM_DB_LIB = (ENV['IBM_DB_LIB'] or
-           (Dir['/opt/*/db2/*/lib32'].sort_by {|f| File.basename(f)}).last )
-           
+# use ENV['IBM_DB_HOME'] or latest db2 you can find
+IBM_DB_HOME = ENV['IBM_DB_HOME']
+
+machine_bits = ['ibm'].pack('p').size * 8
+
+is64Bit = true
+
+module Kernel
+  def suppress_warnings
+    origVerbosity = $VERBOSE
+    $VERBOSE = nil
+    result = yield
+    $VERBOSE = origVerbosity
+    return result
+  end
+end
+
+if machine_bits == 64
+  is64Bit = true
+  puts "Detected 64-bit Ruby\n "
+else
+  is64Bit = false
+  puts "Detected 32-bit Ruby\n "
+end
+
+if(IBM_DB_HOME == nil || IBM_DB_HOME == '')
+  IBM_DB_INCLUDE = ENV['IBM_DB_INCLUDE']
+  IBM_DB_LIB = ENV['IBM_DB_LIB']
+  
+  if( ( (IBM_DB_INCLUDE.nil?) || (IBM_DB_LIB.nil?) ) ||
+      ( IBM_DB_INCLUDE == '' || IBM_DB_LIB == '' )
+	)
+    puts "Environment variable IBM_DB_HOME is not set. Set it to your DB2/IBM_Data_Server_Driver installation directory and retry gem install.\n "
+    exit 1
+  end
+else
+  IBM_DB_INCLUDE = "#{IBM_DB_HOME}/include"
+  
+  if(is64Bit)
+    IBM_DB_LIB="#{IBM_DB_HOME}/lib64"
+  else
+    IBM_DB_LIB="#{IBM_DB_HOME}/lib32"
+  end
+end
+
+if( !(File.directory?(IBM_DB_LIB)) )
+  suppress_warnings{IBM_DB_LIB = "#{IBM_DB_HOME}/lib"}
+  if( !(File.directory?(IBM_DB_LIB)) )
+    puts "Cannot find #{IBM_DB_LIB} directory. Check if you have set the IBM_DB_HOME environment variable's value correctly\n "
+	exit 1
+  end
+  notifyString  = "Detected usage of IBM Data Server Driver package. Ensure you have downloaded "
+  
+  if(is64Bit)
+    notifyString = notifyString + "64-bit package "
+  else
+    notifyString = notifyString + "32-bit package "
+  end
+  notifyString = notifyString + "of IBM_Data_Server_Driver and retry the 'gem install ibm_db' command\n "
+  
+  puts notifyString
+end
+
+if( !(File.directory?(IBM_DB_INCLUDE)) )
+  puts " #{IBM_DB_HOME}/include folder not found. Check if you have set the IBM_DB_HOME environment variable's value correctly\n "
+  exit 1
+end
+
+require 'mkmf'
+
 dir_config('IBM_DB',IBM_DB_INCLUDE,IBM_DB_LIB)
 
 def crash(str)
@@ -30,18 +92,17 @@ end
 
 unless (have_library(WIN ? 'db2cli' : 'db2','SQLConnect') or find_library(WIN ? 'db2cli' : 'db2','SQLConnect', IBM_DB_LIB))
   crash(<<EOL)
-Unable to locate DB2 libraries.
+Unable to locate libdb2.so/a under #{IBM_DB_LIB}
 
 Follow the steps below and retry
 
 Step 1: - Install IBM DB2 Universal Database Server/Client
 
-step 2: - Set the environment variables IBM_DB_INCLUDE and IBM_DB_LIB as below 
+step 2: - Set the environment variable IBM_DB_HOME as below
         
              (assuming bash shell)
         
-             export IBM_DB_INCLUDE=DB2HOME/include (eg. /home/db2inst1/sqllib/include or /opt/ibm/db2/v9.5/include)
-             export IBM_DB_LIB=DB2HOME/lib     (eg. /home/db2inst1/sqllib/lib or /opt/ibm/db2/V9.5/lib32)
+             export IBM_DB_HOME=<DB2/IBM_Data_Server_Driver installation directory> #(Eg: export IBM_DB_HOME=/opt/ibm/db2/v10)
 
 step 3: - Retry gem install
         

data/ext/ibm_db.c

@@ -12,7 +12,7 @@
   +----------------------------------------------------------------------+
 */
 
-#define MODULE_RELEASE "2.5.9"
+#define MODULE_RELEASE "2.5.10"
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1740,6 +1740,13 @@ static int _ruby_ibm_db_bind_column_helper(stmt_handle *stmt_res)
            */
           bindCol_args->buff_length     =  bindCol_args->buff_length * 2;
         }
+		
+        if( column_type == SQL_CHAR || column_type == SQL_VARCHAR ) {
+          /* Multiply the size by 4 to handle cases where client and server code pages are different.
+           * 4 bytes should be able to cover any codeset character known*/
+          bindCol_args->buff_length     =  bindCol_args->buff_length * 4;
+        }
+		
         row_data->str_val             =  ALLOC_N(char, bindCol_args->buff_length);
 #endif
         bindCol_args->TargetValuePtr  =  row_data->str_val;
@@ -8846,6 +8853,14 @@ static VALUE _ruby_ibm_db_result_helper(ibm_db_result_args *data) {
           */
         in_length = in_length * 2;
       }
+	  
+      if( column_type == SQL_CHAR || column_type == SQL_VARCHAR ) {
+          /* Multiply size by 4 to handle different client and server codepages.
+           * factor of 4 should suffice as known characters today well fit in 4 bytes.
+           */
+        in_length = in_length * 4;
+      }
+	  
       out_ptr = (SQLPOINTER)ALLOC_N(char,in_length);
       memset(out_ptr, '\0', in_length);
 #endif
@@ -8871,7 +8886,7 @@ static VALUE _ruby_ibm_db_result_helper(ibm_db_result_args *data) {
 #ifdef UNICODE_SUPPORT_VERSION
         return_value = _ruby_ibm_db_export_sqlwchar_to_utf8_rstr(out_ptr, out_length);
 #else
-        return_value = rb_str_new2((char*)out_ptr);
+        return_value = rb_str_new((char*)out_ptr, out_length);
 #endif
         ruby_xfree( out_ptr );
         out_ptr = NULL;
@@ -9379,20 +9394,20 @@ static VALUE _ruby_ibm_db_bind_fetch_helper(ibm_db_fetch_helper_args *data)
 #ifdef UNICODE_SUPPORT_VERSION
             rb_hash_aset(return_value, colName, _ruby_ibm_db_export_sqlwchar_to_utf8_rstr(row_data->str_val, out_length ));
 #else
-            rb_hash_aset(return_value, colName, rb_str_new2((char *)row_data->str_val));
+            rb_hash_aset(return_value, colName, rb_str_new((char *)row_data->str_val, out_length));
 #endif
           }
           if ( op == FETCH_INDEX ) {
 #ifdef UNICODE_SUPPORT_VERSION
             rb_ary_store(return_value, i, _ruby_ibm_db_export_sqlwchar_to_utf8_rstr(row_data->str_val, out_length ));
 #else
-            rb_ary_store(return_value, i, rb_str_new2((char *)row_data->str_val));
+            rb_ary_store(return_value, i, rb_str_new((char *)row_data->str_val, out_length));
 #endif
           } else if ( op == FETCH_BOTH ) {
 #ifdef UNICODE_SUPPORT_VERSION
             rb_hash_aset(return_value, INT2NUM(i), _ruby_ibm_db_export_sqlwchar_to_utf8_rstr(row_data->str_val, out_length ));
 #else
-            rb_hash_aset(return_value, INT2NUM(i), rb_str_new2((char *)row_data->str_val));
+            rb_hash_aset(return_value, INT2NUM(i), rb_str_new((char *)row_data->str_val, out_length));
 #endif
           }
           break;