ruby-oci8 2.2.0.2 → 2.2.12

data/test/test_bind_integer.rb

@@ -0,0 +1,47 @@
+require 'oci8'
+require File.dirname(__FILE__) + '/config'
+
+class TestBindInteger < Minitest::Test
+
+  def setup
+    @conn = get_oci8_connection
+  end
+
+  POSITIVE_INTS = [
+    100,
+    2**30,
+    2**31,
+    2**32,
+    2**33,
+    2**62,
+    2**63,
+    2**64,
+    ('9' * 38).to_i
+  ]
+
+  def bind_and_get(input_value, output_type)
+    cursor = @conn.parse("BEGIN :out := :in; END;")
+    cursor.bind_param(:out, output_type)
+    cursor.bind_param(:in, input_value)
+    cursor.exec
+    result = cursor[:out]
+    cursor.close
+    result
+  end
+
+  (POSITIVE_INTS + [0] + POSITIVE_INTS.map(&:-@)).each do |num|
+    define_method("test_bind_param_with_input_of '#{num}'") do
+      assert_equal(OraNumber.new(num.to_s), bind_and_get(num, OraNumber))
+    end
+
+    define_method("test_bind_param_with_output_of '#{num}'") do
+      result = bind_and_get(OraNumber.new(num.to_s), Integer)
+      assert_equal(num, result)
+      assert_kind_of(Integer, result)
+    end
+  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
@@ -67,7 +51,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
@@ -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_connstr.rb

@@ -75,4 +75,146 @@ class TestConnStr < Minitest::Test
       end
     end
   end
+
+  # https://docs.oracle.com/database/121/NETAG/naming.htm#BABJBFHJ
+  DESC_TEST_CASE =
+    [
+     # Cannot distinguish net service names from easy connect strings in this case.
+     ["sales-server", nil, nil, false, "sales-server"],
+     # Easy Connect string with host.
+     ["//sales-server", nil, nil, false, <<EOS],
+(DESCRIPTION=
+   (CONNECT_DATA=
+       (SERVICE_NAME=))
+   (ADDRESS=
+       (PROTOCOL=TCP)
+       (HOST=sales-server)
+       (PORT=1521)))
+EOS
+     # Easy Connect string with host and port.
+     ["sales-server:3456", nil, nil, false, <<EOS],
+(DESCRIPTION=
+   (CONNECT_DATA=
+       (SERVICE_NAME=))
+   (ADDRESS=
+       (PROTOCOL=TCP)
+       (HOST=sales-server)
+       (PORT=3456)))
+EOS
+     # The host name is sales-server and the service name is sales.
+     ["sales-server/sales", nil, nil, false, <<EOS],
+(DESCRIPTION=
+  (CONNECT_DATA=
+     (SERVICE_NAME=sales))
+  (ADDRESS=
+     (PROTOCOL=TCP)
+     (HOST=sales-server)
+     (PORT=1521)))
+EOS
+     # Easy Connect string with IPv6 address.
+     ["[2001:0db8:0:0::200C:417A]:80/sales", nil, nil, false, <<EOS],
+(DESCRIPTION=
+  (CONNECT_DATA=
+      (SERVICE_NAME=sales))
+  (ADDRESS=
+      (PROTOCOL=TCP)
+      (HOST=2001:0db8:0:0::200C:417A)
+      (PORT=80)))
+EOS
+     # Easy Connect string with IPv6 host address.
+     ["sales-server:80/sales", nil, nil, false, <<EOS],
+(DESCRIPTION=
+  (CONNECT_DATA=
+      (SERVICE_NAME=sales))
+  (ADDRESS=
+      (PROTOCOL=TCP)
+      (HOST=sales-server)
+      (PORT=80)))
+EOS
+     # Easy Connect string with host, service name, and server.
+     ["sales-server/sales:dedicated/inst1", nil, nil, false, <<EOS],
+(DESCRIPTION=
+  (CONNECT_DATA=
+      (SERVICE_NAME=sales)
+      (SERVER=dedicated)
+      (INSTANCE_NAME=inst1))
+  (ADDRESS=
+      (PROTOCOL=TCP)
+      (HOST=sales-server)
+      (PORT=1521)))
+EOS
+      ["sales-server//inst1", nil, nil, false, <<EOS],
+(DESCRIPTION=
+   (CONNECT_DATA=
+      (SERVICE_NAME=)
+      (INSTANCE_NAME=inst1))
+   (ADDRESS=
+      (PROTOCOL=TCP)
+      (HOST=sales-server)
+      (PORT=1521)))
+EOS
+     # 
+     ["sales-server/sales", 20, nil, false, <<EOS],
+(DESCRIPTION=
+  (CONNECT_DATA=
+     (SERVICE_NAME=sales))
+  (ADDRESS=
+     (PROTOCOL=TCP)
+     (HOST=sales-server)
+     (PORT=1521))
+  (TRANSPORT_CONNECT_TIMEOUT=20))
+EOS
+     # 
+     ["sales-server/sales", nil, 30, false, <<EOS],
+(DESCRIPTION=
+  (CONNECT_DATA=
+     (SERVICE_NAME=sales))
+  (ADDRESS=
+     (PROTOCOL=TCP)
+     (HOST=sales-server)
+     (PORT=1521))
+  (CONNECT_TIMEOUT=30))
+EOS
+     #
+     ["sales-server/sales", 20, 30, false, <<EOS],
+(DESCRIPTION=
+  (CONNECT_DATA=
+     (SERVICE_NAME=sales))
+  (ADDRESS=
+     (PROTOCOL=TCP)
+     (HOST=sales-server)
+     (PORT=1521))
+  (TRANSPORT_CONNECT_TIMEOUT=20)
+  (CONNECT_TIMEOUT=30))
+EOS
+     ["sales-server/sales", 20, 30, true, <<EOS],
+(DESCRIPTION=
+  (CONNECT_DATA=
+     (SERVICE_NAME=sales)
+  )
+  (ADDRESS=
+     (PROTOCOL=TCP)
+     (HOST=sales-server)
+     (PORT=1521)
+  )
+  (TRANSPORT_CONNECT_TIMEOUT=20)
+  (CONNECT_TIMEOUT=30)
+  (ENABLE=BROKEN)
+)
+EOS
+    ]
+
+  def test_connect_descriptor
+    obj = OCI8.allocate # create an uninitialized object.
+    DESC_TEST_CASE.each do |test_case|
+      easy_connect_string = test_case[0]
+      tcp_connnect_timeout= test_case[1]
+      outbound_connnect_timeout = test_case[2]
+      tcp_keepalive = test_case[3]
+      expected_result = test_case[4].gsub(/\s/, '')
+      # use instance_eval to call a private method to_connect_descriptor
+      result = obj.instance_eval { to_connect_descriptor(easy_connect_string, tcp_connnect_timeout, outbound_connnect_timeout, tcp_keepalive) }
+      assert_equal(expected_result, result, easy_connect_string)
+    end
+  end
 end

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_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

