ruby-oci8 2.2.0.2 → 2.2.12

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_equal(test_data3, 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

data/test/test_oranumber.rb

@@ -215,9 +215,15 @@ EOS
   end
 
   def test_yaml
+    # Use the permitted_classes keyword parameter if it is supported by YAML.load
+    keyword_params = if YAML.method(:load).parameters.any? { |key, value| value == :permitted_symbols }
+                       {permitted_classes: [OraNumber]}
+                     else
+                       {}
+                     end
     (LARGE_RANGE_VALUES + ['~', '-~']).each do |x|
       n = OraNumber.new(x)
-      assert_equal(n, YAML.load(YAML.dump(n)))
+      assert_equal(n, YAML.load(YAML.dump(n), **keyword_params))
     end
   end
 
@@ -702,12 +708,12 @@ EOS
   def test_new_from_bigdecimal
     ["+Infinity", "-Infinity", "NaN"].each do |n|
       assert_raises TypeError do
-        OraNumber.new(BigDecimal.new(n))
+        OraNumber.new(BigDecimal(n))
       end
     end
 
     LARGE_RANGE_VALUES.each do |val|
-      assert_equal(val, OraNumber.new(BigDecimal.new(val)).to_s)
+      assert_equal(val, OraNumber.new(BigDecimal(val)).to_s)
     end
   end
 
@@ -738,9 +744,9 @@ EOS
     LARGE_RANGE_VALUES
   end
 
-  def test_has_decimal_part
-    assert_equal(false, OraNumber(10.0).has_decimal_part?)
-    assert_equal(true,  OraNumber(10.1).has_decimal_part?)
+  def test_has_fractional_part
+    assert_equal(false, OraNumber(10.0).has_fractional_part?)
+    assert_equal(true,  OraNumber(10.1).has_fractional_part?)
   end
 
   def test_float_conversion_type_ruby

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
@@ -637,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] => {
@@ -727,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] => {
@@ -844,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,36 +1,27 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ruby-oci8
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 2
-  - 2
-  - 0
-  - 2
-  version: 2.2.0.2
+version: !ruby/object:Gem::Version
+  version: 2.2.12
 platform: ruby
-authors: 
+authors:
 - Kubo Takehiro
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2015-10-12 00:00:00 +09:00
-default_executable: 
+date: 2022-12-30 00:00:00.000000000 Z
 dependencies: []
+description: 'ruby-oci8 is a ruby interface for Oracle using OCI8 API. It is available
+  with Oracle 10g or later including Oracle Instant Client.
 
-description: |
-  ruby-oci8 is a ruby interface for Oracle using OCI8 API. It is available with Oracle 10g or later including Oracle Instant Client.
-
+  '
 email: kubo@jiubao.org
 executables: []
-
-extensions: 
+extensions:
 - ext/oci8/extconf.rb
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
-files: 
-- .yardopts
+files:
+- ".yardopts"
 - COPYING
 - COPYING_old
 - ChangeLog
@@ -38,17 +29,18 @@ files:
 - NEWS
 - README.md
 - dist-files
-- metaconfig
-- pre-distclean.rb
-- ruby-oci8.gemspec
-- setup.rb
+- docs/bind-array-to-in_cond.md
+- docs/conflicts-local-connections-and-processes.md
+- docs/hanging-after-inactivity.md
 - docs/install-binary-package.md
 - docs/install-full-client.md
 - docs/install-instant-client.md
 - docs/install-on-osx.md
-- docs/osx-install-dev-tools.png
+- docs/ldap-auth-and-function-interposition.md
+- docs/number-type-mapping.md
 - docs/platform-specific-issues.md
 - docs/report-installation-issue.md
+- docs/timeout-parameters.md
 - ext/oci8/.document
 - ext/oci8/MANIFEST
 - ext/oci8/apiwrap.c.tmpl
@@ -87,8 +79,8 @@ files:
 - ext/oci8/util.c
 - ext/oci8/win32.c
 - lib/.document
-- lib/oci8.rb
 - lib/dbd/OCI8.rb
+- lib/oci8.rb
 - lib/oci8/.document
 - lib/oci8/bindtype.rb
 - lib/oci8/check_load_error.rb
@@ -105,12 +97,21 @@ files:
 - lib/oci8/oracle_version.rb
 - lib/oci8/properties.rb
 - lib/oci8/version.rb
-- test/README
+- lib/ruby-oci8.rb
+- metaconfig
+- pre-distclean.rb
+- ruby-oci8.gemspec
+- setup.rb
+- test/README.md
 - test/config.rb
 - test/setup_test_object.sql
+- test/setup_test_package.sql
 - test/test_all.rb
 - test/test_appinfo.rb
 - test/test_array_dml.rb
+- test/test_bind_array.rb
+- test/test_bind_boolean.rb
+- test/test_bind_integer.rb
 - test/test_bind_raw.rb
 - test/test_bind_string.rb
 - test/test_bind_time.rb
@@ -118,10 +119,10 @@ files:
 - test/test_clob.rb
 - test/test_connection_pool.rb
 - test/test_connstr.rb
-- test/test_encoding.rb
 - test/test_datetime.rb
 - test/test_dbi.rb
 - test/test_dbi_clob.rb
+- test/test_encoding.rb
 - test/test_error.rb
 - test/test_metadata.rb
 - test/test_object.rb
@@ -130,41 +131,30 @@ files:
 - test/test_oradate.rb
 - test/test_oranumber.rb
 - test/test_package_type.rb
+- test/test_properties.rb
 - test/test_rowid.rb
-has_rdoc: true
 homepage: http://www.rubydoc.info/github/kubo/ruby-oci8
-licenses: 
-- 2-clause BSD-style license
+licenses:
+- BSD-2-Clause
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-- ext/oci8
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 9
-      - 1
+    - !ruby/object:Gem::Version
       version: 1.9.1
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 3.4.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby interface for Oracle using OCI8 API
-test_files: 
+test_files:
 - test/test_all.rb

data/test/README

@@ -1,42 +0,0 @@
-Before runing unit test:
-
-1. connect to Oracle as system:
-
-    $ sqlplus system/<password_of_system>
-
-2. create user ruby:
-
-    SQL> CREATE USER ruby IDENTIFIED BY oci8;
-
-   or
-
-    SQL> CREATE USER ruby IDENTIFIED BY oci8
-       2 DEFAULT TABLESPACE users TEMPORARY TABLESPACE temp;
-
-3. grant the privilege to connect and execute.
-
-    SQL> GRANT connect, resource, create view TO ruby;
-
-4. connect to Oracle as sys
-
-    $ sqlplus 'sys/<password_of_sys> as sysdba'
-
-5. grant privileges
-
-    SQL> GRANT EXECUTE ON dbms_lock TO ruby;
-    SQL> GRANT CREATE VIEW TO ruby;
-
-6. connect as ruby user.
-
-    $ sqlplus ruby/oci8
-
-7. Create object types
-
-    SQL> @test/setup_test_object.sql
-
-8. change $dbname if the database 
-
-Then you can run:
-  $ make check
-or
-  $ nmake check   (If your compiler is MS Visual C++.)