ruby-oci8 2.2.2-x86-mingw32 → 2.2.3-x86-mingw32

data/ChangeLog

@@ -1,3 +1,39 @@
+2016-12-27  Kubo Takehiro  <kubo@jiubao.org>
+	* NEWS: Add changes between 2.2.2 and 2.2.3.
+	* lib/oci8/version.rb: update to 2.2.3.
+	* dist-files: add test/test_bind_array.rb
+	* mkpkg-win32.rb: add path to ruby 2.4.0
+
+2016-12-26  Kubo Takehiro  <kubo@jiubao.org>
+	* test/test_clob.rb, test/test_metadata.rb, test/test_object.rb,
+	  test/test_oci8.rb, test/test_package_type.rb: Suppress warnings:
+	    "Use assert_nil if expecting nil from ... in `...' This will
+	    fail in MT6" printed by Minitest.
+
+2016-12-26  Kubo Takehiro  <kubo@jiubao.org>
+	* lib/oci8/bindtype.rb, lib/oci8/compat.rb, lib/oci8/oci8.rb,
+	  test/config.rb: Suppress "warning: constant ::Fixnum is deprecated"
+	  and "warning: constant ::Bignum is deprecated" due to integer
+	  unification in ruby 2.4.0.
+
+2016-12-14  Koichi ITO  <koic.ito@gmail.com>
+	* ext/oci8/ocinumber.c:	Fix invalid value for BigDecimal in
+	    Ruby 2.4.0+
+
+2016-09-25  Kubo Takehiro  <kubo@jiubao.org>
+	* ext/oci8/metadata.c, ext/oci8/oci8.c: Fix load error when
+	    GC.stress = true.
+
+2016-09-11  Kubo Takehiro  <kubo@jiubao.org>
+	* ext/oci8/oci8.h: Suppress 'warning: "ALWAYS_INLINE" redefined' when
+	   compiled for ruby 2.4.0-preview2.
+
+2016-05-28  Kubo Takehiro  <kubo@jiubao.org>
+	* docs/install-on-osx.md: Update installation document about OS X again.
+
+2016-05-28  Kubo Takehiro  <kubo@jiubao.org>
+	* docs/install-on-osx.md: Update installation document about OS X.
+
 2016-04-24  Kubo Takehiro  <kubo@jiubao.org>
 	* mkpkg-win32.rb: Added to compile mingw32 packages.
 	* dist-files: Updated to include docs/report-installation-issue.md.

data/NEWS

@@ -1,5 +1,19 @@
 # @markup markdown
 
