ruby-oci8 2.2.4.1 → 2.2.11

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.4.1"
+  VERSION = "2.2.11"
 end

data/lib/oci8.rb

@@ -11,8 +11,11 @@ if RUBY_PLATFORM =~ /cygwin/
   # Cygwin manages environment variables by itself.
   # They don't synchroize with Win32's ones.
   # This set some Oracle's environment variables to win32's enviroment.
-  require 'Win32API'
-  win32setenv = Win32API.new('Kernel32.dll', 'SetEnvironmentVariableA', 'PP', 'I')
+  require 'fiddle'
+  win32setenv = Fiddle::Function.new( Fiddle.dlopen('Kernel32.dll')['SetEnvironmentVariableA'],
+                                        [Fiddle::TYPE_VOIDP,Fiddle::TYPE_VOIDP],
+                                        Fiddle::TYPE_INT )
+
   ['NLS_LANG', 'TNS_ADMIN', 'LOCAL'].each do |name|
     val = ENV[name]
     win32setenv.call(name, val && val.dup)
@@ -63,6 +66,8 @@ when 'rbx'
   so_basename += 'rbx'
 when 'jruby'
   raise "Ruby-oci8 doesn't support jruby because its C extension support is in development in jruby 1.6 and deprecated in jruby 1.7."
+when 'truffleruby'
+  so_basename += 'truffleruby'
 else
   raise 'unsupported ruby engine: ' + RUBY_ENGINE
 end
@@ -95,7 +100,7 @@ begin
 
   ruby_arch = [nil].pack('P').size == 8 ? :x64 : :x86
   ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
-    if dll_arch.call(File.join(path, 'OCI.DLL')) == ruby_arch
+    if !path.empty? && dll_arch.call(File.join(path, 'OCI.DLL')) == ruby_arch
       dll_dir = RubyInstaller::Runtime.add_dll_directory(path)
       break
     end
@@ -105,7 +110,7 @@ end
 
 begin
   require so_basename
-rescue LoadError, OCIError
+rescue LoadError
   require 'oci8/check_load_error'
   OCI8::Util::check_load_error($!)
   raise
@@ -140,6 +145,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/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/ruby-oci8.gemspec

@@ -34,7 +34,6 @@ spec = Gem::Specification.new do |s|
   s.description = <<EOS
 ruby-oci8 is a ruby interface for Oracle using OCI8 API. It is available with Oracle 10g or later including Oracle Instant Client.
 EOS
-  s.has_rdoc = 'yard'
   s.authors = ['Kubo Takehiro']
   s.platform = gem_platform
   s.license = 'BSD-2-Clause'
@@ -51,7 +50,7 @@ EOS
     # add map files to analyze a core (minidump) file.
     so_vers.each do |ver|
       map_file = 'ext/oci8/oci8lib_#{ver}.map'
-      so_files << map_file if File.exists? map_file
+      so_files << map_file if File.exist? map_file
     end
 
     # least version in so_vers
@@ -79,7 +78,7 @@ EOS
     end
     files << 'lib/oci8.rb'
   end
-  s.require_paths = ['lib', 'ext/oci8']
+  s.require_paths = ['lib']
   s.files = files
   s.test_files = 'test/test_all.rb'
   s.extra_rdoc_files = ['README.md']

data/setup.rb

