ibm_db 2.5.17-universal-darwin-13 → 2.5.18-universal-darwin-13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7fea2b65f9dd0e6630bb1b017972f536350a5f2e
-  data.tar.gz: dc5e7850a3e1b3a7e2bdc637b59db9e55ce88f19
+  metadata.gz: 2b2eedce5130575df772ad881a0cdf64d5873c6f
+  data.tar.gz: 09d2c19de6922abdd25c5d741a4c8071831bb9ff
 SHA512:
-  metadata.gz: f6c5e50515a452bc6138af2a7a7635b21beb971f66f8008aedf825474be2105176b792339fd94d76418aebc48431b62e5047f60f8deead75ec9d2149cc29141e
-  data.tar.gz: da381ee2f22873eee644210b0c86bb0ba8a68de84ee9b9378fde1618f96409388c623158e4b3e097a77870e8d12c3f0574c8353d4f5484cb8c2a98635f1a7eca
+  metadata.gz: f2fdf68cfd2e4e4b346b24ba4111cffae48bf85e47dda2699af32266af74405c9ced68069cc91991eb50506744acf33dc6651de38d0fdf661fe438d19d02f4ff
+  data.tar.gz: 09fdf52f59b67debc4c21614889ad462b706061cc29af1ee1c17eedc655b63ed97d573d89871690cc46fc8c193fa8f7ff37a250dfd05982b097c6b955851f34d

data/CHANGES

@@ -1,5 +1,9 @@
 Change Log
 ==============