+2.2.3
+=====
+
+New Features
+------------
+
+### Support ruby 2.4.0
+
+-   [Fix invalid value for BigDecimal](https://github.com/kubo/ruby-oci8/issues/144)
+-   Fix load error when `GC.stress = true`.
+-   Suppress warnings caused by integer unification
+-   Suppress warnings outputted by Minitest in ruby 2.4.0
+-   Suppress warnings when compiling with ruby 2.4.0
+
 2.2.2
 =====
 

data/README.md

@@ -8,7 +8,7 @@ Instant Client.
 Use ruby-oci8 2.0.6 for Oracle 8 or use ruby-oci8 2.1.8 for Oracle 9i.
 
 Note that ruby 1.8 support was dropped in ruby-oci8 2.2.0.
-Use ruby-2.1.8 for ruby 1.8.
+Use ruby-oci8 2.1.8 for ruby 1.8.
 
 What's new
 ==========

data/dist-files

@@ -83,6 +83,7 @@ test/setup_test_object.sql
 test/test_all.rb
 test/test_appinfo.rb
 test/test_array_dml.rb
+test/test_bind_array.rb
 test/test_bind_raw.rb
 test/test_bind_string.rb
 test/test_bind_time.rb

data/docs/install-on-osx.md

@@ -35,34 +35,45 @@ Download Oracle Instant Client Packages
 
 Download the following packages from [Oracle Technology Network][]
 
-* Instant Client Package - Basic or Basic Lite
-* Instant Client Package - SDK
-* Instant Client Package - SQL*Plus (optionally)
+* Instant Client Package - Basic (`instantclient-basic-macos.x64-12.1.0.2.0.zip`) or Basic Lite (`instantclient-basiclite-macos.x64-12.1.0.2.0.zip`)
+* Instant Client Package - SDK (`instantclient-sdk-macos.x64-12.1.0.2.0.zip`)
+* Instant Client Package - SQL*Plus (`instantclient-sdk-macos.x64-12.1.0.2.0.zip`) (optionally) 
 
 Install Oracle Instant Client Packages via Homebrew
 ---------------------------------------------------
 
-To install `Oracle Instant Client Basic Lite` via [Homebrew][]
+To install `Oracle Instant Client Basic` via [Homebrew][]
 
-* Download two instant client packages: `Basic Lite` and `SDK` and put them
-  in `/Library/Caches/Homebrew` (if the environment variable `HOMEBREW_CACHE`
+* Copy downloaded zip files to `/Library/Caches/Homebrew`
+  (if the environment variable `HOMEBREW_CACHE`
   is not set and `$HOME/Library/Caches/Homebrew` doesn't exist.)
+
 * Run the followining commands:
 
-        brew install InstantClientTap/instantclient/instantclient-basiclite
-        brew install InstantClientTap/instantclient/instantclient-sdk
+        brew tap InstantClientTap/instantclient
+        brew install instantclient-basic
+        brew install instantclient-sdk
+        brew install instantclient-sqlplus # (optionally)
 
-To install `Oracle Instant Client Basic` via [Homebrew][]
+* Set the environment variable `OCI_DIR` while performing the following installation steps
+  if Homebrew is installed outside `/usr/local`.
+
+        export OCI_DIR=$(brew --prefix)/lib
+
+To install `Oracle Instant Client Basic Lite` via [Homebrew][]
+
+* Copy downloaded zip files to `/Library/Caches/Homebrew`
+  (if the environment variable `HOMEBREW_CACHE`
+  is not set and `$HOME/Library/Caches/Homebrew` doesn't exist.)
 
-* Download *three* instant client packages: `Basic`, `Basic Lite` and `SDK`
-  and put them in `/Library/Caches/Homebrew` (if the environment variable
-  `HOMEBREW_CACHE` is not set and `$HOME/Library/Caches/Homebrew` doesn't exist.)
 * Run the followining commands:
 
-        brew install InstantClientTap/instantclient/instantclient-basic
-        brew install InstantClientTap/instantclient/instantclient-sdk
+        brew tap InstantClientTap/instantclient
+        brew install instantclient-basiclite
+        brew install instantclient-sdk
+        brew install instantclient-sqlplus --with-basiclite # (optionally)
         
-* Set the environment variable OCI_DIR while performing the following installation steps
+* Set the environment variable `OCI_DIR` while performing the following installation steps
   if Homebrew is installed outside `/usr/local`.
 
         export OCI_DIR=$(brew --prefix)/lib
@@ -74,31 +85,23 @@ If you don't use [Homebrew][], do the following:
 
 Unzip the packages as follows:
 
-    mkdir /opt
-    mkdir /opt/oracle
+    mkdir -p /opt/oracle
     cd /opt/oracle
 
 Copy downloaded files to /opt/oracle before running the following commands.
 
-    unzip instantclient-basic-macos.x64-11.2.0.4.0.zip
-    unzip instantclient-sdk-macos.x64-11.2.0.4.0.zip
-    unzip instantclient-sqlplus-macos.x64-11.2.0.4.0.zip
+    unzip instantclient-basic-macos.x64-12.1.0.2.0.zip
+    unzip instantclient-sdk-macos.x64-12.1.0.2.0.zip
+    unzip instantclient-sqlplus-macos.x64-12.1.0.2.0.zip
 
 Make a symbolic link to link the library.
 
-    cd /opt/oracle/instantclient11_2
-    ln -s libclntsh.dylib.11.1 libclntsh.dylib
-
-Fix the library install and identification names using [fix_oralib][] to make them work
-without `DYLD_LIBRARY_PATH`.
-
-    cd /opt/oracle/instantclient11_2
-    curl -O https://raw.githubusercontent.com/kubo/fix_oralib_osx/master/fix_oralib.rb
-    ruby fix_oralib.rb
+    cd /opt/oracle/instantclient_12_1
+    ln -s libclntsh.dylib.12.1 libclntsh.dylib
 
 Set the environment variable OCI_DIR while performing the following installation steps.
 
-    export OCI_DIR=/opt/oracle/instantclient11_2
+    export OCI_DIR=/opt/oracle/instantclient_12_1
 
 Installation
 ============

data/lib/oci8/bindtype.rb

@@ -203,10 +203,13 @@ OCI8::BindType::Mapping[String]       = OCI8::BindType::String
 OCI8::BindType::Mapping[OraNumber]    = OCI8::BindType::OraNumber
 OCI8::BindType::Mapping['BigDecimal'] = OCI8::BindType::BigDecimal
 OCI8::BindType::Mapping['Rational']   = OCI8::BindType::Rational
-OCI8::BindType::Mapping[Fixnum]       = OCI8::BindType::Integer
 OCI8::BindType::Mapping[Float]        = OCI8::BindType::Float
 OCI8::BindType::Mapping[Integer]      = OCI8::BindType::Integer
-OCI8::BindType::Mapping[Bignum]       = OCI8::BindType::Integer
+unless 0.class == Integer
+  # ruby before integer unification
+  OCI8::BindType::Mapping[Fixnum]     = OCI8::BindType::Integer
+  OCI8::BindType::Mapping[Bignum]     = OCI8::BindType::Integer
+end
 OCI8::BindType::Mapping[OraDate]      = OCI8::BindType::OraDate
 OCI8::BindType::Mapping[Time]         = OCI8::BindType::Time
 OCI8::BindType::Mapping[Date]         = OCI8::BindType::Date

data/lib/oci8/compat.rb

@@ -70,7 +70,7 @@ class OCI8
   constants.each do |name|
     next if name.to_s.index("SQLT_") != 0
     val = const_get name.intern
-    if val.is_a? Fixnum
+    if val.is_a? Integer
       SQLT_NAMES[val] = name
     end
   end
@@ -79,6 +79,10 @@ class OCI8
   alias autocommit autocommit?
 
   class Cursor
+    # @!visibility private
+    # dirty hack to suppress "warning: constant ::Fixnum is deprecated"
+    Fixnum = (0.class == ::Integer) ? ::Integer : ::Fixnum
+
     def self.select_number_as=(val)
       if val == Fixnum
         @@bind_unknown_number = OCI8::BindType::Fixnum

data/lib/oci8/oci8.rb

@@ -622,7 +622,7 @@ class OCIError
   #
   def initialize(*args)
     if args.length > 0
-      if args[0].is_a? Fixnum
+      if args[0].is_a? Integer
         @code = args.shift
         super(OCI8.error_message(@code).gsub('%s') {|s| args.empty? ? '%s' : args.shift})
         @sql = nil

data/lib/oci8/version.rb

@@ -1,3 +1,3 @@
 class OCI8
-  VERSION = "2.2.2"
+  VERSION = "2.2.3"
 end

data/lib/ruby-oci8.rb

@@ -1,4 +1,4 @@
 if caller[0] !~ /\/bundler\/runtime\.rb:\d+:in `require'/
-  warn "Don't requie 'ruby-oci8'. Use \"require 'oci8'\" instead. 'ruby-oci8.rb' was added only for 'Bundler.require'."
+  warn "Don't require 'ruby-oci8'. Use \"require 'oci8'\" instead. 'ruby-oci8.rb' was added only for 'Bundler.require'."
 end
 require 'oci8'

data/test/config.rb

@@ -125,6 +125,13 @@ end
 
 class Minitest::Test
 
+  # @!visibility private
+  # dirty hack to suppress "warning: constant ::Fixnum is deprecated"
+  Fixnum = (0.class == ::Integer) ? ::Integer : ::Fixnum
+  # @!visibility private
+  # dirty hack to suppress "warning: constant ::Bignum is deprecated"
+  Bignum = (0.class == ::Integer) ? ::Integer : ::Bignum
+
   def get_oci8_connection()
     OCI8.new($dbuser, $dbpass, $dbname)
       rescue OCIError

data/test/test_bind_array.rb

@@ -0,0 +1,70 @@
+require 'oci8'
+require File.dirname(__FILE__) + '/config'
+
+class TestBindArray < Minitest::Test
+
+  def test_bind_array_names
+    assert_equal(":id_0", OCI8::in_cond(:id, []).names)
+    assert_equal(":id_0", OCI8::in_cond(:id, [1]).names)
+    assert_equal(":id_0, :id_1", OCI8::in_cond(:id, [1, 2]).names)
+    assert_equal(":id_0, :id_1, :id_2", OCI8::in_cond(:id, [1, 2, 3]).names)
+  end
+
+  def test_bind_array_values
+    assert_equal([[nil, String, nil]], OCI8::in_cond(:id, []).values)
+    assert_equal([[1, nil, nil]], OCI8::in_cond(:id, [1]).values)
+    assert_equal([[1, nil, nil], [2, nil, nil]], OCI8::in_cond(:id, [1, 2]).values)
+    assert_equal([[1, nil, nil], [2, nil, nil], [3, nil, nil]], OCI8::in_cond(:id, [1, 2, 3]).values)
+  end
+
+  def test_bind_array_values_containg_nil
+    assert_equal([[nil, String]], OCI8::in_cond(:id, [nil]).values)
+    assert_equal([[nil, Fixnum], [2, nil, nil], [3, nil, nil]], OCI8::in_cond(:id, [nil, 2, 3]).values)
+    assert_equal([[1, nil, nil], [nil, Fixnum], [3, nil, nil]], OCI8::in_cond(:id, [1, nil, 3]).values)
+  end
+
+  def test_bind_array_values_with_type
+    assert_equal([[nil, Integer, nil]], OCI8::in_cond(:id, [], Integer).values)
+    assert_equal([[1, Integer, nil]], OCI8::in_cond(:id, [1], Integer).values)
+    assert_equal([[1, Integer, nil], [2, Integer, nil]], OCI8::in_cond(:id, [1, 2], Integer).values)
+    assert_equal([[1, Integer, nil], [2, Integer, nil], [3, Integer, nil]], OCI8::in_cond(:id, [1, 2, 3], Integer).values)
+    assert_equal([[nil, Integer, nil], [2, Integer, nil], [3, Integer, nil]], OCI8::in_cond(:id, [nil, 2, 3], Integer).values)
+    assert_equal([[1, Integer, nil], [nil, Integer, nil], [3, Integer, nil]], OCI8::in_cond(:id, [1, nil, 3], Integer).values)
+  end
+
+  def test_select
+    @conn = get_oci8_connection
+    begin
+      drop_table('test_table')
+      @conn.exec(<<EOS)
+CREATE TABLE test_table (ID NUMBER(38))
+EOS
+      cursor = @conn.parse('insert into test_table values(:1)')
+      cursor.bind_param(1, nil, Integer)
+      [1, 3, 5].each do |id|
+        cursor.exec(id)
+      end
+      cursor.close
+
+      [
+       [],
+       [1],
+       [1, 2],
+       [1, 2, 3],
+       [nil],
+       [nil, 2, 3],
+       [1, nil, 3],
+      ].each do |ids|
+        in_cond = OCI8::in_cond(:id, ids)
+        cursor = @conn.exec("select * from test_table where id in (#{in_cond.names}) order by id", *in_cond.values)
+        ([1, 3, 5] & ids).each do |id|
+          assert_equal(id, cursor.fetch[0])
+        end
+      end
+
+      drop_table('test_table')
+    ensure
+      @conn.logoff
+    end
+  end
+end

data/test/test_clob.rb

@@ -67,7 +67,7 @@ class TestCLob < Minitest::Test
         # Though buf.size counts in byte,
         # offset and $lobreadnum count in character.
       end
-      assert_equal(nil, buf)
+      assert_nil(buf)
       assert(f.eof?)
       assert(lob.eof?)
     end

data/test/test_metadata.rb

@@ -42,6 +42,8 @@ class TestMetadata < Minitest::Test
         assert(expected_value.call(val), "#{msg} > #{method}")
       when Regexp
         assert_match(expected_value, val, "#{msg} > #{method}")
+      when nil
+        assert_nil(val, "#{msg} > #{method}")
       else
         assert_equal(expected_value, val, "#{msg} > #{method}")
       end
@@ -1335,7 +1337,6 @@ EOS
     drop_type('TEST_TYPE_NESTEAD_TABLE')
     drop_type('TEST_TYPE_CHILD')
     drop_type('TEST_TYPE_PARENT')
-    expected_values = []
     attrs_map = {}
 
     @conn.exec(<<-EOS)

data/test/test_object.rb

@@ -237,15 +237,35 @@ class TestObj1 < Minitest::Test
       assert_equal(@nclob_val, nclob_val)
       assert_equal(@blob_val, blob_val)
       assert_equal(@obj_val, obj_val)
-      assert_equal(@int_array_val, int_array_val && int_array_val.to_ary)
+      if @int_array_val
+        assert_equal(@int_array_val, int_array_val.to_ary)
+      else
+        assert_nil(@int_array_val, int_array_val)
+      end
       assert_array_in_delta(@flt_array_val, flt_array_val && flt_array_val.to_ary)
       assert_array_in_delta(@num_array_val, num_array_val && num_array_val.to_ary)
       assert_array_in_delta(@bdbl_array_val, bdbl_array_val && bdbl_array_val.to_ary)
       assert_array_in_delta(@bflt_array_val, bflt_array_val && bflt_array_val.to_ary)
-      assert_equal(@str_array_val, str_array_val && str_array_val.to_ary)
-      assert_equal(@raw_array_val, raw_array_val && raw_array_val.to_ary)
-      assert_equal(@obj_array_val, obj_array_val && obj_array_val.to_ary)
-      assert_equal(@obj_ary_of_ary_val, obj_ary_of_ary_val && obj_ary_of_ary_val.to_ary.collect { |elem| elem.to_ary })
+      if @str_array_val
+        assert_equal(@str_array_val, str_array_val.to_ary)
+      else
+        assert_nil(str_array_val)
+      end
+      if @raw_array_val
+        assert_equal(@raw_array_val, raw_array_val.to_ary)
+      else
+        assert_nil(raw_array_val)
+      end
+      if @obj_array_val
+        assert_equal(@obj_array_val, obj_array_val.to_ary)
+      else
+        assert_nil(obj_array_val)
+      end
+      if @obj_ary_of_ary_val
+        assert_equal(@obj_ary_of_ary_val, obj_ary_of_ary_val.to_ary.collect { |elem| elem.to_ary })
+      else
+        assert_nil(obj_ary_of_ary_val)
+      end
       assert_equal(@date_val, date_val)
 #      assert_equal(@date_array_val, date_array_val && date_array_val.to_ary)
     end
@@ -256,6 +276,8 @@ class TestObj1 < Minitest::Test
         exp.each_with_index do |elem, idx|
           assert_in_delta(elem, val[idx], Delta)
         end
+      elsif exp.nil?
+        assert_nil(val)
       else
         assert_equal(exp, val)
       end
@@ -456,10 +478,26 @@ EOS
       csr.bind_param(:out2, nil, Integer)
       csr.bind_param(:out3, nil, Integer)
       csr.exec
-      assert_equal(ary ? ary.length : -1, csr[:cnt])
-      assert_equal(ary ? ary[0] : nil, csr[:out1])
-      assert_equal(ary ? ary[1] : nil, csr[:out2])
-      assert_equal(ary ? ary[2] : nil, csr[:out3])
+      if ary
+        assert_equal(ary.length, csr[:cnt])
+      else
+        assert_equal(-1, csr[:cnt])
+      end
+      if ary && ary[0]
+        assert_equal(ary[0], csr[:out1])
+      else
+        assert_nil(csr[:out1])
+      end
+      if ary && ary[1]
+        assert_equal(ary[1], csr[:out2])
+      else
+        assert_nil(csr[:out2])
+      end
+      if ary && ary[2]
+        assert_equal(ary[2], csr[:out3])
+      else
+        assert_nil(csr[:out3])
+      end
     end
   end
 

data/test/test_oci8.rb

@@ -69,7 +69,7 @@ EOS
     cursor.exec
     assert_equal(test_data1, cursor.fetch[0])
     assert_equal(test_data2, cursor.fetch[0])
-    assert_equal(test_data3, cursor.fetch[0])
+    assert_nil(cursor.fetch[0])
     assert_equal(test_data4, cursor.fetch[0])
     cursor.close
     drop_table('test_table')

data/test/test_package_type.rb

@@ -38,6 +38,8 @@ class TestPackageType < Minitest::Test
       val = method.is_a?(Array) ? obj[method[0]] : obj.send(method)
       if expected_value.is_a? Hash
         check_attributes("#{msg} > #{method}", val, expected_value)
+      elsif expected_value.nil?
+        assert_nil(val, "#{msg} > #{method}")
       else
         assert_equal(expected_value, val, "#{msg} > #{method}")
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-oci8
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 2
   - 2
-  - 2
-  version: 2.2.2
+  - 3
+  version: 2.2.3
 platform: x86-mingw32
 authors: 
 - Kubo Takehiro
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2016-04-24 00:00:00 +09:00
+date: 2016-12-27 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -78,6 +78,7 @@ files:
 - test/test_all.rb
 - test/test_appinfo.rb
 - test/test_array_dml.rb
+- test/test_bind_array.rb
 - test/test_bind_raw.rb
 - test/test_bind_string.rb
 - test/test_bind_time.rb
@@ -98,11 +99,12 @@ files:
 - test/test_oranumber.rb
 - test/test_package_type.rb
 - test/test_rowid.rb
-- lib/oci8lib_220.so
 - lib/oci8lib_191.so
-- lib/oci8lib_230.so
 - lib/oci8lib_200.so
 - lib/oci8lib_210.so
+- lib/oci8lib_220.so
+- lib/oci8lib_230.so
+- lib/oci8lib_240.so
 has_rdoc: true
 homepage: http://www.rubydoc.info/github/kubo/ruby-oci8
 licenses: