ruby-oci8 2.2.7 → 2.2.11

data/ext/oci8/stmt.c

@@ -78,7 +78,7 @@ static VALUE oci8_stmt_initialize(VALUE self, VALUE svc, VALUE sql)
     if (!NIL_P(sql)) {
         OCI8SafeStringValue(sql);
 
-        rv = OCIStmtPrepare2(svcctx->base.hp.svc, &stmt->base.hp.stmt, oci8_errhp, RSTRING_ORATEXT(sql), RSTRING_LEN(sql), NULL, 0, OCI_NTV_SYNTAX, OCI_DEFAULT);
+        rv = OCIStmtPrepare2(svcctx->base.hp.svc, &stmt->base.hp.stmt, oci8_errhp, RSTRING_ORATEXT(sql), RSTRING_LENINT(sql), NULL, 0, OCI_NTV_SYNTAX, OCI_DEFAULT);
         if (IS_OCI_ERROR(rv)) {
             chker2(rv, &svcctx->base);
         }
@@ -178,10 +178,10 @@ static VALUE oci8_bind(VALUE self, VALUE vplaceholder, VALUE vbindobj)
          */
         VALUE symval = rb_sym2str(vplaceholder);
         const char *symname = RSTRING_PTR(symval);
-        size_t len = RSTRING_LEN(symval);
+        ub4 len = RSTRING_LENINT(symval);
 #else
         const char *symname = rb_id2name(SYM2ID(vplaceholder));
-        size_t len = strlen(symname);
+        ub4 len = (ub4)strlen(symname);
 #endif
         placeholder_ptr = ALLOCA_N(char, len + 1);
         placeholder_len = len + 1;
@@ -192,7 +192,7 @@ static VALUE oci8_bind(VALUE self, VALUE vplaceholder, VALUE vbindobj)
     } else {
         OCI8StringValue(vplaceholder);
         placeholder_ptr = RSTRING_PTR(vplaceholder);
-        placeholder_len = RSTRING_LEN(vplaceholder);
+        placeholder_len = RSTRING_LENINT(vplaceholder);
     }
     obind = TO_BIND(vbindobj); /* 2 */
     if (obind->base.hp.bnd != NULL) {

data/ext/oci8/win32.c

@@ -26,8 +26,9 @@ typedef struct {
     HKEY hSubKey;
 } enum_homes_arg_t;
 
-static VALUE enum_homes_real(enum_homes_arg_t *arg)
+static VALUE enum_homes_real(VALUE varg)
 {
+    enum_homes_arg_t *arg = (enum_homes_arg_t *)varg;
     LONG rv;
     DWORD type;
     DWORD idx;
@@ -77,8 +78,9 @@ static VALUE enum_homes_real(enum_homes_arg_t *arg)
     return Qnil;
 }
 
-static VALUE enum_homes_ensure(enum_homes_arg_t *arg)
+static VALUE enum_homes_ensure(VALUE varg)
 {
+    enum_homes_arg_t *arg = (enum_homes_arg_t *)varg;
     if (arg->hKey != NULL) {
         RegCloseKey(arg->hKey);
         arg->hKey = NULL;

data/lib/oci8/check_load_error.rb

@@ -4,7 +4,7 @@ class OCI8
   module Util
 
     case RUBY_PLATFORM
-    when /mswin32|cygwin|mingw32|bccwin32/
+    when /mswin32|cygwin|mingw/
 
       require 'fiddle/import'
       require 'fiddle/types'

data/lib/oci8/version.rb

@@ -1,3 +1,3 @@
 class OCI8
-  VERSION = "2.2.7"
+  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
@@ -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

data/ruby-oci8.gemspec

@@ -50,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

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

@@ -7,12 +7,8 @@ Before running unit test:
    ```
 2. Create user ruby
    ```sql
-   SQL> CREATE USER ruby IDENTIFIED BY oci8;
-   ```
-   or
-   ```sql
-   SQL> CREATE USER ruby IDENTIFIED BY oci8
-      2 DEFAULT TABLESPACE users TEMPORARY TABLESPACE temp;
+   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
@@ -27,6 +23,7 @@ Before running unit test:
 5. Create object types
    ```sql
    SQL> @test/setup_test_object.sql
+   SQL> @test/setup_test_package.sql
    ```
 6. change $dbname in test/config.rb.
 

data/test/test_break.rb

@@ -22,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
@@ -63,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
@@ -100,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
@@ -113,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_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_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
 

metadata

@@ -1,35 +1,27 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ruby-oci8
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 2
-  - 2
-  - 7
-  version: 2.2.7
+version: !ruby/object:Gem::Version
+  version: 2.2.11
 platform: ruby
-authors: 
+authors:
 - Kubo Takehiro
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2019-01-06 00:00:00 +09:00
-default_executable: 
+date: 2022-02-22 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
@@ -37,10 +29,6 @@ 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
@@ -50,7 +38,6 @@ files:
 - docs/install-on-osx.md
 - docs/ldap-auth-and-function-interposition.md
 - docs/number-type-mapping.md
-- docs/osx-install-dev-tools.png
 - docs/platform-specific-issues.md
 - docs/report-installation-issue.md
 - docs/timeout-parameters.md
@@ -92,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
@@ -111,6 +98,10 @@ files:
 - lib/oci8/properties.rb
 - lib/oci8/version.rb
 - lib/ruby-oci8.rb
+- metaconfig
+- pre-distclean.rb
+- ruby-oci8.gemspec
+- setup.rb
 - test/README.md
 - test/config.rb
 - test/setup_test_object.sql
@@ -120,18 +111,18 @@ files:
 - 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
-- test/test_bind_integer.rb
 - test/test_break.rb
 - 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
@@ -142,39 +133,28 @@ files:
 - 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: 
+licenses:
 - BSD-2-Clause
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-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.1.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby interface for Oracle using OCI8 API
-test_files: 
+test_files:
 - test/test_all.rb