ibm_db 3.0.2-x86-mingw32 → 3.0.3-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9aeb7e6cd0f64d1c84a0d7be4049dd8a18ffcd64
-  data.tar.gz: 9a856f14da707fef0a02f30499f80046c3542854
+  metadata.gz: fc61b87a039dda5ae75c43a0eb6ba61adc422304
+  data.tar.gz: 53e84cbb5eb0936d820120f220d0734c230bedbe
 SHA512:
-  metadata.gz: b74d987fd0cce5dd674910ea9b5f492c2c7c57160196cd15d0e94507ce4a483eb8f7e185bfffbcf0e54b660d1a84069348f5432cb5338bc7d61f68ee3a28e3c3
-  data.tar.gz: 72a7c1fd492d04b853febc647712e1841b9fe162afbc523dc374a8aafd38d0a7d612b2110e121fd025b696edbbf40a5bbeffd09d59e62304f586fe0f74b4e051
+  metadata.gz: 2a7123381b4d70fd4c616fcd646da0f3af0758d78cc4d2819fe7b495ea790f8c1d756b5ac68d56c22b33c32704438a90057945ac3b2c6a7714a663454045bc69
+  data.tar.gz: 8a403dddc0c235b2ea311652729593e16209df06c58bae9cf199e1edd829426557baceca9b5c7de402f258db7a5b5d5d9f177fbc41367119cf81f1ac492b37e6

data/CHANGES

@@ -1,5 +1,8 @@
 Change Log
 ==============
+2016/06/17 (IBM_DB adapter 3.0.3, driver 3.0.3)
+  - Fixed issue #59 - Can't Update Binary Files Using 3.0.x (with Ruby 2.1.0 and Rails 4.2.6) 
+  
 2016/05/24 (IBM_DB adapter 3.0.2, driver 3.0.2)
   - Fixed issue #52 - Invalid foreign key ON UPDATE action specified in schema.rb 
   - Fixed issue #59 - Can't Upload Binary Files Using 3.0.x (with Ruby 2.1.0 and Rails 4.2.6) 

data/ext/ibm_db.c

@@ -12,7 +12,7 @@
   +----------------------------------------------------------------------+
 */
 
-#define MODULE_RELEASE "3.0.2"
+#define MODULE_RELEASE "3.0.3"
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"

data/lib/active_record/connection_adapters/ibm_db_adapter.rb

@@ -770,7 +770,7 @@ module ActiveRecord
 			else
 			  arel
 			end
-		  end
+		  end	
 	end
       # This adapter supports migrations.
       # Current limitations:
@@ -1146,9 +1146,16 @@ module ActiveRecord
         if binds.nil? || binds.empty?
           return insert_direct(sql, name, pk, id_value, sequence_name)
         end
-
+		
+		 new_binds = Hash.new
+		 param_array = binds.map do |column,value|			  
+		   if column && column.sql_type.to_s =~ /binary|blob/i			    			    
+		     new_binds [column] = value
+		   end
+		 end		
+			
         clear_query_cache if defined? clear_query_cache
-        if stmt = exec_insert(sql, name, binds)
+        if stmt = exec_insert(sql, name, new_binds)
           begin
             @sql << sql
             return id_value || @servertype.last_generated_id(stmt)
@@ -1326,8 +1333,15 @@ module ActiveRecord
         if binds.nil? || binds.empty?
           update_direct(sql, name)
         else
-          begin
-            if stmt = exec_query(sql,name,binds)
+          begin			
+			 new_binds = Hash.new
+			 param_array = binds.map do |column,value|			  			  
+			  if column && column.sql_type.to_s =~ /binary|blob/i			    			    
+				new_binds [column] = value
+			  end
+			end						
+			
+            if stmt = exec_query(sql,name,new_binds)			  
               IBM_DB.num_rows(stmt)
             end
           ensure
@@ -1946,10 +1960,11 @@ module ActiveRecord
 	  	  
 	  def foreign_keys(table_name)        
         #fetch the foreign keys of the table using function foreign_keys        
+		#PKTABLE_NAME::  fk_row[2] Name of the table containing the primary key.
 		#PKCOLUMN_NAME:: fk_row[3] Name of the column containing the primary key.		
-		#FKTABLE_NAME:: fk_row[6] Name of the table containing the foreign key.
-		#FKCOLUMN_NAME:: fk_row[7] Name of the column containing the foreign key.		
-		#FK_NAME:: fk_row[11] The name of the foreign key.
+		#FKTABLE_NAME::  fk_row[6] Name of the table containing the foreign key.
+		#FKCOLUMN_NAME:  fk_row[7] Name of the column containing the foreign key.		
+		#FK_NAME:: 		 fk_row[11] The name of the foreign key.
 							
 		table_name = @servertype.set_case(table_name.to_s)
 		foreignKeys = []
@@ -1966,8 +1981,8 @@ module ActiveRecord
 				primary_key: fk_row[3],
 			  }			  			  			  
 			  options[:on_update] = extract_foreign_key_action(fk_row[9])	