+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
+
 2014/03/03 (IBM_DB adapter 2.5.17, driver 2.5.14) :
   - Shipping binaries compatible with Ruby 2.0 for linux x86_64 systems (#29871)
   - Fixed #29869

data/ext/extconf.rb

@@ -1,4 +1,9 @@
 #!/usr/bin/env ruby
+require 'net/http'
+require 'open-uri'
+require 'rubygems/package'
+require 'zlib'
+require 'fileutils'
 
 # +----------------------------------------------------------------------+
 # |  Licensed Materials - Property of IBM                                |
@@ -6,6 +11,8 @@
 # | (C) Copyright IBM Corporation 2006 - 2012                            |
 # +----------------------------------------------------------------------+
 
+TAR_LONGLINK = '././@LongLink'
+
 WIN = RUBY_PLATFORM =~ /mswin/ || RUBY_PLATFORM =~ /mingw/
 
 # use ENV['IBM_DB_HOME'] or latest db2 you can find
@@ -15,6 +22,14 @@ machine_bits = ['ibm'].pack('p').size * 8
 
 is64Bit = true
 
+if machine_bits == 64
+  is64Bit = true
+  puts "Detected 64-bit Ruby\n "
+else
+  is64Bit = false
+  puts "Detected 32-bit Ruby\n "
+end
+
 module Kernel
   def suppress_warnings
     origVerbosity = $VERBOSE
@@ -25,12 +40,102 @@ module Kernel
   end
 end
 
-if machine_bits == 64
-  is64Bit = true
-  puts "Detected 64-bit Ruby\n "
-else
-  is64Bit = false
-  puts "Detected 32-bit Ruby\n "
+DOWNLOADLINK = ''
+
+if(RUBY_PLATFORM =~ /aix/i)
+  #AIX
+  if(is64Bit)
+        puts "Detected platform - aix 64"
+        DOWNLOADLINK = "http://public.dhe.ibm.com/ibmdl/export/pub/software/data/db2/drivers/odbc_cli/aix64_odbc_cli.tar.gz"
+  else
+        puts "Detected platform - aix 32"
+        DOWNLOADLINK = "http://public.dhe.ibm.com/ibmdl/export/pub/software/data/db2/drivers/odbc_cli/aix32_odbc_cli.tar.gz"
+  end
+elsif (RUBY_PLATFORM =~ /powerpc/ || RUBY_PLATFORM =~ /ppc/)
+  #PPC
+  if(is64Bit)
+        puts "Detected platform - ppc linux 64"
+        DOWNLOADLINK = "http://public.dhe.ibm.com/ibmdl/export/pub/software/data/db2/drivers/odbc_cli/ppc64_odbc_cli.tar.gz"
+  else
+        puts "Detected platform - ppc linux 64"
+        DOWNLOADLINK = "http://public.dhe.ibm.com/ibmdl/export/pub/software/data/db2/drivers/odbc_cli/ppc32_odbc_cli.tar.gz"
+  end
+elsif (RUBY_PLATFORM =~ /linux/)
+  #x86
+  if(is64Bit)
+        puts "Detected platform - linux x86 64"
+	DOWNLOADLINK = "http://public.dhe.ibm.com/ibmdl/export/pub/software/data/db2/drivers/odbc_cli/linuxx64_odbc_cli.tar.gz"
+  else
+        puts "Detected platform - linux 32"
+        DOWNLOADLINK = "http://public.dhe.ibm.com/ibmdl/export/pub/software/data/db2/drivers/odbc_cli/linuxia32_odbc_cli.tar.gz"
+  end
+elsif (RUBY_PLATFORM =~ /sparc/i)
+  #Solaris
+  if(is64Bit)
+        puts "Detected platform - sun sparc64"
+        DOWNLOADLINK = "http://public.dhe.ibm.com/ibmdl/export/pub/software/data/db2/drivers/odbc_cli/sun64_odbc_cli.tar.gz"
+  else
+        puts "Detected platform - sun sparc32"
+        DOWNLOADLINK = "http://public.dhe.ibm.com/ibmdl/export/pub/software/data/db2/drivers/odbc_cli/sun32_odbc_cli.tar.gz"
+  end
+elsif (RUBY_PLATFORM =~ /solaris/i)
+  if(is64Bit)
+        puts "Detected platform - sun amd64"
+        DOWNLOADLINK = "http://public.dhe.ibm.com/ibmdl/export/pub/software/data/db2/drivers/odbc_cli/sunamd64_odbc_cli.tar.gz"
+  else
+        puts "Detected platform - sun amd32"
+        DOWNLOADLINK = "http://public.dhe.ibm.com/ibmdl/export/pub/software/data/db2/drivers/odbc_cli/sunamd32_odbc_cli.tar.gz"
+  end
+end
+
+def downloadCLIPackage(destination, link = nil)
+  if(link.nil?)
+    downloadLink = DOWNLOADLINK
+  else
+    downloadLink = link
+  end
+
+  uri = URI.parse(downloadLink)
+  filename = "#{destination}/clidriver.tar.gz"
+
+  headers = {
+    'Accept-Encoding' => 'identity',
+  }
+
+  request = Net::HTTP::Get.new(uri.request_uri, headers)
+  http = Net::HTTP.new(uri.host, uri.port)
+  response = http.request(request)
+
+  f = open(filename, 'wb')
+  f.write(response.body)
+  f.close()
+
+  filename
+end
+
+def untarCLIPackage(archive,destination)
+  Gem::Package::TarReader.new( Zlib::GzipReader.open(archive) ) do |tar|
+    tar.each do |entry|
+      file = nil
+      if entry.full_name == $TAR_LONGLINK
+        file = File.join destination, entry.read.strip
+        next
+      end
+      file ||= File.join destination, entry.full_name
+      if entry.directory?
+        File.delete file if File.file? file
+        FileUtils.mkdir_p file, :mode => entry.header.mode, :verbose => false
+      elsif entry.file?
+        FileUtils.rm_rf file if File.directory? file
+        File.open file, "wb" do |f|
+          f.print entry.read
+        end
+        FileUtils.chmod entry.header.mode, file, :verbose => false
+      elsif entry.header.typeflag == '2' #Symlink!
+        File.symlink entry.header.linkname, file
+      end
+    end
+  end
 end
 
 if(IBM_DB_HOME == nil || IBM_DB_HOME == '')
@@ -40,8 +145,21 @@ if(IBM_DB_HOME == nil || IBM_DB_HOME == '')
   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
+	if(!DOWNLOADLINK.nil? && !DOWNLOADLINK.empty?)
+		puts "Environment variable IBM_DB_HOME is not set. Downloading and setting up the DB2 client driver\n"
+		destination = "#{File.expand_path(File.dirname(File.dirname(__FILE__)))}/../lib"
+	
+		archive = downloadCLIPackage(destination)
+		untarCLIPackage(archive,destination)
+	
+		IBM_DB_HOME="#{destination}/clidriver"
+	
+		IBM_DB_INCLUDE = "#{IBM_DB_HOME}/include"
+		IBM_DB_LIB="#{IBM_DB_HOME}/lib"
+	else
+		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
   end
 else
   IBM_DB_INCLUDE = "#{IBM_DB_HOME}/include"
@@ -111,14 +229,16 @@ end
 
 alias :libpathflag0 :libpathflag
 def libpathflag(libpath)
-  libpathflag0 + case Config::CONFIG["arch"]
+  ldflags =  case Config::CONFIG["arch"]
     when /solaris2/
       libpath[0..-2].map {|path| " -R#{path}"}.join
     when /linux/
-      libpath[0..-2].map {|path| " -Wl,-rpath,#{path}"}.join
+      libpath[0..-2].map {|path| " -R#{path} "}.join
     else
       ""
   end
+  #libpathflag0 + " '-Wl,-R$$ORIGIN/clidriver/lib #{ldflags}' "
+  libpathflag0 + " '-Wl,-R$$ORIGIN/clidriver/lib' "
 end
 
 have_header('gil_release_version')

data/lib/active_record/connection_adapters/ibm_db_adapter.rb

@@ -64,9 +64,9 @@ module ActiveRecord
     # the actual large object through a prepared statement (param binding).
     after_save :handle_lobs
     def handle_lobs()
-      if connection.kind_of?(ConnectionAdapters::IBM_DBAdapter)
+      if self.class.connection.kind_of?(ConnectionAdapters::IBM_DBAdapter)
         # Checks that the insert or update had at least a BLOB, CLOB or XML field
-        connection.sql.each do |clob_sql|
+        self.class.connection.sql.each do |clob_sql|
           if clob_sql =~ /BLOB\('(.*)'\)/i || 
              clob_sql =~ /@@@IBMTEXT@@@/i || 
              clob_sql =~ /@@@IBMXML@@@/i ||
@@ -119,20 +119,20 @@ module ActiveRecord
             values << self[self.class.primary_key.downcase]
 
             begin
-              unless stmt = IBM_DB.prepare(connection.connection, update_query)
-                error_msg = IBM_DB.getErrormsg( connection.connection, IBM_DB::DB_CONN )
+              unless stmt = IBM_DB.prepare(self.class.connection.connection, update_query)
+                error_msg = IBM_DB.getErrormsg( self.class.connection.connection, IBM_DB::DB_CONN )
                 if error_msg && !error_msg.empty?
                   raise "Statement prepare for updating LOB/XML column failed : #{error_msg}"
                 else
                   raise StandardError.new('An unexpected error occurred during update of LOB/XML column')
                 end
               end
-              connection.log_query(update_query,'update of LOB/XML field(s)in handle_lobs')
+              self.class.connection.log_query(update_query,'update of LOB/XML field(s)in handle_lobs')
 
               # rollback any failed LOB/XML field updates (and remove associated marker)
               unless IBM_DB.execute(stmt, values)
                 error_msg = "Failed to insert/update LOB/XML field(s) due to: #{IBM_DB.getErrormsg( stmt, IBM_DB::DB_STMT )}"
-                connection.execute("ROLLBACK")
+                self.class.connection.execute("ROLLBACK")
                 raise error_msg
               end
             rescue StandardError => error
@@ -142,7 +142,7 @@ module ActiveRecord
             end
           end # if clob_sql
         end #connection.sql.each
-        connection.handle_lobs_triggered = true
+        self.class.connection.handle_lobs_triggered = true
       end # if connection.kind_of?
     end # handle_lobs
     private :handle_lobs
@@ -279,7 +279,7 @@ module ActiveRecord
 
   module ConnectionAdapters
     module SchemaStatements
-      def create_table_definition(name, temporary, options)
+      def create_table_definition(name, temporary, options,as = nil)
         TableDefinition.new self, name, temporary, options
       end
     end
@@ -745,6 +745,10 @@ module ActiveRecord
         true
       end
 
+      def supports_foreign_keys?
+        false
+      end
+
       # This Adapter supports DDL transactions.
       # This means CREATE TABLE and other DDL statements can be carried out as a transaction. 
       # That is the statements executed can be ROLLED BACK in case of any error during the process.
@@ -977,13 +981,20 @@ module ActiveRecord
       #Returns an array of arrays containing the field values.
       #This is an implementation for the abstract method
       #+sql+ is the select query and +name+ is an optional description for logging
-      def select_rows(sql, name = nil)
+      def select_rows(sql, name = nil,binds = [])
         # Replaces {"= NULL" with " IS NULL"} OR {"IN (NULL)" with " IS NULL"}
         sql.gsub!( /(=\s*NULL|IN\s*\(NULL\))/i, " IS NULL" )
         
         results = []
         # Invokes the method +execute+ in order to log and execute the SQL
         # IBM_DB.Statement is returned from which results can be fetched
+        if !binds.nil? && !binds.empty?
+          param_array = binds.map do |column,value|
+            quote_value_for_pstmt(value, column)
+          end
+          return prepared_select({"sqlSegment" => sql, "paramArray" => param_array})
+        end
+
         stmt = execute(sql, name)
         if(stmt)
           begin

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ibm_db
 version: !ruby/object:Gem::Version
-  version: 2.5.17
+  version: 2.5.18
 platform: universal-darwin-13
 authors:
 - IBM
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-06 00:00:00.000000000 Z
+date: 2014-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.15.1
 description: 
-email: rubyibm-developers@rubyforge.org
+email: opendev@us.ibm.com
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -80,10 +80,15 @@ files:
 - test/schema/luw/ibm_db_specific_schema.rb
 - test/schema/schema.rb
 - test/schema/zOS/ibm_db_specific_schema.rb
-homepage: http://rubyforge.org/projects/rubyibm/
+homepage: https://github.com/ibmdb/ruby-ibmdb
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message: |2+
+
+  *****************************************************************************
+  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