ruby-oci8 2.2.5.1-x86-mingw32 → 2.2.6-x86-mingw32

data/ChangeLog

@@ -1,3 +1,71 @@
+2018-08-22  Kubo Takehiro <kubo@jiubao.org>
+	* NEWS: Add changes between 2.2.5.1 and 2.2.6
+	* lib/oci8/version.rb: Update to 2.2.6
+	* mkpkg-win32.rb: Don't test with self-build ruby 2.4.
+
+2018-08-22  Kubo Takehiro <kubo@jiubao.org>
+	* ext/oci8/oci8lib.c: Load a Oracle client library which doesn't have
+	    version number suffix also on Unix when runtime-check is enabled.
+	    Oracle version numbers are incremented yearly sice Oracle 18c.
+
+2018-08-22  Kubo Takehiro <kubo@jiubao.org>
+	* ext/oci8/hook_funcs.c, ext/oci8/win32.c: Suppress warnings:
+	   "'raise_error' defined but not used" and "'strncpy' specified
+	   bound 512 equals destination size".
+
+2018-08-19  Kubo Takehiro <kubo@jiubao.org>
+	* ext/oci8/hook_funcs.c: Not depend on Oracle version number
+	   of Oracle client file name suffix when hooking functions.
+	   (rsim/oracle-enhanced#1754)
+	* test/test_all.rb, test/test_properties.rb, dist-files:
+	   Add tests for hooking.
+
+2018-08-18  Kubo Takehiro <kubo@jiubao.org>
+	* test/test_oci8.rb: Fix to pass a test when the client is 11g
+	    and the server is 18c. client_driver in v$session_connect_info
+	    has an extra space at the end.
+
+2018-08-18  Kubo Takehiro <kubo@jiubao.org>
+	* ext/oci8/apiwrap.rb, ext/oci8/apiwrap.yml, ext/oci8/oci8.c,
+	  ext/oci8/oci8.h, lib/oci8/oci8.rb, lib/oci8/oracle_version.rb,
+	  test/test_oci8.rb: Fix OCI8#oracle_server_version to get
+	    full version of Oracle 18c.
+
+2018-08-18  Kubo Takehiro <kubo@jiubao.org>
+	* lib/oci8/metadata.rb: Update doc comments of OCI8::Metadata::ArgBase#level
+	    and OCI8::Metadata::ArgBase#arguments.
+	* test/test_package_type.rb, lib/oci8.rb: Fix to pass tests on Oracle 18c.
+	    Detailed user-defined type information used in arguments isn't available
+	    on Oracle 18c.
+
+2018-08-12  Kubo Takehiro <kubo@jiubao.org>
+	* test/test_clob.rb: Skip TestCLob#test_github_issue_20 because it
+	    takes 4 minutes to test it in my Linux box.
+
+2018-08-12  Kubo Takehiro <kubo@jiubao.org>
+	* ext/oci8/lob.c, test/test_clob.rb: LOB#sync, LOB#sync= and LOB#flush
+	    do nothing now. They have not worked by mistake from the beginning
+	    because incorrect arguments has been passed to OCILobOpen().
+	    Moreover it crashed Oracle 18c server-side processes and caused
+	    "ORA-03113: end-of-file on communication channel."
+	    (github issue #198)
+
+2018-01-28  Kubo Takehiro <kubo@jiubao.org>
+	* ext/oci8/object.c, lib/oci8/object.rb: Add timestamp with time zone
+	    data type support in object type attributes.
+	    (github issue #185)
+	* test/setup_test_object.sql, test/test_object.rb: Add tests for
+	    timestamp and timestamp with time zone.
+
+2018-01-23  Kubo Takehiro <kubo@jiubao.org>
+	* ext/oci8/object.c, ext/oci8/oci8.h, lib/oci8/object.rb:
+	    Add timestamp data type support in object type attributes.
+	    (github issue #185)
+
+2017-12-27  Kubo Takehiro <kubo@jiubao.org>
+	* mkpkg-win32.rb: Remove '-rubygems' in the command line to run tests.
+	    `ubygems.rb` was removed in ruby 2.5.
+
 2017-12-27  Kubo Takehiro <kubo@jiubao.org>
 	* NEWS: Add changes between 2.2.5 and 2.2.5.1
 	* lib/oci8/version.rb: Update to 2.2.5.1

data/NEWS

@@ -1,5 +1,44 @@
 # @markup markdown
 
+2.2.6
+=====
+
+This release fixed issues about Oracle 18c except one.
+
+Fixed issue
+-----------
+
+### Setting some properties failed with Oracle 18c client
+
+Setting `OCI8::properties[:tcp_keepalive_time]` or `OCI8::properties[:cancel_read_at_exit]`
+failed with the error message "No shared library is found to hook" when Oracle
+client version is 18c.
+(rsim/oracle-enhanced#1754)
+
+### Fix `OCI8#oracle_server_version` to get full version of Oracle 18c
+
+`OCI8#oracle_server_version` returned Oracle version number whose
+number components after the first dot are zeros such as '18.0.0.0.0'
+even when the server version is `18.3.0.0.0`. This issue was fixed by
+using a new OCI function. However the function is available since
+Oracle 18c client. So when the Oracle client version is 12c or earlier
+and the Oracle server version is 18c or later, it cannot get the *full*
+Oracle version number.
+
+### Fix tests when the Oracle server version is 18c.
+
+### LOB#sync, LOB#sync= and LOB#flush do nothing now.
+
+They have not worked by mistake from the beginning because incorrect
+arguments has been passed to OCILobOpen(). Moreover it crashed Oracle
+18c server-side processes and caused "ORA-03113: end-of-file on
+communication channel."
+(github issue #198)
+
+### `unsupported typecode timestamp` when timestamp with time zone is in object type attributes.
+
+(github issue #185)
+
 2.2.5.1
 =======
 

data/README.md

@@ -2,7 +2,7 @@ Ruby-oci8
 =========
 
 [![Gem Version](https://badge.fury.io/rb/ruby-oci8.svg)](http://badge.fury.io/rb/ruby-oci8)
-[![Circle CI](https://circleci.com/gh/kubo/ruby-oci8.png?style=shield)](https://circleci.com/gh/kubo/ruby-oci8)
+[![Build Status](https://travis-ci.org/kubo/ruby-oci8.svg?branch=master)](https://travis-ci.org/kubo/ruby-oci8)
 
 What is ruby-oci8
 -----------------

data/dist-files

@@ -109,4 +109,5 @@ test/test_oracle_version.rb
 test/test_oradate.rb
 test/test_oranumber.rb
 test/test_package_type.rb
+test/test_properties.rb
 test/test_rowid.rb

data/docs/install-on-osx.md

@@ -39,7 +39,7 @@ Download the following packages from [Oracle Technology Network][]
 
 * 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) 
+* Instant Client Package - SQL*Plus (`instantclient-sqlplus-macos.x64-12.1.0.2.0.zip`) (optionally) 
 
 ### Install Oracle Instant Client Packages via Homebrew
 

data/lib/oci8.rb

@@ -140,6 +140,8 @@ class OCI8
   ORAVER_11_1 = OCI8::OracleVersion.new(11, 1)
   # @private
   ORAVER_12_1 = OCI8::OracleVersion.new(12, 1)
+  # @private
+  ORAVER_18 = OCI8::OracleVersion.new(18)
 
   # @private
   @@oracle_client_version = OCI8::OracleVersion.new(self.oracle_client_vernum)

data/lib/oci8/metadata.rb

@@ -1503,7 +1503,11 @@ class OCI8
         attr_get_sb1(OCI_ATTR_SCALE)
       end
 
-      # The datatype levels. This attribute always returns zero.
+      # The nest level.
+      #
+      # Oracle manual says that it always returns zero. However it returns
+      # the depth of {OCI8::ArgBase#arguments} calls when #arguments returns
+      # a non-empty array.
       def level
         attr_get_ub2(OCI_ATTR_LEVEL)
       end
@@ -1607,6 +1611,10 @@ class OCI8
 
       # The list of arguments at the next level (when the argument is
       # of a record or table type).
+      #
+      # This method returns an array containing type information when
+      # the type is a user-defined type and the Oracle server version
+      # is 12c or earlier. Otherwise, it returns an empty array.
       def arguments
         @arguments ||= list_arguments.to_a
       end

data/lib/oci8/object.rb

@@ -493,6 +493,16 @@ EOS
          Proc.new do |val| datetime_to_array(val, :date) end, # set_proc
          Proc.new do |val| array_to_time(val, :local) end, # get_proc
         ]
+      when :timestamp
+        [ATTR_TIMESTAMP, con, SIZE_OF_POINTER, 2, ALIGNMENT_OF_POINTER,
+         Proc.new do |val| datetime_to_array(val, :timestamp) end, # set_proc
+         Proc.new do |val| array_to_time(val, :local) end, # get_proc
+        ]
+      when :timestamp_tz
+        [ATTR_TIMESTAMP_TZ, con, SIZE_OF_POINTER, 2, ALIGNMENT_OF_POINTER,
+         Proc.new do |val| datetime_to_array(val, :timestamp_tz) end, # set_proc
+         Proc.new do |val| array_to_time(val, nil) end, # get_proc
+        ]
       when :binary_double
         [ATTR_BINARY_DOUBLE, nil, SIZE_OF_DOUBLE, 2, ALIGNMENT_OF_DOUBLE]
       when :binary_float

data/lib/oci8/oci8.rb

@@ -340,6 +340,12 @@ class OCI8
 
   # Returns the Oracle server version.
   #
+  # When the Oracle client version is 12c or earlier and
+  # the Oracle server version is 18c or later, this method
+  # doesn't return *full* version number such as '18.3.0.0.0'.
+  # It returns version number whose number components after
+  # the first dot are zeros such as '18.0.0.0.0'.
+  #
   # @see OCI8.oracle_client_version
   # @return [OCI8::OracleVersion]
   def oracle_server_version

data/lib/oci8/oracle_version.rb

@@ -66,6 +66,12 @@ class OCI8
         major, minor, update, patch, port_update = arg.split('.').collect do |v|
           v.to_i
         end
+      elsif arg >= 0x12000000
+        major  = (arg & 0xFF000000) >> 24
+        minor  = (arg & 0x00FF0000) >> 16
+        update = (arg & 0x0000F000) >> 12
+        patch  = (arg & 0x00000FF0) >>  4
+        port_update = (arg & 0x0000000F)
       elsif arg >= 0x08000000
         major  = (arg & 0xFF000000) >> 24
         minor  = (arg & 0x00F00000) >> 20
@@ -80,7 +86,11 @@ class OCI8
       @update = update || 0
       @patch = patch || 0
       @port_update = port_update || 0
-      @vernum = (@major << 24) | (@minor << 20) | (@update << 12) | (@patch << 8) | @port_update
+      @vernum = if @major >= 18
+                  (@major << 24) | (@minor << 16) | (@update << 12) | (@patch << 4) | @port_update
+                else
+                  (@major << 24) | (@minor << 20) | (@update << 12) | (@patch << 8) | @port_update
+                end
     end
 
     # Compares +self+ and +other+.

data/lib/oci8/version.rb

@@ -1,3 +1,3 @@
 class OCI8
-  VERSION = "2.2.5.1"
+  VERSION = "2.2.6"
 end

data/lib/ruby-oci8.rb

@@ -1,4 +1 @@
-if caller[0] !~ /\/bundler\/runtime\.rb:\d+:in `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/setup_test_object.sql

@@ -61,6 +61,8 @@ create type rb_test_obj as object (
   obj_array_val rb_test_obj_elem_array,
   obj_ary_of_ary_val rb_test_obj_elem_ary_of_ary,
   date_val date,
+  timestamp_val timestamp(9),
+  timestamp_tz_val timestamp(9) with time zone,
 --  date_array_val rb_test_date_array,
 
   constructor function rb_test_obj(n number) return self as result,
@@ -72,19 +74,23 @@ create type rb_test_obj as object (
   member procedure member_proc(n in integer)
 )
 /
-create or replace type body rb_test_obj is
-
+create type body rb_test_obj is
   constructor function rb_test_obj(n number) return self as result is
-    function to_test_date(n number) return date is
-    begin
-      return to_date(to_char(1990 + n, 'FM0000') ||
-                     to_char(mod(round(n) * 5, 12) + 1, 'FM00') ||
-                     to_char(mod(round(n) * 7, 27) + 1, 'FM00') ||
-                     to_char(mod(round(n) * 9, 24), 'FM00') ||
-                     to_char(mod(round(n) * 11, 60), 'FM00') ||
-                     to_char(mod(round(n) * 13, 60), 'FM00'), 'yyyymmddhh24miss');
-    end;
+    str varchar(28);
+    ts timestamp(9);
+    ts_tz timestamp(9) with time zone;
   begin
+    str := to_char(1990 + n, 'FM0000') ||
+                   to_char(mod(round(n) * 5, 12) + 1, 'FM00') ||
+                   to_char(mod(round(n) * 7, 27) + 1, 'FM00') ||
+                   to_char(mod(round(n) * 9, 24), 'FM00') ||
+                   to_char(mod(round(n) * 11, 60), 'FM00') ||
+                   to_char(mod(round(n) * 13, 60), 'FM00') ||
+                   to_char(mod(round(n) * 333333333, 1000000000), 'FM000000000');
+    ts := to_timestamp(str, 'yyyymmddhh24missff9');
+    str := str || to_char(mod(round(n) * 15, 24) - 11, 'FMS00') ||
+                  to_char(mod(round(n) * 17, 60), 'FM00');
+    ts_tz := to_timestamp_tz(str, 'yyyymmddhh24missff9tzhtzm');
     self.int_val := n;
     self.flt_val := n;
     self.num_val := n;
@@ -96,7 +102,9 @@ create or replace type body rb_test_obj is
     self.nclob_val := to_clob(n);
     self.blob_val := to_blob(utl_raw.cast_to_raw(to_char(n)));
     self.obj_val := rb_test_obj_elem(n, n + 1);
-    self.date_val := to_test_date(n);
+    self.date_val := ts;
+    self.timestamp_val := ts;
+    self.timestamp_tz_val := ts_tz;
     if self.int_val != 1 then
       self.int_array_val := rb_test_int_array(n, n + 1, n + 2);
       self.flt_array_val := rb_test_flt_array(n, n + 1, n + 2);
@@ -120,7 +128,7 @@ create or replace type body rb_test_obj is
 
   static function test_object_version return integer is
   begin
-    return 3;
+    return 4;
   end;
 
   static function class_func(n number) return rb_test_obj is

data/test/test_all.rb

@@ -26,6 +26,7 @@ require "#{srcdir}/test_oracle_version"
 require "#{srcdir}/test_error"
 require "#{srcdir}/test_connection_pool"
 require "#{srcdir}/test_object"
+require "#{srcdir}/test_properties.rb"
 
 if OCI8.respond_to? :encoding
   require "#{srcdir}/test_encoding"

data/test/test_clob.rb

@@ -24,22 +24,6 @@ class TestCLob < Minitest::Test
     lob.close
   end
 
-  def test_insert_with_flush
-    filename = File.basename($lobfile)
-    @conn.exec("DELETE FROM test_table WHERE filename = :1", filename)
-    @conn.exec("INSERT INTO test_table(filename, content) VALUES (:1, EMPTY_CLOB())", filename)
-    cursor = @conn.exec("SELECT content FROM test_table WHERE filename = :1 FOR UPDATE", filename)
-    lob = cursor.fetch[0]
-    lob.sync = false
-    open($lobfile) do |f|
-      while s = f.read(1000)
-        lob.write(s)
-      end
-    end
-    lob.flush
-    lob.close
-  end
-
   def test_insert_symbol
     filename = 'test_symbol'
     value = :foo_bar
@@ -76,6 +60,9 @@ class TestCLob < Minitest::Test
 
   # https://github.com/kubo/ruby-oci8/issues/20
   def test_github_issue_20
+    # Skip this test if FULLTEST isn't set because it takes 4 minutes in my Linux box.
+    return if ENV['FULLTEST']
+
     lob1 = OCI8::CLOB.new(@conn, ' '  * (1024 * 1024))
     lob1.read(1) # to suppress `warning: assigned but unused variable - lob1`
     begin

data/test/test_object.rb

@@ -1,6 +1,12 @@
 require 'oci8'
 require File.dirname(__FILE__) + '/config'
 
+class Time
+  def inspect
+    self.strftime("%Y-%m-%d %H:%M:%S.%N %:z")
+  end
+end
+
 conn = OCI8.new($dbuser, $dbpass, $dbname)
 error_message = nil
 begin
@@ -22,7 +28,7 @@ begin
 
   begin
     version = RbTestObj.test_object_version(conn)
-    error_message = "Invalid test object version" if version != 3
+    error_message = "Invalid test object version" if version != 4
   rescue NoMethodError
     raise unless $!.to_s.include?('test_object_version')
     error_message = "rb_test_obj.test_object_version is not declared."
@@ -100,7 +106,8 @@ class TestObj1 < Minitest::Test
     attr_reader :obj_array_val
     attr_reader :obj_ary_of_ary_val
     attr_reader :date_val
-#    attr_reader :date_array_val
+    attr_reader :timestamp_val
+    attr_reader :timestamp_tz_val
 
     attr_accessor :assertions
 
@@ -109,16 +116,28 @@ class TestObj1 < Minitest::Test
       @assertions = 0
     end
 
-    def to_test_date(n)
+    def to_test_datetime(n, type)
       year = (1990 + n).round
       month = (n.round * 5) % 12 + 1
       mday = (n.round * 7) % 27 + 1
       hour = (n.round * 9) % 24
       minute = (n.round * 11) % 60
       sec = (n.round * 13) % 60
-      convert_to_time(year, month, mday, hour, minute, sec, 0, nil)
+      nsec = if type == :date
+               0
+             else
+               ((n.round * 333_333_333) % 1_000_000_000).to_r / 1_000_000_000
+             end
+      tz = if type == :timestamp_tz
+             tzh = (n.round * 15) % 24 - 11
+             tzm = (n.round * 17) % 60
+             format('%+03d:%02d', tzh, tzm)
+           else
+             nil
+           end
+      convert_to_time(year, month, mday, hour, minute, sec, nsec, tz)
     end
-    private :to_test_date
+    private :to_test_datetime
 
     def next
       @n += 1.2
@@ -135,7 +154,9 @@ class TestObj1 < Minitest::Test
       @nclob_val = @str_val
       @blob_val = @str_val
       @obj_val = ExpectedValObjElem.new(@int_val, @int_val + 1)
-      @date_val = to_test_date(@n)
+      @date_val = to_test_datetime(@n, :date)
+      @timestamp_val = to_test_datetime(@n, :timestamp)
+      @timestamp_tz_val = to_test_datetime(@n, :timestamp_tz)
       if @int_val == 1
         @int_array_val = nil
         @flt_array_val = nil
@@ -199,7 +220,8 @@ class TestObj1 < Minitest::Test
         obj_array_val = val[18]
         obj_ary_of_ary_val = val[19]
         date_val = val[20]
-#        date_array_val = val[18]
+        timestamp_val = val[21]
+        timestamp_tz_val = val[22]
       else
         assert_instance_of(RbTestObj, val)
         int_val = val.int_val
@@ -223,7 +245,8 @@ class TestObj1 < Minitest::Test
         obj_array_val = val.obj_array_val
         obj_ary_of_ary_val = val.obj_ary_of_ary_val
         date_val = val.date_val
-#        date_array_val = val.date_array_val
+        timestamp_val = val.timestamp_val
+        timestamp_tz_val = val.timestamp_tz_val
       end
 
       assert_equal(@int_val, int_val)
@@ -267,7 +290,8 @@ class TestObj1 < Minitest::Test
         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)
+      assert_equal(@timestamp_val, timestamp_val)
+      assert_equal(@timestamp_tz_val, timestamp_tz_val)
     end
 
     def assert_array_in_delta(exp, val)

data/test/test_oci8.rb

@@ -491,9 +491,23 @@ EOS
                        else
                          raise "Unknown column size #{column_size}"
                        end
-      driver_name = cursor.fetch[0]
+      driver_name = cursor.fetch[0].strip
       cursor.close
       assert_equal(expected_value, driver_name)
     end
   end
+
+  def test_server_version
+    cursor = @conn.exec("select * from product_component_version where product like 'Oracle Database %'")
+    row = cursor.fetch_hash
+    cursor.close
+    ver = if OCI8::oracle_client_version >= OCI8::ORAVER_18
+            row['VERSION_FULL'] || row['VERSION']
+          else
+            # OCI8#oracle_server_version could not get infomation corresponding
+            # to VERSION_FULL when the Oracle client version is below 18.1.
+            row['VERSION']
+          end
+    assert_equal(ver, @conn.oracle_server_version.to_s)
+  end
 end # TestOCI8

data/test/test_package_type.rb

@@ -639,7 +639,11 @@ class TestPackageType < Minitest::Test
           :sub_name => "TABLE_OF_PLS_INTEGER",
           :link => "",
           #:type_metadata => nil,
-          :arguments => {
+          :arguments => ($oracle_server_version >= OCI8::ORAVER_18) ?
+          {
+            :class => Array,
+            :size => 0,
+          } : {
             :class => Array,
             :size => 1,
             [0] => {
@@ -729,7 +733,11 @@ class TestPackageType < Minitest::Test
           :sub_name => "TABLE_OF_REC1",
           :link => "",
           #:type_metadata => nil,
-          :arguments => {
+          :arguments => ($oracle_server_version >= OCI8::ORAVER_18) ?
+          {
+            :class => Array,
+            :size => 0,
+          } : {
             :class => Array,
             :size => 1,
             [0] => {
@@ -846,7 +854,11 @@ class TestPackageType < Minitest::Test
           :sub_name => "TABLE_OF_REC1",
           :link => "",
           #:type_metadata => nil,
-          :arguments => {
+          :arguments => ($oracle_server_version >= OCI8::ORAVER_18) ?
+          {
+            :class => Array,
+            :size => 0,
+          } : {
             :class => Array,
             :size => 1,
             [0] => {

data/test/test_properties.rb

@@ -0,0 +1,17 @@
+require 'oci8'
+require File.dirname(__FILE__) + '/config'
+
+class TestProperties < Minitest::Test
+  def test_tcp_keepalive_time
+    begin
+      oldval = OCI8.properties[:tcp_keepalive_time]
+      begin
+        OCI8.properties[:tcp_keepalive_time] = 600
+        assert(true)
+      ensure
+        OCI8.properties[:tcp_keepalive_time] = oldval
+      end
+    rescue NotImplementedError
+    end
+  end
+end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-oci8
 version: !ruby/object:Gem::Version 
-  hash: 105
+  hash: 11
   prerelease: false
   segments: 
   - 2
   - 2
-  - 5
-  - 1
-  version: 2.2.5.1
+  - 6
+  version: 2.2.6
 platform: x86-mingw32
 authors: 
 - Kubo Takehiro
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2017-12-27 00:00:00 +09:00
+date: 2018-08-22 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -105,6 +104,7 @@ files:
 - test/test_oradate.rb
 - test/test_oranumber.rb
 - test/test_package_type.rb
+- test/test_properties.rb
 - test/test_rowid.rb
 - lib/oci8lib_191.so
 - lib/oci8lib_200.so