ruby-oci8 2.2.3 → 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
@@ -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

@@ -80,9 +80,9 @@ class TestConnStr < Minitest::Test
   DESC_TEST_CASE =
     [
      # Cannot distinguish net service names from easy connect strings in this case.
-     ["sales-server", nil, nil, "sales-server"],
+     ["sales-server", nil, nil, false, "sales-server"],
      # Easy Connect string with host.
-     ["//sales-server", nil, nil, <<EOS],
+     ["//sales-server", nil, nil, false, <<EOS],
 (DESCRIPTION=
    (CONNECT_DATA=
        (SERVICE_NAME=))
@@ -92,7 +92,7 @@ class TestConnStr < Minitest::Test
        (PORT=1521)))
 EOS
      # Easy Connect string with host and port.
-     ["sales-server:3456", nil, nil, <<EOS],
+     ["sales-server:3456", nil, nil, false, <<EOS],
 (DESCRIPTION=
    (CONNECT_DATA=
        (SERVICE_NAME=))
@@ -102,7 +102,7 @@ EOS
        (PORT=3456)))
 EOS
      # The host name is sales-server and the service name is sales.
-     ["sales-server/sales", nil, nil, <<EOS],
+     ["sales-server/sales", nil, nil, false, <<EOS],
 (DESCRIPTION=
   (CONNECT_DATA=
      (SERVICE_NAME=sales))
@@ -112,7 +112,7 @@ EOS
      (PORT=1521)))
 EOS
      # Easy Connect string with IPv6 address.
-     ["[2001:0db8:0:0::200C:417A]:80/sales", nil, nil, <<EOS],
+     ["[2001:0db8:0:0::200C:417A]:80/sales", nil, nil, false, <<EOS],
 (DESCRIPTION=
   (CONNECT_DATA=
       (SERVICE_NAME=sales))
@@ -122,7 +122,7 @@ EOS
       (PORT=80)))
 EOS
      # Easy Connect string with IPv6 host address.
-     ["sales-server:80/sales", nil, nil, <<EOS],
+     ["sales-server:80/sales", nil, nil, false, <<EOS],
 (DESCRIPTION=
   (CONNECT_DATA=
       (SERVICE_NAME=sales))
@@ -132,7 +132,7 @@ EOS
       (PORT=80)))
 EOS
      # Easy Connect string with host, service name, and server.
-     ["sales-server/sales:dedicated/inst1", nil, nil, <<EOS],
+     ["sales-server/sales:dedicated/inst1", nil, nil, false, <<EOS],
 (DESCRIPTION=
   (CONNECT_DATA=
       (SERVICE_NAME=sales)
@@ -143,7 +143,7 @@ EOS
       (HOST=sales-server)
       (PORT=1521)))
 EOS
-      ["sales-server//inst1", nil, nil, <<EOS],
+      ["sales-server//inst1", nil, nil, false, <<EOS],
 (DESCRIPTION=
    (CONNECT_DATA=
       (SERVICE_NAME=)
@@ -154,7 +154,7 @@ EOS
       (PORT=1521)))
 EOS
      # 
-     ["sales-server/sales", 20, nil, <<EOS],
+     ["sales-server/sales", 20, nil, false, <<EOS],
 (DESCRIPTION=
   (CONNECT_DATA=
      (SERVICE_NAME=sales))
@@ -165,7 +165,7 @@ EOS
   (TRANSPORT_CONNECT_TIMEOUT=20))
 EOS
      # 
-     ["sales-server/sales", nil, 30, <<EOS],
+     ["sales-server/sales", nil, 30, false, <<EOS],
 (DESCRIPTION=
   (CONNECT_DATA=
      (SERVICE_NAME=sales))
@@ -176,7 +176,7 @@ EOS
   (CONNECT_TIMEOUT=30))
 EOS
      #
-     ["sales-server/sales", 20, 30, <<EOS],
+     ["sales-server/sales", 20, 30, false, <<EOS],
 (DESCRIPTION=
   (CONNECT_DATA=
      (SERVICE_NAME=sales))
@@ -186,6 +186,21 @@ EOS
      (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
     ]
 
@@ -195,9 +210,10 @@ EOS
       easy_connect_string = test_case[0]
       tcp_connnect_timeout= test_case[1]
       outbound_connnect_timeout = test_case[2]
-      expected_result = test_case[3].gsub(/\s/, '')
+      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) }
+      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

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

@@ -22,7 +22,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 +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
 
@@ -109,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
@@ -135,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
@@ -199,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
@@ -223,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)
@@ -267,7 +284,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

@@ -25,54 +25,142 @@ EOS
     drop_table('test_rename_table')
   end
 