@@ -22,7 +22,7 @@ begin
 
   begin
     version = RbTestObj.test_object_version(conn)
-    error_message = "Invalid test object version" if version != 2
+    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."
@@ -48,6 +48,12 @@ EOS
 class RbTestIntArray < OCI8::Object::Base
 end
 
+class RbTestObjBase < OCI8::Object::Base
+end
+
+class RbTestObjSub < RbTestObjBase
+end
+
 class TestObj1 < Minitest::Test
   Delta = 0.00001
 
@@ -94,7 +100,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
 
@@ -103,16 +110,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
@@ -129,7 +148,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
@@ -193,7 +214,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
@@ -217,7 +239,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)
@@ -231,17 +254,38 @@ 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)
+      assert_equal(@timestamp_val, timestamp_val)
+      assert_equal(@timestamp_tz_val, timestamp_tz_val)
     end
 
     def assert_array_in_delta(exp, val)
@@ -250,6 +294,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
@@ -450,10 +496,45 @@ 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
+
+  def test_get_subtype
+    csr = @conn.parse("BEGIN :result := rb_test_obj_get_object(:1); END;")
+    csr.bind_param(1, nil, RbTestObjBase)
+    csr.bind_param(2, nil, Integer)
+
+    csr[2] = 0
+    csr.exec
+    val = csr[1]
+    assert_instance_of(RbTestObjBase, val)
+    assert_equal(val.id, 'base')
+
+    csr[2] = 1
+    csr.exec
+    val = csr[1]
+    assert_instance_of(RbTestObjSub, val)
+    assert_equal(val.id, 'sub')
+    assert_equal(val.subid, 'subid')
+  end
 end