-			  options[:on_delete] = extract_foreign_key_action(fk_row[10])		 			  				  
-			  foreignKeys << ForeignKeyDefinition.new(table_name, fk_row[2], options)
+			  options[:on_delete] = extract_foreign_key_action(fk_row[10])		 			  				  			  
+			  foreignKeys << ForeignKeyDefinition.new(fk_row[6], table_name, options) 
             end			
 
           rescue StandardError => fetch_error # Handle driver fetch errors
@@ -2543,12 +2558,14 @@ SET WITH DEFAULT #{@adapter.quote(default)}"
       # This method generates the default blob value specified for 
       # DB2 Dataservers
       def set_binary_default(value)
-        "BLOB('#{value}')"
+        #"BLOB('#{value}')"		
+		"?"
       end
 
       # This method generates the blob value specified for DB2 Dataservers
       def set_binary_value
-        "BLOB('?')"       
+        #"BLOB('?')"
+		"?"
       end
 
       # This method generates the default clob value specified for 

data/lib/mswin32/ibm_db.rb

@@ -105,12 +105,19 @@ elsif (RUBY_VERSION =~ /2.1./)
 elsif (RUBY_VERSION =~ /2.2./ )
 	#Check if we are on 64-bit or 32-bit ruby and load binary accordingly
 	machine_bits = ['ibm'].pack('p').size * 8
-	if machine_bits == 64
-		#require 'rb22x/x64/ibm_db.so'
+	if machine_bits == 64		
 		raise NotImplementedError, "ibm_db with Ruby 2.2 64-bit on Windows platform is not supported. Refer to README for more details"
 	else		
 		require 'rb22x/i386/ibm_db.so'
 	end
+elsif (RUBY_VERSION =~ /2.3./ )
+	#Check if we are on 64-bit or 32-bit ruby and load binary accordingly
+	machine_bits = ['ibm'].pack('p').size * 8
+	if machine_bits == 64		
+		raise NotImplementedError, "ibm_db with Ruby 2.2 64-bit on Windows platform is not supported. Refer to README for more details"
+	else		
+		require 'rb23x/i386/ibm_db.so'
+	end	
 else
 	require 'rb18x/ibm_db.so'
 end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: ibm_db
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
 platform: x86-mingw32
 authors:
 - IBM
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-24 00:00:00.000000000 Z
+date: 2016-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: archive-zip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.0
 description: 
@@ -48,28 +48,29 @@ extra_rdoc_files:
 - MANIFEST
 files:
 - CHANGES
-- ext/extconf.rb
-- ext/ibm_db.c
+- 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/active_record/connection_adapters/ibmdb_adapter.rb
+- lib/IBM_DB.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
-- lib/IBM_DB.rb
 - lib/mswin32/ibm_db.rb
 - lib/mswin32/rb19x/ibm_db.so
 - lib/mswin32/rb21x/i386/ibm_db.so
 - lib/mswin32/rb22x/i386/ibm_db.so
+- lib/mswin32/rb23x/i386/ibm_db.so
 - lib/mswin32/rb2x/i386/ibm_db.so
-- LICENSE
-- MANIFEST
-- ParameterizedQueries README
-- README
 - test/active_record/connection_adapters/fake_adapter.rb
 - test/assets/example.log
 - test/assets/flowers.jpg
@@ -98,13 +99,13 @@ files:
 - test/cases/associations/nested_through_associations_test.rb
 - test/cases/associations/required_test.rb
 - test/cases/associations_test.rb
-- test/cases/attributes_test.rb
 - test/cases/attribute_decorators_test.rb
 - test/cases/attribute_methods/read_test.rb
 - test/cases/attribute_methods/serialization_test.rb
 - test/cases/attribute_methods_test.rb
 - test/cases/attribute_set_test.rb
 - test/cases/attribute_test.rb
+- test/cases/attributes_test.rb
 - test/cases/autosave_association_test.rb
 - test/cases/base_test.rb
 - test/cases/batches_test.rb
@@ -141,8 +142,8 @@ files:
 - test/cases/explain_test.rb
 - test/cases/finder_respond_to_test.rb
 - test/cases/finder_test.rb
-- test/cases/fixtures_test.rb
 - test/cases/fixture_set/file_test.rb
+- test/cases/fixtures_test.rb
 - test/cases/forbidden_attributes_protection_test.rb
 - test/cases/habtm_destroy_order_test.rb
 - test/cases/helper.rb
@@ -159,9 +160,9 @@ files:
 - test/cases/migration/change_schema_test - Copy.rb
 - test/cases/migration/change_schema_test.rb
 - test/cases/migration/change_table_test.rb
-- test/cases/migration/columns_test.rb
 - test/cases/migration/column_attributes_test.rb
 - test/cases/migration/column_positioning_test.rb
+- test/cases/migration/columns_test.rb
 - test/cases/migration/command_recorder_test.rb
 - test/cases/migration/create_join_table_test.rb
 - test/cases/migration/foreign_key_test - Changed.rb
@@ -198,8 +199,8 @@ files:
 - test/cases/relation/where_chain_test.rb
 - test/cases/relation/where_test.rb
 - test/cases/relation/where_test2.rb