-  # USE_DYNAMIC_FETCH doesn't work well...
-  # This test is disabled.
-  def _test_long_type
-    drop_table('test_table')
-    @conn.exec('CREATE TABLE test_table (id number(38), lng long)')
-    test_data1 = 'a' * 70000
-    test_data2 = 'b' * 3000
-    test_data3 = nil
-    test_data4 = 'c' * 70000
-    @conn.exec('insert into test_table values (:1, :2)', 1, test_data1)
-    @conn.exec('insert into test_table values (:1, :2)', 2, [test_data2, :long])
-    @conn.exec('insert into test_table values (:1, :2)', 3, [nil, :long])
-    @conn.exec('insert into test_table values (:1, :2)', 4, [test_data4, :long])
-
-    [8000, 65535, 65536, 80000].each do |read_len|
-      @conn.long_read_len = read_len
-      cursor = @conn.parse('SELECT lng from test_table order by id')
-      cursor.exec
-      assert_equal(test_data1, cursor.fetch[0])
-      assert_equal(test_data2, cursor.fetch[0])
-      assert_equal(test_data3, cursor.fetch[0])
-      assert_equal(test_data4, cursor.fetch[0])
-      cursor.close
+  # Set `OCI8::BindType::Base.initial_chunk_size = 5` to
+  # use the following test data.
+  LONG_TEST_DATA = [
+    # initial chunk size: 5 (total buffer size: 5)
+    'a' * 4, 'b' * 5, 'c' * 6, 'd' * 5, 'e' * 4,
+    # second chunk size: 10 (total buffer size: 15)
+    'f' * 14, 'g' * 15, 'h' * 16, 'i' * 15, 'j' * 14,
+    # third chunk size: 20 (total buffer size: 35)
+    'k' * 34, 'l' * 35, 'm' * 36, 'n' * 35, 'o' * 34,
+    # use data around initial chunk size again
+    'p' * 4, 'q' * 5, 'r' * 6, 's' * 5, 't' * 4,
+    # special data
+    '', nil,
+  ]
+
+  def test_long_type
+    clob_bind_type = OCI8::BindType::Mapping[:clob]
+    blob_bind_type = OCI8::BindType::Mapping[:blob]
+    initial_cunk_size = OCI8::BindType::Base.initial_chunk_size
+    begin
+      OCI8::BindType::Base.initial_chunk_size = 5
+      @conn.prefetch_rows = LONG_TEST_DATA.size / 3
+      drop_table('test_table')
+      ascii_enc = Encoding.find('US-ASCII')
+      0.upto(1) do |i|
+        if i == 0
+          @conn.exec("CREATE TABLE test_table (id number(38), long_column long, clob_column clob)")
+          cursor = @conn.parse('insert into test_table values (:1, :2, :3)')
+          cursor.bind_param(1, nil, Integer)
+          cursor.bind_param(2, nil, :long)
+          cursor.bind_param(3, nil, :clob)
+          lob = OCI8::CLOB.new(@conn, '')
+          enc = Encoding.default_internal || OCI8.encoding
+        else
+          @conn.exec("CREATE TABLE test_table (id number(38), long_raw_column long raw, blob_column blob)")
+          cursor = @conn.parse('insert into test_table values (:1, :2, :3)')
+          cursor.bind_param(1, nil, Integer)
+          cursor.bind_param(2, nil, :long_raw)
+          cursor.bind_param(3, nil, :blob)
+          lob = OCI8::BLOB.new(@conn, '')
+          enc = Encoding.find('ASCII-8BIT')
+        end
+
+        LONG_TEST_DATA.each_with_index do |data, index|
+          cursor[1] = index
+          cursor[2] = data
+          if data.nil?
+            cursor[3] = nil
+          else
+            lob.rewind
+            lob.write(data)
+            lob.size = data.size
+            cursor[3] = lob
+          end
+          cursor.exec
+        end
+        cursor.close
+
+        cursor = @conn.parse('SELECT * from test_table order by id')
+        cursor.exec
+        LONG_TEST_DATA.each_with_index do |data, index|
+          row = cursor.fetch
+          assert_equal(index, row[0])
+          if data.nil?
+            assert_nil(row[1])
+            assert_nil(row[2])
+          elsif data.empty?
+            # '' is inserted to the long or long raw column as null.
+            assert_nil(row[1])
+            # '' is inserted to the clob or blob column as an empty clob.
+            # It is fetched as '' when the data is read using a LOB locator.
+            assert_equal(data, clob_data = row[2].read)
+            assert_equal(ascii_enc, clob_data.encoding)
+          else
+            assert_equal(data, row[1])
+            assert_equal(data, clob_data = row[2].read)
+            assert_equal(enc, row[1].encoding)
+            assert_equal(enc, clob_data.encoding)
+          end
+        end
+        assert_nil(cursor.fetch)
+        cursor.close
+
+        begin
+          OCI8::BindType::Mapping[:clob] = OCI8::BindType::Long
+          OCI8::BindType::Mapping[:blob] = OCI8::BindType::LongRaw
+          cursor = @conn.parse('SELECT * from test_table order by id')
+          cursor.exec
+          LONG_TEST_DATA.each_with_index do |data, index|
+            row = cursor.fetch
+            assert_equal(index, row[0])
+            if data.nil?
+              assert_nil(row[1])
+              assert_nil(row[2])
+            elsif data.empty?
+              # '' is inserted to the long or long raw column as null.
+              assert_nil(row[1])
+              # '' is inserted to the clob or blob column as an empty clob.
+              # However it is fetched as nil.
+              assert_nil(row[2])
+            else
+              assert_equal(data, row[1])
+              assert_equal(data, row[2])
+              assert_equal(enc, row[1].encoding)
+              assert_equal(enc, row[2].encoding)
+            end
+          end
+          assert_nil(cursor.fetch)
+          cursor.close
+        ensure
+          OCI8::BindType::Mapping[:clob] = clob_bind_type
+          OCI8::BindType::Mapping[:blob] = blob_bind_type
+        end
+        drop_table('test_table')
+      end
+    ensure
+      OCI8::BindType::Base.initial_chunk_size = initial_cunk_size
     end
     drop_table('test_table')
   end
 