@@ -189,7 +189,16 @@ class ConfigTable
                      'the make program to compile ruby extentions' ] ],
     [ 'without-ext', [ 'no',
                        'yes/no',
-                       'does not compile/install ruby extentions' ] ]
+                       'does not compile/install ruby extentions' ] ],
+    [ 'with-instant-client-dir', ['',
+                                  'path',
+                                  'path to the Oracle instant client directory'] ],
+    [ 'with-instant-client-lib', ['',
+                                  'path',
+                                  'path to the Oracle instant client libraries'] ],
+    [ 'with-instant-client-include', ['',
+                                      'path',
+                                      'path to the Oracle instant client header files'] ]
   ]
   multipackage_descripters = [
     [ 'with',      [ '',
@@ -277,7 +286,7 @@ class ConfigTable
 
   def initialize_from_table
     @table = {}
-    DESCRIPTER.each do |k, (default, vname, desc, default2)|
+    DESCRIPTER.each do |k, (default, *)|
       @table[k] = default
     end
   end

data/test/README.md

@@ -0,0 +1,37 @@
+Before running unit test:
+
+1. Connect to Oracle as sys
+   ```shell
+   $ sqlplus sys/<password_of_sys> as sysdba
+   SQL>
+   ```
+2. Create user ruby
+   ```sql
+   SQL> CREATE USER ruby IDENTIFIED BY oci8 DEFAULT TABLESPACE users TEMPORARY TABLESPACE temp;
+   SQL> alter user ruby quota unlimited on users;
+   ```
+3. Grant the privilege to connect and execute.
+   ```sql
+    SQL> GRANT connect, resource, create view, create synonym TO ruby;
+    SQL> GRANT execute ON dbms_lock TO ruby;
+    ```
+4. Connect as ruby user.
+   ```shell
+   $ sqlplus ruby/oci8
+   SQL>
+   ```
+5. Create object types
+   ```sql
+   SQL> @test/setup_test_object.sql
+   SQL> @test/setup_test_package.sql
+   ```
+6. change $dbname in test/config.rb.
+
+Then run the following command:
+```shell
+$ make check
+```
+or
+```
+$ nmake check   (If your compiler is MS Visual C++.)
+````

data/test/config.rb

@@ -134,7 +134,7 @@ class Minitest::Test
 
   def get_oci8_connection()
     OCI8.new($dbuser, $dbpass, $dbname)
-      rescue OCIError
+  rescue OCIError
     raise if $!.code != 12516 && $!.code != 12520
     # sleep a few second and try again if
     # the error code is ORA-12516 or ORA-12520.

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/setup_test_package.sql

@@ -0,0 +1,59 @@
+create or replace package rb_test_pkg is
+  package_version pls_integer := 1;
+
+  type array_of_integer is array(50) of integer;
+  type table_of_pls_integer is table of pls_integer;
+  type table_of_boolean is table of boolean;
+  type indexed_table_of_varchar2 is table of varchar2(10) index by varchar2(5);
+  type rec1 is record (i pls_integer, j integer);
+  type rec2 is record (b boolean, it indexed_table_of_varchar2, rec rec1);
+  type table_of_rec1 is table of rec1;
+  type table_of_rec2 is table of rec2;
+
+  function sum_table_of_pls_integer(tbl in table_of_pls_integer) return pls_integer;
+  function add_rec1_values(tbl in table_of_rec1) return pls_integer;
+  procedure out_rec1_values(tbl out table_of_rec1);
+end;
+/
+create or replace package body rb_test_pkg is
+  function sum_table_of_pls_integer(tbl in table_of_pls_integer) return pls_integer is
+    i pls_integer;
+    ret pls_integer := 0;
+  begin
+    for i in tbl.first..tbl.last loop
+      ret := ret + tbl(i);
+    end loop;
+    return ret;
+  end;
+
+  function add_rec1_values(tbl in table_of_rec1) return pls_integer is
+    i pls_integer;
+    ret pls_integer := 0;
+  begin
+    for i in tbl.first..tbl.last loop
+      ret := ret + nvl(tbl(i).i, 0) + nvl(tbl(i).j, 0);
+    end loop;
+    return ret;
+  end;
+
+  procedure out_rec1_values(tbl out table_of_rec1) is
+    i pls_integer;
+    rec1val rec1;
+  begin
+    tbl := table_of_rec1();
+    for i in 1..20 loop
+      tbl.extend;
+      if i mod 6 != 0 then
+        if i mod 3 != 0 then
+          rec1val.i := i;
+          rec1val.j := i;
+        else
+          rec1val.i := null;
+          rec1val.j := null;
+        end if;
+        tbl(i) := rec1val;
+      end if;
+    end loop;
+  end;
+end;
+/

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_bind_boolean.rb

@@ -0,0 +1,99 @@
+# Low-level API
+require 'oci8'
+require File.dirname(__FILE__) + '/config'
+
+class TestBindBoolean < Minitest::Test
+  def setup
+    @conn = get_oci8_connection()
+  end
+
+  def test_set_raw
+    stmt = <<EOS
+DECLARE
+  bool_val boolean;
+  int_val pls_integer;
+BEGIN
+  bool_val := :in;
+  IF bool_val THEN
+    int_val := 1;
+  ELSE
+    int_val := 0;
+  END IF;
+  :out := int_val;
+END;
+EOS
+    # explicit bind
+    cursor = @conn.parse(stmt)
+    cursor.bind_param(:in, nil, TrueClass)
+    cursor.bind_param(:out, nil, Integer)
+
+    cursor[:in] = true
+    cursor.exec
+    assert_equal(1, cursor[:out])
+
+    cursor[:in] = false
+    cursor.exec
+    assert_equal(0, cursor[:out])
+
+    # implicit bind
+    do_block_cnt = 0
+    @conn.exec(stmt, true, 0) do |in_val, out_val|
+      assert_equal(true, in_val)
+      assert_equal(1, out_val)
+      do_block_cnt += 1
+    end
+
+    @conn.exec(stmt, false, 0) do |in_val, out_val|
+      assert_equal(false, in_val)
+      assert_equal(0, out_val)
+      do_block_cnt += 1
+    end
+    assert_equal(2, do_block_cnt)
+  end
+
+  def test_get_raw
+    stmt = <<EOS
+DECLARE
+  int_val pls_integer;
+  bool_val boolean;
+BEGIN
+  int_val := :in;
+  IF int_val <> 0 THEN
+    bool_val := TRUE;
+  ELSE
+    bool_val := FALSE;
+  END IF;
+  :out := bool_val;
+END;
+EOS
+    cursor = @conn.parse(stmt)
+    cursor.bind_param(:in, nil, Integer)
+    cursor.bind_param(:out, nil, TrueClass)
+
+    cursor[:in] = 1
+    cursor.exec
+    assert_equal(true, cursor[:out])
+
+    cursor[:in] = 0
+    cursor.exec
+    assert_equal(false, cursor[:out])
+
+    do_block_cnt = 0
+    @conn.exec(stmt, 1, true) do |in_val, out_val|
+      assert_equal(1, in_val)
+      assert_equal(true, out_val)
+      do_block_cnt += 1
+    end
+
+    @conn.exec(stmt, 0, true) do |in_val, out_val|
+      assert_equal(0, in_val)
+      assert_equal(false, out_val)
+      do_block_cnt += 1
+    end
+    assert_equal(2, do_block_cnt)
+  end
+
+  def teardown
+    @conn.logoff
+  end
+end

data/test/test_break.rb

@@ -7,10 +7,12 @@ class TestBreak < Minitest::Test
 
   def setup
     @conn = get_oci8_connection
+    Thread.report_on_exception, @original_report_on_exception = false, Thread.report_on_exception if Thread.respond_to?(:report_on_exception)
   end
 
   def teardown
     @conn.logoff
+    Thread.report_on_exception = @original_report_on_exception if Thread.respond_to?(:report_on_exception)
   end
 
   def report(str)
@@ -20,9 +22,8 @@ class TestBreak < Minitest::Test
   @@server_is_runing_on_windows = nil
   def server_is_runing_on_windows?
     if @@server_is_runing_on_windows.nil?
-      @@server_is_runing_on_windows = false
-      @conn.exec('select banner from v$version') do |row|
-        @@server_is_runing_on_windows = true if row[0].include? 'Windows'
+      @conn.exec('select dbms_utility.port_string from dual') do |row|
+        @@server_is_runing_on_windows = row[0].include? '/WIN'
       end
     end
     @@server_is_runing_on_windows
@@ -61,7 +62,7 @@ class TestBreak < Minitest::Test
     expect = []
     expect[PLSQL_DONE] = TIME_IN_PLSQL
     expect[OCIBREAK]   = "Invalid status"
-    if defined? Rubinius and Rubinius::VERSION >= "2.0"
+    if (defined? Rubinius and Rubinius::VERSION >= "2.0") || (defined? RUBY_ENGINE and RUBY_ENGINE == "truffleruby")
       # Rubinius 2.0.0.
       # DBMS_LOCK.SLEEP blocks ruby threads which try to call C-API.
       expect[SEND_BREAK] = TIME_TO_BREAK
@@ -98,6 +99,11 @@ class TestBreak < Minitest::Test
   def test_timeout
     @conn.non_blocking = true
     start_time = Time.now
+    if server_is_runing_on_windows?
+      end_time = start_time + 5
+    else
+      end_time = start_time + 1
+    end
 
     if defined? Rubinius and Rubinius::VERSION < "2.0"
       # Rubinius 1.2.4
@@ -111,12 +117,8 @@ class TestBreak < Minitest::Test
         @conn.exec("BEGIN DBMS_LOCK.SLEEP(5); END;")
       end
     end
-    if server_is_runing_on_windows?
-      end_time = start_time + 5
-    else
-      end_time = start_time + 1
-    end
     assert_in_delta(Time.now, end_time, 1)
+    sleep(0.01) # for truffleruby. Is truffleruby too fast?
     @conn.exec("BEGIN NULL; END;")
     assert_in_delta(Time.now, end_time, 1)
   end

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,7 +60,11 @@ 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
       lob2 = OCI8::CLOB.new(@conn, ' '  * (128 * 1024 * 1024))
     rescue OCIError

data/test/test_datetime.rb

@@ -1,6 +1,5 @@
 require 'oci8'
 require File.dirname(__FILE__) + '/config'
-require 'scanf'
 
 class TestDateTime < Minitest::Test
 
@@ -28,6 +27,12 @@ class TestDateTime < Minitest::Test
     convert_to_datetime($1.to_i, $2.to_i, $3.to_i, $4.to_i, $5.to_i, $6.to_i, subsec, $8)
   end
 
+  # 'YYYY-MM-DD HH24:MI:SS' or 'YYYY-MM-DD HH24:MI:SS.FF6' to array
+  def string_to_array(str)
+    /(\d+)-(\d+)-(\d+) (\d+):(\d+):(\d+)(?:\.(\d+))?/ =~ str
+    [$1.to_i, $2.to_i, $3.to_i, $4.to_i, $5.to_i, $6.to_i, $7 ? $7.to_i / 1000 : 0]
+  end
+
   def setup
     @conn = get_oci8_connection
   end
@@ -43,7 +48,7 @@ class TestDateTime < Minitest::Test
       @conn.exec(<<-EOS) do |row|
 SELECT TO_DATE('#{date}', 'YYYY-MM-DD HH24:MI:SS') FROM dual
 EOS
-        assert_equal(Time.local(*date.scanf("%d-%d-%d %d:%d:%d.%06d")), row[0])
+        assert_equal(Time.local(*string_to_array(date)), row[0])
       end
     end
   end
@@ -94,7 +99,7 @@ EOS
       @conn.exec(<<-EOS) do |row|
 SELECT TO_TIMESTAMP('#{date}', 'YYYY-MM-DD HH24:MI:SS.FF') FROM dual
 EOS
-        assert_equal(Time.local(*date.scanf("%d-%d-%d %d:%d:%d.%06d")), row[0])
+        assert_equal(Time.local(*string_to_array(date)), row[0])
       end
     end
   end

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)