-- test/cases/relations_test.rb
 - test/cases/relation_test.rb
+- test/cases/relations_test.rb
 - test/cases/reload_models_test.rb
 - test/cases/result_test.rb
 - test/cases/sanitize_test.rb
@@ -217,9 +218,9 @@ files:
 - test/cases/tasks/sqlite_rake_test.rb
 - test/cases/test_case.rb
 - test/cases/timestamp_test.rb
-- test/cases/transactions_test.rb
 - test/cases/transaction_callbacks_test.rb
 - test/cases/transaction_isolation_test.rb
+- test/cases/transactions_test.rb
 - test/cases/type/decimal_test.rb
 - test/cases/type/integer_test.rb
 - test/cases/type/string_test.rb
@@ -250,16 +251,16 @@ files:
 - test/fixtures/all/developers.yml
 - test/fixtures/all/people.yml
 - test/fixtures/all/tasks.yml
-- test/fixtures/authors.yml
 - test/fixtures/author_addresses.yml
 - test/fixtures/author_favorites.yml
+- test/fixtures/authors.yml
 - test/fixtures/binaries.yml
 - test/fixtures/books.yml
 - test/fixtures/bulbs.yml
 - test/fixtures/cars.yml
+- test/fixtures/categories.yml
 - test/fixtures/categories/special_categories.yml
 - test/fixtures/categories/subsubdir/arbitrary_filename.yml
-- test/fixtures/categories.yml
 - test/fixtures/categories_ordered.yml
 - test/fixtures/categories_posts.yml
 - test/fixtures/categorizations.yml
@@ -274,8 +275,8 @@ files:
 - test/fixtures/dashboards.yml
 - test/fixtures/developers.yml
 - test/fixtures/developers_projects.yml
-- test/fixtures/dogs.yml
 - test/fixtures/dog_lovers.yml
+- test/fixtures/dogs.yml
 - test/fixtures/doubloons.yml
 - test/fixtures/edges.yml
 - test/fixtures/entrants.yml
@@ -290,10 +291,10 @@ files:
 - test/fixtures/jobs.yml
 - test/fixtures/legacy_things.yml
 - test/fixtures/mateys.yml
-- test/fixtures/members.yml
-- test/fixtures/memberships.yml
 - test/fixtures/member_details.yml
 - test/fixtures/member_types.yml
+- test/fixtures/members.yml
+- test/fixtures/memberships.yml
 - test/fixtures/men.yml
 - test/fixtures/minimalistics.yml
 - test/fixtures/minivans.yml
@@ -336,10 +337,10 @@ files:
 - test/fixtures/tags.yml
 - test/fixtures/tasks.yml
 - test/fixtures/teapots.yml
-- test/fixtures/topics.yml
-- test/fixtures/toys.yml
 - test/fixtures/to_be_linked/accounts.yml
 - test/fixtures/to_be_linked/users.yml
+- test/fixtures/topics.yml
+- test/fixtures/toys.yml
 - test/fixtures/traffic_lights.yml
 - test/fixtures/treasures.yml
 - test/fixtures/uuid_children.yml
@@ -378,15 +379,15 @@ files:
 - test/migrations/valid_with_timestamps/20100201010101_valid_with_timestamps_we_need_reminders.rb
 - test/migrations/valid_with_timestamps/20100301010101_valid_with_timestamps_innocent_jointable.rb
 - test/migrations/version_check/20131219224947_migration_version_check.rb
+- test/models/admin.rb
 - test/models/admin/account.rb
 - test/models/admin/randomly_named_c1.rb
 - test/models/admin/user.rb
-- test/models/admin.rb
 - test/models/aircraft.rb
 - test/models/arunit2_model.rb
 - test/models/author.rb
-- test/models/autoloadable/extra_firm.rb
 - test/models/auto_id.rb
+- test/models/autoloadable/extra_firm.rb
 - test/models/binary.rb
 - test/models/bird.rb
 - test/models/book.rb
@@ -446,9 +447,9 @@ files:
 - test/models/man.rb
 - test/models/matey.rb
 - test/models/member.rb
-- test/models/membership.rb
 - test/models/member_detail.rb
 - test/models/member_type.rb
+- test/models/membership.rb
 - test/models/minimalistic.rb
 - test/models/minivan.rb
 - test/models/mixed_case_monkey.rb
@@ -467,9 +468,9 @@ files:
 - test/models/price_estimate.rb
 - test/models/professor.rb
 - test/models/project.rb
+- test/models/publisher.rb
 - test/models/publisher/article.rb
 - test/models/publisher/magazine.rb
-- test/models/publisher.rb
 - test/models/randomly_named_c1.rb
 - test/models/rating.rb
 - test/models/reader.rb
@@ -534,18 +535,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
 - ActiveRecord, at least 4.2.0
 rubyforge_project: rubyibm
-rubygems_version: 2.0.14.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: 'Rails Driver and Adapter for IBM Data Servers: {DB2 on Linux/Unix/Windows,