-  def test_long_type
-    @conn.long_read_len = 80000
-    drop_table('test_table')
-    @conn.exec('CREATE TABLE test_table (id number(38), lng long)')
-    test_data1 = 'a' * 70000
-    test_data2 = 'b' * 3000
-    test_data3 = nil
-    test_data4 = 'c' * 70000
-    @conn.exec('insert into test_table values (:1, :2)', 1, test_data1)
-    @conn.exec('insert into test_table values (:1, :2)', 2, [test_data2, :long])
-    @conn.exec('insert into test_table values (:1, :2)', 3, [nil, :long])
-    @conn.exec('insert into test_table values (:1, :2)', 4, [test_data4, :long])
-
-    cursor = @conn.parse('SELECT lng from test_table order by id')
-    cursor.exec
-    assert_equal(test_data1, cursor.fetch[0])
-    assert_equal(test_data2, cursor.fetch[0])
-    assert_nil(cursor.fetch[0])
-    assert_equal(test_data4, cursor.fetch[0])
-    cursor.close
-    drop_table('test_table')
+  def test_bind_long_data
+    initial_cunk_size = OCI8::BindType::Base.initial_chunk_size
+    begin
+      OCI8::BindType::Base.initial_chunk_size = 5
+      cursor = @conn.parse("begin :1 := '<' || :2 || '>'; end;")
+      cursor.bind_param(1, nil, :long)
+      cursor.bind_param(2, nil, :long)
+      (LONG_TEST_DATA + ['z' * 4000]).each do |data|
+        cursor[2] = data
+        cursor.exec
+        assert_equal("<#{data}>", cursor[1])
+      end
+    ensure
+      OCI8::BindType::Base.initial_chunk_size = initial_cunk_size
+    end
   end
 
   def test_select
@@ -216,8 +304,8 @@ EOS
 	assert_nil(rv[4])
 	assert_nil(rv[5])
       else
-	dttm = DateTime.civil(2000 + i, 8, 3, 23, 59, 59, Time.now.utc_offset.to_r/86400)
         tm = Time.local(2000 + i, 8, 3, 23, 59, 59)
+        dttm = DateTime.civil(2000 + i, 8, 3, 23, 59, 59, tm.utc_offset.to_r/86400)
 	dt = Date.civil(2000 + i, 8, 3)
 	assert_equal(tm, rv[3])
 	assert_equal(dttm, rv[4])
@@ -451,6 +539,7 @@ EOS
     assert_nil(@conn.last_error)
     @conn.last_error = 'dummy'
     cursor = @conn.parse('select col1, max(col2) from (select 1 as col1, null as col2 from dual) group by col1')
+    cursor.prefetch_rows = 1
     assert_nil(@conn.last_error)
 
     # When an OCI function returns OCI_SUCCESS_WITH_INFO, OCI8#last_error is set.
@@ -492,9 +581,44 @@ 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
+
+  def test_array_fetch
+    drop_table('test_table')
+    @conn.exec("CREATE TABLE test_table (id number, val clob)")
+    cursor = @conn.parse("INSERT INTO test_table VALUES (:1, :2)")
+    1.upto(10) do |i|
+      cursor.exec(i, ('a'.ord + i).chr * i)
+    end
+    cursor.close
+    cursor = @conn.parse("select * from test_table where id <= :1 order by id")
+    cursor.prefetch_rows = 4
+    [1, 6, 2, 7, 3, 8, 4, 9, 5, 10].each do |i|
+      cursor.exec(i)
+      1.upto(i) do |j|
+        row = cursor.fetch
+        assert_equal(j, row[0])
+        assert_equal(('a'.ord + j).chr * j, row[1].read)
+      end
+      assert_nil(cursor.fetch)
+    end
+  end
 end # TestOCI8