ruby-oci8 2.2.9 → 2.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c25848b0ead77aa10db38b21ed417f2ed1c698aaf62c2b48b7674b6b3062e34
-  data.tar.gz: 8729938e91275ed0b9c21c6d3812020efa2e1e5c6da8be7c94abd36fcf71d4ef
+  metadata.gz: 4ca16dcc5691bc79740b2b6e308315d013c3f482f991325f70a129a7cf34de0c
+  data.tar.gz: c953f017dab68ed7c2a3934ec29b7312c401516a04b44d32f53c83b0015988b9
 SHA512:
-  metadata.gz: 07dab83e782e02de48aa1f0f1e89ed52e17a4393a29ab17ce1443b84529d0c0b8aa3fad6c2a787cdd20fde55d3a9e9458de9aca72128479612b5f067c8bac83e
-  data.tar.gz: 63feed97f0d6aedff09e5a283cd5c65a25091bc16c77e36971b864695a1f5ec602b278aad8bc32fc91c79f92a8e5c30c3040ae35b69c6d1e59cbc29b5beb895e
+  metadata.gz: 3c54d89e2b858e9dcd874d3f9351c707443d1171154c1d9145f3ddd0931e3168809fc3e91ef1cbc1dca2e6b4e699e5eb2e5d05a7e320cfb0926359a71ff9b3d9
+  data.tar.gz: 611469d0047283c54b7110090bcd9e45a677c3afaba9f6b1c6c4efbaca8afd3092ee1b871d28149459fa82f52f12e36d71bae6cb99e37be0c5ecb148ae300ead

data/NEWS

@@ -1,5 +1,20 @@
 # @markup markdown
 
+2.2.10 (2022-01-12)
+===================
+
+- Use `File.exist?` instead of removed `File.exists?` in Ruby 3.2 (GH-242)
+
+  (contributed by Yasuo Honda)
+
+- Support ruby 3.1 distributed by rubyinstaller.org
+
+- Remove code for obsolete platforms
+  - Ruby compiled by Borland C++
+  - macOS released several years ago
+
+- Detect arm64 macOS shared library in oraconf.rb in preparation for Instant Client for Apple Silicon release.
+
 2.2.9 (2020-12-30)
 ==================
 

data/README.md

@@ -2,7 +2,7 @@ Ruby-oci8
 =========
 
 [![Gem Version](https://badge.fury.io/rb/ruby-oci8.svg)](http://badge.fury.io/rb/ruby-oci8)
-[![Build Status](https://travis-ci.com/kubo/ruby-oci8.svg?branch=master)](https://travis-ci.com/kubo/ruby-oci8)
+[![Tests](https://github.com/kubo/ruby-oci8/actions/workflows/tests.yml/badge.svg)](https://github.com/kubo/ruby-oci8/actions/workflows/tests.yml)
 
 What is ruby-oci8
 -----------------

data/dist-files

@@ -19,7 +19,6 @@ docs/install-instant-client.md
 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

data/docs/install-on-osx.md

@@ -1,133 +1,46 @@
-# @title Install ruby-oci8 on OS X
+# @title Install ruby-oci8 on macOS
 
-Install ruby-oci8 on OS X
+Install ruby-oci8 on macOS
 =========================
 
-This page explains the way to install ruby-oci8 os OS X.
+**Note: Ruby-oci8 doesn't run on Apple Silicon because Oracle instant client
+for Apple Silicon has not been released yet.**
 
-Look at {file:docs/install-full-client.md}, {file:docs/install-instant-client.md}
-or {file:docs/install-binary-package.md} for other platforms.
-
-Install C compiler
-------------------
-
-You need to install the command line developer tools or the Xcode.
-(The latter includes the former.)
-
-Run `"cc --version"` in a terminal to check whether they are installed.
-
-If the cc version is printed, the tools are installed.
-
-If the follwoing dialog is displayed, click its Install button to
-install the tools.
-You have no need to install the Xcode to compile ruby-oci8.
-It requires command line tools, not an IDE such as the Xcode.
-
-![dialog](osx-install-dev-tools.png)
+Prerequisite
+------------
 
-If `"Agreeing to the Xcode/iOS license requires admin privileges,
-please re-run as root via sudo."` is printed, you need to run
-`"sudo cc --version"`, enter your password, look at the license
-and type `"agree"`.
+* Command line tools for Xcode or Xcode (by executing `xcode-select --install`) or [Xcode]
 
 Install Oracle Instant Client Packages
 --------------------------------------
 
-### Download Oracle Instant Client Packages
-
-Download the following packages from [Oracle Technology Network][]
-
-* Instant Client Package - Basic (`instantclient-basic-macos.x64-12.1.0.2.0.zip`) or Basic Lite (`instantclient-basiclite-macos.x64-12.1.0.2.0.zip`)
-* Instant Client Package - SDK (`instantclient-sdk-macos.x64-12.1.0.2.0.zip`)
-* Instant Client Package - SQL*Plus (`instantclient-sqlplus-macos.x64-12.1.0.2.0.zip`) (optionally) 
-
-### Install Oracle Instant Client Packages via Homebrew
-
-To install `Oracle Instant Client Basic` via [Homebrew][]
-
-* Copy downloaded zip files to `/Library/Caches/Homebrew`
-  (if the environment variable `HOMEBREW_CACHE`
-  is not set and `$HOME/Library/Caches/Homebrew` doesn't exist.)
-
-* Run the followining commands:
-
-        brew tap InstantClientTap/instantclient
-        brew install instantclient-basic
-        brew install instantclient-sdk
-        brew install instantclient-sqlplus # (optionally)
-
-* Set the environment variable `OCI_DIR` while performing the following installation steps
-  if Homebrew is installed outside `/usr/local`.
-
-        export OCI_DIR=$(brew --prefix)/lib
-
-To install `Oracle Instant Client Basic Lite` via [Homebrew][]
-
-* Copy downloaded zip files to `/Library/Caches/Homebrew`
-  (if the environment variable `HOMEBREW_CACHE`
-  is not set and `$HOME/Library/Caches/Homebrew` doesn't exist.)
-
-* Run the followining commands:
-
-        brew tap InstantClientTap/instantclient
-        brew install instantclient-basiclite
-        brew install instantclient-sdk
-        brew install instantclient-sqlplus --with-basiclite # (optionally)
-        
-* Set the environment variable `OCI_DIR` while performing the following installation steps
-  if Homebrew is installed outside `/usr/local`.
-
-        export OCI_DIR=$(brew --prefix)/lib
-
-### Install Oracle Instant Client Manually
-
-If you don't use [Homebrew][], do the following:
-
-Unzip the packages as follows:
-
-    mkdir -p /opt/oracle
-    cd /opt/oracle
-
-Copy downloaded files to /opt/oracle before running the following commands.
-
-    unzip instantclient-basic-macos.x64-12.1.0.2.0.zip
-    unzip instantclient-sdk-macos.x64-12.1.0.2.0.zip
-    unzip instantclient-sqlplus-macos.x64-12.1.0.2.0.zip
-
-Make a symbolic link to link the library.
-
-    cd /opt/oracle/instantclient_12_1
-    ln -s libclntsh.dylib.12.1 libclntsh.dylib
-
-Set the environment variable OCI_DIR while performing the following installation steps.
-
-    export OCI_DIR=/opt/oracle/instantclient_12_1
-
-Installation
-------------
-
-If you get a problem in the following steps, look at {file:docs/report-installation-issue.md}.
-
-### gem package
-
-Run the following command.
+If you have installed [Homebrew], use the following command:
 
-    gem install ruby-oci8
+```shell
+$ brew tap InstantClientTap/instantclient
+$ brew install instantclient-basic   # or instantclient-basiclite
+$ brew install instantclient-sdk
+$ brew install instantclient-sqlplus # (optionally)
+```
 
-### tar.gz package
+Otherwise, look at this [page][OTN] and set the environment variable
+`OCI_DIR` to point the the directory where instant client is installed.
+Ruby-oci8 installation script checks the directory.
 
-#### Download the source code
+```shell
+export OCI_DIR=$HOME/Downloads/instantclient_19_8  # for example
+```
 
-Download the latest tar.gz package from [download page][].
+Install ruby-oci8
+-----------------
 
-#### Run make and install
+Note that `/usr/bin/ruby` isn't available. You need to use [`rbenv`] or so.
 
-    tar xvfz ruby-oci8-VERSION.tar.gz
-    cd ruby-oci8-VERSION
-    make
-    make install
+```shell
+$ gem install ruby-oci8
+```
 
-[download page]: https://bintray.com/kubo/generic/ruby-oci8
 [Homebrew]: http://brew.sh/
-[fix_oralib]: https://github.com/kubo/fix_oralib_osx
-[Oracle Technology Network]: http://www.oracle.com/technetwork/topics/intel-macsoft-096467.html
+[OTN]: https://www.oracle.com/database/technologies/instant-client/macos-intel-x86-downloads.html#ic_osx_inst
+[Xcode]: https://apps.apple.com/us/app/xcode/id497799835
+[`rbenv`]: https://github.com/rbenv/rbenv

data/ext/oci8/apiwrap.c.tmpl

@@ -4,7 +4,6 @@
 %>
 #define API_WRAP_C 1
 #include "apiwrap.h"
-#define BLOCKING_FUNCTION_EPILOGUE(svcctx) do { (svcctx)->executing_thread = Qnil; } while (0)
 
 <%
 prev_name = ''
@@ -59,11 +58,9 @@ static void *oci8_<%=f.name%>_cb(void *user_data)
 %>    data->rv = <%=f.name%>(<%= f.args.collect do |a| 'data->' + a.name; end.join(', ') %>);
 <% end %>
 <% if f.ret == 'sword'
-%>    BLOCKING_FUNCTION_EPILOGUE(data->svcctx);
-    return (void*)(VALUE)data->rv;
+%>    return (void*)(VALUE)data->rv;
 <% else
-%>    BLOCKING_FUNCTION_EPILOGUE(data->svcctx);
-    return NULL;
+%>    return NULL;
 <% end %>
 }
 #else

data/ext/oci8/bind.c

@@ -85,7 +85,7 @@ static void bind_string_set(oci8_bind_t *obind, void *data, void **null_structp,
         rb_raise(rb_eArgError, "too long String to set. (%ld for %d)", RSTRING_LEN(val), obs->bytelen);
     }
     memcpy(vstr->buf, RSTRING_PTR(val), RSTRING_LEN(val));
-    vstr->size = RSTRING_LEN(val);
+    vstr->size = RSTRING_LENINT(val);
 }
 
 static void bind_string_init(oci8_bind_t *obind, VALUE svc, VALUE val, VALUE param)
@@ -195,7 +195,7 @@ static void bind_raw_set(oci8_bind_t *obind, void *data, void **null_structp, VA
         rb_raise(rb_eArgError, "too long String to set. (%ld for %d)", RSTRING_LEN(val), obs->bytelen);
     }
     memcpy(vstr->buf, RSTRING_PTR(val), RSTRING_LEN(val));
-    vstr->size = RSTRING_LEN(val);
+    vstr->size = RSTRING_LENINT(val);
 }
 
 static const oci8_bind_data_type_t bind_raw_data_type = {
@@ -470,7 +470,6 @@ static VALUE bind_long_get(oci8_bind_t *obind, void *data, void *null_struct)
             str = rb_str_conv_enc(str, oci8_encoding, enc);
         }
     }
-    OBJ_TAINT(str);
     return str;
 }
 
@@ -701,7 +700,7 @@ static VALUE oci8_bind_set_data(VALUE self, VALUE val)
         ub4 idx;
         Check_Type(val, T_ARRAY);
 
-        size = RARRAY_LEN(val);
+        size = RARRAY_LENINT(val);
         if (size > obind->maxar_sz) {
             rb_raise(rb_eRuntimeError, "over the max array size");
         }

data/ext/oci8/connection_pool.c

@@ -144,13 +144,13 @@ static VALUE oci8_cpool_initialize(int argc, VALUE *argv, VALUE self)
     chker2(OCIConnectionPoolCreate(oci8_envhp, oci8_errhp, cpool->base.hp.poolhp,
                                    &pool_name, &pool_name_len,
                                    NIL_P(dbname) ? NULL : RSTRING_ORATEXT(dbname),
-                                   NIL_P(dbname) ? 0 : RSTRING_LEN(dbname),
+                                   NIL_P(dbname) ? 0 : RSTRING_LENINT(dbname),
                                    FIX2UINT(conn_min), FIX2UINT(conn_max),
                                    FIX2UINT(conn_incr),
                                    NIL_P(username) ? NULL : RSTRING_ORATEXT(username),
-                                   NIL_P(username) ? 0 : RSTRING_LEN(username),
+                                   NIL_P(username) ? 0 : RSTRING_LENINT(username),
                                    NIL_P(password) ? NULL : RSTRING_ORATEXT(password),
-                                   NIL_P(password) ? 0 : RSTRING_LEN(password),
+                                   NIL_P(password) ? 0 : RSTRING_LENINT(password),
                                    OCI_DEFAULT),
            &cpool->base);
     RB_OBJ_WRITE(cpool->base.self, &cpool->pool_name, rb_str_new(TO_CHARPTR(pool_name), pool_name_len));

data/ext/oci8/lob.c

@@ -719,7 +719,6 @@ read_more_data:
     default:
         v = rb_ary_join(v, Qnil);
     }
-    OBJ_TAINT(v);
     if (lob->lobtype == OCI_TEMP_CLOB) {
         /* set encoding */
         rb_enc_associate(v, oci8_encoding);
@@ -766,10 +765,10 @@ static VALUE oci8_lob_write(VALUE self, VALUE data)
     RB_GC_GUARD(str);
     if (lob->lobtype == OCI_TEMP_CLOB) {
         lob->pos += char_amt;
-        return UINT2NUM(char_amt);
+        return ULL2NUM(char_amt);
     } else {
         lob->pos += byte_amt;
-        return UINT2NUM(byte_amt);
+        return ULL2NUM(byte_amt);
     }
 }
 

data/ext/oci8/metadata.c

@@ -195,7 +195,7 @@ VALUE oci8_do_describe(VALUE self, void *objptr, ub4 objlen, ub1 objtype, VALUE
 static VALUE oci8_describe(VALUE self, VALUE name, VALUE klass, VALUE check_public)
 {
     char *str;
-    size_t idx, len;
+    int idx, len;
     VALUE metadata;
     VALUE obj_link = Qnil;
 
@@ -204,7 +204,7 @@ static VALUE oci8_describe(VALUE self, VALUE name, VALUE klass, VALUE check_publ
         rb_raise(rb_eArgError, "empty string is set.");
     }
     str = RSTRING_PTR(name);
-    len = RSTRING_LEN(name);
+    len = RSTRING_LENINT(name);
     for (idx = 0; idx < len; idx++) {
         if (str[idx] == '@') {
             obj_link = rb_enc_str_new(str + idx + 1, len - idx - 1, oci8_encoding);

data/ext/oci8/object.c

@@ -485,7 +485,7 @@ static VALUE set_coll_element_func(set_coll_element_cb_data_t *cb_data)
 
     chkerr(OCICollSize(oci8_envhp, oci8_errhp, coll, &size));
     if (RARRAY_LEN(val) < size) {
-        chkerr(OCICollTrim(oci8_envhp, oci8_errhp, size - RARRAY_LEN(val), coll));
+        chkerr(OCICollTrim(oci8_envhp, oci8_errhp, (sb4)(size - RARRAY_LEN(val)), coll));
     }
     for (idx = 0; idx < RARRAY_LEN(val); idx++) {
         switch (FIX2INT(datatype)) {
@@ -559,13 +559,13 @@ static void set_attribute(VALUE self, VALUE datatype, VALUE typeinfo, void *data
     case ATTR_STRING:
         OCI8StringValue(val);
         chkerr(OCIStringAssignText(oci8_envhp, oci8_errhp,
-                                   RSTRING_ORATEXT(val), RSTRING_LEN(val),
+                                   RSTRING_ORATEXT(val), RSTRING_LENINT(val),
                                    (OCIString **)data));
         break;
     case ATTR_RAW:
         StringValue(val);
         chkerr(OCIRawAssignBytes(oci8_envhp, oci8_errhp,
-                                 RSTRING_ORATEXT(val), RSTRING_LEN(val),
+                                 RSTRING_ORATEXT(val), RSTRING_LENINT(val),
                                  (OCIRaw **)data));
         break;
     case ATTR_OCINUMBER:
@@ -729,6 +729,8 @@ static VALUE bind_named_type_get(oci8_bind_t *obind, void *data, void *null_stru
     return bnt->obj[idx];
 }
 
+NORETURN(static void bind_named_type_set(oci8_bind_t *obind, void *data, void **null_structp, VALUE val));
+
 static void bind_named_type_set(oci8_bind_t *obind, void *data, void **null_structp, VALUE val)
 {
     rb_raise(rb_eRuntimeError, "not supported");

data/ext/oci8/oci8.c

@@ -556,7 +556,7 @@ static VALUE oci8_server_attach(VALUE self, VALUE dbname, VALUE attach_mode)
     /* attach to the server */
     chker2(OCIServerAttach_nb(svcctx, svcctx->srvhp, oci8_errhp,
                               NIL_P(dbname) ? NULL : RSTRING_ORATEXT(dbname),
-                              NIL_P(dbname) ? 0 : RSTRING_LEN(dbname),
+                              NIL_P(dbname) ? 0 : RSTRING_LENINT(dbname),
                               mode),
            &svcctx->base);
     chker2(OCIAttrSet(svcctx->base.hp.ptr, OCI_HTYPE_SVCCTX,
@@ -864,7 +864,7 @@ static VALUE oci8_set_client_identifier(VALUE self, VALUE val)
     if (!NIL_P(val)) {
         OCI8SafeStringValue(val);
         ptr = RSTRING_PTR(val);
-        size = RSTRING_LEN(val);
+        size = RSTRING_LENINT(val);
     } else {
         ptr = "";
         size = 0;
@@ -899,7 +899,7 @@ static VALUE oci8_set_module(VALUE self, VALUE val)
     if (!NIL_P(val)) {
         OCI8SafeStringValue(val);
         ptr = RSTRING_PTR(val);
-        size = RSTRING_LEN(val);
+        size = RSTRING_LENINT(val);
     } else {
         ptr = "";
         size = 0;
@@ -933,7 +933,7 @@ static VALUE oci8_set_action(VALUE self, VALUE val)
     if (!NIL_P(val)) {
         OCI8SafeStringValue(val);
         ptr = RSTRING_PTR(val);
-        size = RSTRING_LEN(val);
+        size = RSTRING_LENINT(val);
     } else {
         ptr = "";
         size = 0;
@@ -964,7 +964,7 @@ static VALUE oci8_set_client_info(VALUE self, VALUE val)
     if (!NIL_P(val)) {
         OCI8SafeStringValue(val);
         ptr = RSTRING_PTR(val);
-        size = RSTRING_LEN(val);
+        size = RSTRING_LENINT(val);
     } else {
         ptr = "";
         size = 0;

data/ext/oci8/oci8lib.c

@@ -71,7 +71,7 @@ static VALUE bind_base_alloc(VALUE klass)
     rb_raise(rb_eNameError, "private method `new' called for %s:Class", rb_class2name(klass));
 }
 
-#if defined(HAVE_PLTHOOK) && !defined(WIN32) && !defined(__CYGWIN__)
+#if defined(HAVE_PLTHOOK) && !defined(WIN32) && !defined(__CYGWIN__) && !defined(TRUFFLERUBY)
 static const char *find_libclntsh(void *handle)
 {
     void *symaddr = dlsym(handle, "OCIEnvCreate");
@@ -226,7 +226,7 @@ Init_oci8lib()
         oracle_client_version = ORAVERNUM(major, minor, update, patch, port_update);
     }
 #endif
-#if defined(HAVE_PLTHOOK) && !defined(WIN32) && !defined(__CYGWIN__)
+#if defined(HAVE_PLTHOOK) && !defined(WIN32) && !defined(__CYGWIN__) && !defined(TRUFFLERUBY)
     rebind_internal_symbols();
 #endif
 
@@ -461,6 +461,7 @@ sword oci8_call_without_gvl(oci8_svcctx_t *svcctx, void *(*func)(void *), void *
         parg.func = func;
         parg.data = data;
         rv = (sword)rb_protect(protected_call, (VALUE)&parg, &state);
+        RB_OBJ_WRITE(svcctx->base.self, &svcctx->executing_thread, Qnil);
         if (state) {
             rb_jump_tag(state);
         }
@@ -510,7 +511,7 @@ static VALUE exec_sql(VALUE varg)
     sword rv;
 
     chker2(OCIStmtPrepare2(arg->svcctx->base.hp.svc, &arg->stmtp, oci8_errhp, 
-                           (text*)arg->sql_text, strlen(arg->sql_text), NULL, 0,
+                           (text*)arg->sql_text, (ub4)strlen(arg->sql_text), NULL, 0,
                            OCI_NTV_SYNTAX, OCI_DEFAULT),
            &arg->svcctx->base);
     for (pos = 0; pos < arg->num_define_vars; pos++) {

data/ext/oci8/ocihandle.c

@@ -752,7 +752,7 @@ static VALUE attr_set_string(VALUE self, VALUE attr_type, VALUE val)
     Check_Type(attr_type, T_FIXNUM);
     OCI8SafeStringValue(val);
     /* set attribute */
-    chker2(OCIAttrSet(base->hp.ptr, base->type, RSTRING_PTR(val), RSTRING_LEN(val), FIX2INT(attr_type), oci8_errhp), base);
+    chker2(OCIAttrSet(base->hp.ptr, base->type, RSTRING_PTR(val), RSTRING_LENINT(val), FIX2INT(attr_type), oci8_errhp), base);
     return self;
 }
 
@@ -776,7 +776,7 @@ static VALUE attr_set_binary(VALUE self, VALUE attr_type, VALUE val)
     Check_Type(attr_type, T_FIXNUM);
     SafeStringValue(val);
     /* set attribute */
-    chker2(OCIAttrSet(base->hp.ptr, base->type, RSTRING_PTR(val), RSTRING_LEN(val), FIX2INT(attr_type), oci8_errhp), base);
+    chker2(OCIAttrSet(base->hp.ptr, base->type, RSTRING_PTR(val), RSTRING_LENINT(val), FIX2INT(attr_type), oci8_errhp), base);
     return self;
 }
 

data/ext/oci8/ocinumber.c

@@ -154,7 +154,7 @@ static void set_oci_number_from_str(OCINumber *result, VALUE str, VALUE fmt, VAL
     StringValue(str);
     /* set from string. */
     if (NIL_P(fmt)) {
-        int rv = oranumber_from_str(result, RSTRING_PTR(str), RSTRING_LEN(str));
+        int rv = oranumber_from_str(result, RSTRING_PTR(str), RSTRING_LENINT(str));
         if (rv == ORANUMBER_SUCCESS) {
             return; /* success */
         } else {
@@ -172,17 +172,17 @@ static void set_oci_number_from_str(OCINumber *result, VALUE str, VALUE fmt, VAL
     }
     StringValue(fmt);
     fmt_ptr = RSTRING_ORATEXT(fmt);
-    fmt_len = RSTRING_LEN(fmt);
+    fmt_len = RSTRING_LENINT(fmt);
     if (NIL_P(nls_params)) {
         nls_params_ptr = NULL;
         nls_params_len = 0;
     } else {
         StringValue(nls_params);
         nls_params_ptr = RSTRING_ORATEXT(nls_params);
-        nls_params_len = RSTRING_LEN(nls_params);
+        nls_params_len = RSTRING_LENINT(nls_params);
     }
     chkerr(OCINumberFromText(errhp,
-                             RSTRING_ORATEXT(str), RSTRING_LEN(str),
+                             RSTRING_ORATEXT(str), RSTRING_LENINT(str),
                              fmt_ptr, fmt_len, nls_params_ptr, nls_params_len,
                              result));
 }
@@ -249,7 +249,7 @@ static int set_oci_number_from_num(OCINumber *result, VALUE num, int force, OCIE
             if (TYPE(ary[1]) != T_STRING) {
                 goto is_not_big_decimal;
             }
-            digits_len = RSTRING_LEN(ary[1]);
+            digits_len = RSTRING_LENINT(ary[1]);
             set_oci_number_from_str(&digits, ary[1], Qnil, Qnil, errhp);
             /* check base */
             if (TYPE(ary[2]) != T_FIXNUM || FIX2LONG(ary[2]) != 10) {
@@ -365,7 +365,7 @@ OCINumber *oci8_dbl_to_onum(OCINumber *result, double dbl, OCIError *errhp)
         sword rv;
 
         str = rb_obj_as_string(rb_float_new(dbl));
-        rv = oranumber_from_str(result, RSTRING_PTR(str), RSTRING_LEN(str));
+        rv = oranumber_from_str(result, RSTRING_PTR(str), RSTRING_LENINT(str));
         if (rv != 0) {
             oci8_raise_by_msgno(rv, NULL);
         }
@@ -1309,14 +1309,14 @@ static VALUE onum_to_char(int argc, VALUE *argv, VALUE self)
     }
     StringValue(fmt);
     fmt_ptr = RSTRING_ORATEXT(fmt);
-    fmt_len = RSTRING_LEN(fmt);
+    fmt_len = RSTRING_LENINT(fmt);
     if (NIL_P(nls_params)) {
         nls_params_ptr = NULL;
         nls_params_len = 0;
     } else {
         StringValue(nls_params);
         nls_params_ptr = RSTRING_ORATEXT(nls_params);
-        nls_params_len = RSTRING_LEN(nls_params);
+        nls_params_len = RSTRING_LENINT(nls_params);
     }
     rv = OCINumberToText(errhp, _NUMBER(self),
                          fmt_ptr, fmt_len, nls_params_ptr, nls_params_len,
@@ -1437,7 +1437,7 @@ static VALUE onum_to_d_real(OCINumber *num, OCIError *errhp)
         rb_require("bigdecimal");
         cBigDecimal = rb_const_get(rb_cObject, id_BigDecimal);
     }
-    chkerr(OCINumberToText(errhp, num, (const oratext *)fmt, strlen(fmt),
+    chkerr(OCINumberToText(errhp, num, (const oratext *)fmt, (ub4)strlen(fmt),
                            NULL, 0, &buf_size, TO_ORATEXT(buf)));
     return rb_funcall(rb_cObject, id_BigDecimal, 1, rb_usascii_str_new(buf, buf_size));
 }

data/ext/oci8/oraconf.rb

@@ -4,7 +4,7 @@ require 'mkmf'
 # compatibility for ruby-1.9
 RbConfig = Config unless defined? RbConfig
 
-if RUBY_PLATFORM =~ /mswin32|mswin64|cygwin|mingw32|bccwin32/
+if RUBY_PLATFORM =~ /mswin32|mswin64|cygwin|mingw/
   # Windows
   require 'win32/registry'
   module Registry
@@ -43,6 +43,10 @@ class MiniSOReader
   attr_reader :endian
   attr_reader :bits
 
+  MACH_O_CPU_TYPE_I386 = 7
+  MACH_O_CPU_TYPE_X86_64 = 7 + 0x01000000
+  MACH_O_CPU_TYPE_ARM64 = 12 + 0x01000000
+
   def initialize(filename)
     f = open(filename, 'rb')
     begin
@@ -56,9 +60,6 @@ class MiniSOReader
       when "\x02\x10"
         # HP-UX PA-RISC1.1
         read_parisc(f)
-      when "\xfe\xed"
-        # Big-endian Mach-O File
-        read_mach_o_be(f)
       when "\xce\xfa"
         # 32-bit Little-endian Mach-O File
         read_mach_o_le(f, 32)
@@ -67,10 +68,10 @@ class MiniSOReader
         read_mach_o_le(f, 64)
       when "\xca\xfe"
         # Universal binary
-        read_mach_o_unversal(f)
+        read_mach_o_universal(f)
       else
         # AIX and Tru64
-        raise format("unknown file header: %02x %02x", file_header[0].to_i, file_header[1].to_i)
+        raise format("unknown file header: %02x %02x (%s)", file_header[0].ord, file_header[1].ord, filename)
       end
     ensure
       f.close
@@ -174,22 +175,6 @@ class MiniSOReader
     @cpu = :parisc
   end
 
-  # Big-endian Mach-O File
-  def read_mach_o_be(f)
-    @file_format = :mach_o
-    @endian = :big
-    case f.read(2)
-    when "\xfa\xce" # feedface
-      @cpu = :ppc
-      @bits = 32
-    when "\xfa\xcf" # feedfacf
-      @cpu = :ppc64
-      @bits = 64
-    else
-      raise "unknown file format"
-    end
-  end
-
   def read_mach_o_le(f, bits)
     @file_format = :mach_o
     @endian = :little
@@ -199,12 +184,20 @@ class MiniSOReader
       @cpu = :i386
       @bits = 32
     when 64
-      @cpu = :x86_64
+      cputype = f.read(4).unpack('V')[0]
+      case cputype
+      when MACH_O_CPU_TYPE_X86_64
+        @cpu = :x86_64
+      when MACH_O_CPU_TYPE_ARM64
+        @cpu = :arm64
+      else
+        raise "unknown mach-o cpu type: #{cputype}"
+      end
       @bits = 64
     end
   end
 
-  def read_mach_o_unversal(f)
+  def read_mach_o_universal(f)
     raise 'unknown file format' if f.read(2) != "\xba\xbe" # cafebabe
     @file_format = :universal
     nfat_arch = f.read(4).unpack('N')[0]
@@ -213,21 +206,17 @@ class MiniSOReader
     @bits = []
     nfat_arch.times do
       case cputype = f.read(4).unpack('N')[0]
-      when 7
+      when MACH_O_CPU_TYPE_I386
         @cpu    << :i386
         @endian << :little
         @bits   << 32
-      when 7 + 0x01000000
+      when MACH_O_CPU_TYPE_X86_64
         @cpu    << :x86_64
         @endian << :little
         @bits   << 64
-      when 18
-        @cpu    << :ppc
-        @endian << :big
-        @bits   << 32
-      when 18 + 0x01000000
-        @cpu    << :ppc64
-        @endian << :big
+      when MACH_O_CPU_TYPE_ARM64
+        @cpu    << :arm64
+        @endian << :little
         @bits   << 64
       else
         raise "Unknown mach-o cputype: #{cputype}"
@@ -383,7 +372,7 @@ EOS
     is_32bit = size_of_pointer == 4
     is_big_endian = "\x01\x02".unpack('s')[0] == 0x0102
     case RUBY_PLATFORM
-    when /mswin32|mswin64|cygwin|mingw32|bccwin32/
+    when /mswin32|mswin64|cygwin|mingw/
       oci_basename = 'oci'
       oci_glob_postfix = ''
       nls_data_basename = ['oraociei*', 'oraociicus*']
@@ -426,20 +415,13 @@ EOS
       end
       so_ext = 'sl'
     when /darwin/
-      @@ld_envs = %w[DYLD_LIBRARY_PATH]
+      @@ld_envs = %w[OCI_DIR]
       so_ext = 'dylib'
       if is_32bit
-        if is_big_endian
-          this_cpu = :ppc    # 32-bit big-endian
-        else
-          this_cpu = :i386   # 32-bit little-endian
-        end
+        this_cpu = :i386   # 32-bit little-endian
       else
-        if is_big_endian
-          this_cpu = :ppc64  # 64-bit big-endian
-        else
-          this_cpu = :x86_64 # 64-bit little-endian
-        end
+        require 'etc'
+        this_cpu = Etc.uname[:machine].to_sym
       end
       check_proc = Proc.new do |file|
         so = MiniSOReader.new(file)
@@ -513,49 +495,6 @@ EOS
           end
         end
       when /darwin/
-        fallback_path = ENV['DYLD_FALLBACK_LIBRARY_PATH']
-        if fallback_path.nil?
-          puts "  DYLD_FALLBACK_LIBRARY_PATH is not set."
-        else
-          puts "  checking DYLD_FALLBACK_LIBRARY_PATH..."
-          ld_path, file = check_lib_in_path(fallback_path, glob_name, check_proc)
-        end
-        if ld_path.nil?
-          puts "  checking OCI_DIR..."
-          ld_path, file = check_lib_in_path(ENV['OCI_DIR'], glob_name, check_proc)
-          if ld_path
-            puts "  checking dependent shared libraries in #{file}..."
-            open("|otool -L #{file}") do |f|
-              f.gets # discard the first line
-              while line = f.gets
-                line =~ /^\s+(\S+)/
-                libname = $1
-                case libname
-                when /^@rpath\/libclntsh\.dylib/, /^@rpath\/libnnz\d\d\.dylib/, /^@loader_path\/libnnz\d\d\.dylib/
-                  # No need to check the real path.
-                  # The current instant client doesn't use @rpath or @loader_path.
-                when /\/libclntsh\.dylib/, /\/libnnz\d\d.dylib/
-                  raise <<EOS unless File.exists?(libname)
-The output of "otool -L #{file}" is:
-  | #{IO.readlines("|otool -L #{file}").join('  | ')}
-Ruby-oci8 doesn't work without DYLD_LIBRARY_PATH or DYLD_FALLBACK_LIBRARY_PATH
-because the dependent file "#{libname}" doesn't exist.
-
-If you need to use ruby-oci8 without DYLD_LIBRARY_PATH or DYLD_FALLBACK_LIBRARY_PATH,
-download "fix_oralib.rb" in https://github.com/kubo/fix_oralib_osx
-and execute it in the directory "#{File.dirname(file)}" as follows to fix the path.
-
-  cd #{File.dirname(file)}
-  curl -O https://raw.githubusercontent.com/kubo/fix_oralib_osx/master/fix_oralib.rb
-  ruby fix_oralib.rb
-
-Note: DYLD_* environment variables are unavailable for security reasons on OS X 10.11 El Capitan.
-EOS
-                end
-              end
-            end
-          end
-        end
         if ld_path.nil?
           fallback_path = ENV['DYLD_FALLBACK_LIBRARY_PATH']
           if fallback_path.nil?
@@ -566,17 +505,8 @@ EOS
         end
         if ld_path.nil?
           raise <<EOS
-Set the environment variable DYLD_LIBRARY_PATH, DYLD_FALLBACK_LIBRARY_PATH or
-OCI_DIR to point to the Instant client directory.
-
-If DYLD_LIBRARY_PATH or DYLD_FALLBACK_LIBRARY_PATH is set, the environment
-variable must be set at runtime also.
-
-If OCI_DIR is set, dependent shared library paths are checked. If the checking
-is passed, ruby-oci8 works without DYLD_LIBRARY_PATH or DYLD_FALLBACK_LIBRARY_PATH.
-
-Note: OCI_DIR should be absolute path.
-Note: DYLD_* environment variables are unavailable for security reasons on OS X 10.11 El Capitan.
+Oracle instant client is not found.
+You need to install Oracle instant client.
 EOS
         end
       end
@@ -600,8 +530,8 @@ EOS
     paths.split(File::PATH_SEPARATOR).each do |path|
       next if path.nil? or path == ''
       print "    checking #{path}... "
-      path.gsub!(/\\/, '/') if /mswin32|mswin64|cygwin|mingw32|bccwin32/ =~ RUBY_PLATFORM
-      files = Dir.glob(File.join(path, glob_name))
+      path.gsub!(/\\/, '/') if /mswin32|mswin64|cygwin|mingw/ =~ RUBY_PLATFORM
+      files = Dir.glob(File.join(path, glob_name)).sort.reverse
       if files.empty?
         puts "no"
         next
@@ -675,20 +605,10 @@ EOS
     rubyhdrdir = RbConfig::CONFIG["rubyhdrdir"] || RbConfig::CONFIG['archdir']
     unless File.exist?(rubyhdrdir + '/ruby.h')
       puts "failed"
-      if RUBY_PLATFORM =~ /darwin/ and File.exist?("#{RbConfig::CONFIG['archdir']}/../universal-darwin8.0/ruby.h")
-        raise <<EOS
-#{RbConfig::CONFIG['archdir']}/ruby.h doesn't exist.
-Run the following commands to fix the problem.
-
-  cd #{RbConfig::CONFIG['archdir']}
-  sudo ln -s ../universal-darwin8.0/* ./
-EOS
-      else
-        raise <<EOS
+      raise <<EOS
 #{RbConfig::CONFIG['archdir']}/ruby.h doesn't exist.
 Install the ruby development library.
 EOS
-      end
     end
     puts "ok"
     $stdout.flush
@@ -704,11 +624,11 @@ EOS
     end
   end
 
-  if RUBY_PLATFORM =~ /mswin32|mswin64|cygwin|mingw32|bccwin32/ # when Windows
+  if RUBY_PLATFORM =~ /mswin32|mswin64|cygwin|mingw/ # when Windows
 
     def get_libs(lib_dir)
       case RUBY_PLATFORM
-      when /cygwin|x64-mingw32/
+      when /cygwin/
         regex = ([nil].pack('P').size == 8) ? / T (OCI\w+)/ : / T _(OCI\w+)/
         oci_funcs = YAML.load(open(File.dirname(__FILE__) + '/apiwrap.yml')).keys.collect do |func|
           func =~ /_nb$/ ? $` : func
@@ -727,22 +647,6 @@ EOS
         system(command)
         puts("done")
         "-L. -lOCI"
-      when /bccwin32/
-        # replace '/' to '\\' because bcc linker misunderstands
-        # 'C:/foo/bar/OCI.LIB' as unknown option.
-        lib = "#{lib_dir}/BORLAND/OCI.LIB"
-        return lib.tr('/', '\\') if File.exist?(lib)
-        raise <<EOS
-#{lib} does not exist.
-
-Your Oracle may not support Borland C++.
-If you want to run this module, run the following command at your own risk.
-  cd #{lib_dir.tr('/', '\\')}
-  mkdir Borland
-  cd Borland
-  coff2omf ..\\MSVC\\OCI.LIB OCI.LIB
-EOS
-        exit 1
       else
         "\"#{lib_dir}/MSVC/OCI.LIB\""
       end
@@ -786,7 +690,7 @@ class OraConfFC < OraConf
       use_lib32 = false
     end
 
-    if RUBY_PLATFORM =~ /mswin32|mswin64|cygwin|mingw32|bccwin32/
+    if RUBY_PLATFORM =~ /mswin32|mswin64|cygwin|mingw/
       lib_dir = "#{@oracle_home}/oci/lib"
     elsif use_lib32
       lib_dir = "#{@oracle_home}/lib32"
@@ -805,7 +709,7 @@ class OraConfFC < OraConf
     print("Get the version of Oracle from SQL*Plus... ")
     STDOUT.flush
     version = nil
-    dev_null = RUBY_PLATFORM =~ /mswin32|mswin64|mingw32|bccwin32/ ? "nul" : "/dev/null"
+    dev_null = RUBY_PLATFORM =~ /mswin32|mswin64|mingw/ ? "nul" : "/dev/null"
     if File.exist?("#{@oracle_home}/bin/plus80.exe")
       sqlplus = "plus80.exe"
     else
@@ -830,7 +734,7 @@ class OraConfFC < OraConf
     version
   end # get_version
 
-  if RUBY_PLATFORM =~ /mswin32|mswin64|cygwin|mingw32|bccwin32/ # when Windows
+  if RUBY_PLATFORM =~ /mswin32|mswin64|cygwin|mingw/ # when Windows
 
     def is_valid_home?(oracle_home)
       return false if oracle_home.nil?
@@ -912,7 +816,7 @@ EOS
       unless File.exist?("#{@oracle_home}/OCI/INCLUDE/OCI.H")
         raise "'#{@oracle_home}/OCI/INCLUDE/OCI.H' does not exists. Please install 'Oracle Call Interface'."
       end
-      if RUBY_PLATFORM =~ /cygwin|mingw32/
+      if RUBY_PLATFORM =~ /cygwin|mingw/
         " \"-I#{@oracle_home}/OCI/INCLUDE\" -D_int64=\"long long\""
       else
         " \"-I#{@oracle_home}/OCI/INCLUDE\""
@@ -996,7 +900,7 @@ class OraConfIC < OraConf
 
     # check lib_dir
     lib_dirs = lib_dir.split(File::PATH_SEPARATOR)
-    if RUBY_PLATFORM =~ /mswin32|mswin64|cygwin|mingw32|bccwin32/ # when Windows
+    if RUBY_PLATFORM =~ /mswin32|mswin64|cygwin|mingw/ # when Windows
       ocilib = lib_dirs.find do |dir|
         File.exist?("#{dir}/sdk/lib/msvc/oci.lib")
       end
@@ -1061,7 +965,7 @@ EOS
     # check inc_dir
     inc_dirs = inc_dir.split(File::PATH_SEPARATOR)
     ociinc = inc_dirs.find do |dir|
-      File.exists?("#{dir}/oci.h")
+      File.exist?("#{dir}/oci.h")
     end
     unless ociinc
           raise <<EOS
@@ -1074,7 +978,7 @@ EOS
     else
       @cflags = " -I#{ociinc}"
     end
-    @cflags += " -D_int64=\"long long\"" if RUBY_PLATFORM =~ /cygwin|mingw32/
+    @cflags += " -D_int64=\"long long\"" if RUBY_PLATFORM =~ /cygwin|mingw/
 
     # check link
     $CFLAGS += @cflags
@@ -1086,73 +990,10 @@ EOS
       else
         # 10.1.0 doesn't have OCI_MAJOR_VERSION and OCI_MINOR_VERSION in oci.h.
         @version = "1010"
-        if RUBY_PLATFORM =~ /darwin/ and 1.size == 8 and `sw_vers -productVersion`.chomp == "10.7"
-          $stderr.print <<EOS
-WARN! WARN! WARN! WARN! WARN! WARN! WARN! WARN! WARN! WARN! WARN! WARN!
-
-64-bit Oracle instant client doesn't work on OS X Lion.
-See: https://forums.oracle.com/forums/thread.jspa?threadID=2187558
-
-The compilation is continued because the issue may be fixed in future.
-
-WARN! WARN! WARN! WARN! WARN! WARN! WARN! WARN! WARN! WARN! WARN! WARN!
-EOS
-        end
       end
       return
     end
 
-    if RUBY_PLATFORM =~ /darwin/
-      open('mkmf.log', 'r') do |f|
-        while line = f.gets
-          if line.include? '/libclntsh.dylib load command 8 unknown cmd field'
-            raise <<EOS
-Intel mac instant client is for Mac OS X 10.5.
-It doesn't work on Mac OS X 10.4 or before.
-
-You have three workarounds.
-  1. Compile ruby as ppc binary and use it with ppc instant client.
-  2. Use JRuby and JDBC
-  3. Use a third-party ODBC driver and ruby-odbc.
-EOS
-            # '
-          end
-
-          case line
-          when /cputype \(\d+, architecture \w+\) does not match cputype \(\d+\) for specified -arch flag: (\w+)/
-            missing_arch = $1
-          when /Undefined symbols for architecture (\w+)/
-            missing_arch = $1
-          when /missing required architecture (\w+) in file/
-            missing_arch = $1
-          end
-
-          if missing_arch
-            if [nil].pack('p').size == 8
-              my_arch = 'x86_64'
-            elsif "\x01\x02".unpack('s')[0] == 0x0201
-              my_arch = 'i386'
-            else
-              my_arch = 'ppc'
-            end
-            raise <<EOS
-Could not compile with Oracle instant client.
-You may need to set the environment variable RC_ARCHS or ARCHFLAGS as follows:
-
-    RC_ARCHS=#{my_arch}
-    export RC_ARCHS
-or
-    ARCHFLAGS='-arch #{my_arch}'
-    export RC_ARCHS
-
-If it does not fix the problem, delete all '-arch #{missing_arch}'
-in '#{RbConfig::CONFIG['archdir']}/rbconfig.rb'.
-EOS
-          end
-        end
-      end
-    end
-
     unless ld_path.nil?
       raise <<EOS
 Could not compile with Oracle instant client.

data/ext/oci8/plthook_osx.c

@@ -73,10 +73,10 @@ struct plthook {
 };
 
 static int plthook_open_real(plthook_t **plthook_out, const struct mach_header *mh);
-static unsigned int get_bind_addr(plthook_t *plthook, const uint8_t *base, uint32_t lazy_bind_off, uint32_t lazy_bind_size, struct segment_command_ **segments, int addrdiff);
+static unsigned int get_bind_addr(plthook_t *plthook, const uint8_t *base, uint32_t lazy_bind_off, uint32_t lazy_bind_size, struct segment_command_ **segments, ptrdiff_t addrdiff);
 
 static void set_errmsg(const char *fmt, ...) __attribute__((__format__ (__printf__, 1, 2)));
-static void set_bind_addr(unsigned int *idx, plthook_t *plthook, const uint8_t *base, const char *sym_name, int seg_index, int seg_offset, struct segment_command_ **segments);
+static void set_bind_addr(unsigned int *idx, plthook_t *plthook, const uint8_t *base, const char *sym_name, int seg_index, uint64_t seg_offset, struct segment_command_ **segments);
 
 static uint64_t uleb128(const uint8_t **p)
 {
@@ -148,7 +148,7 @@ int plthook_open_by_handle(plthook_t **plthook_out, void *hndl)
         RTLD_LAZY | RTLD_NOLOAD,
         RTLD_LAZY | RTLD_NOLOAD | RTLD_FIRST,
     };
-    int flag_idx;
+    size_t flag_idx;
 #define NUM_FLAGS (sizeof(flags) / sizeof(flags[0]))
 
     if (hndl == NULL) {
@@ -196,8 +196,8 @@ static int plthook_open_real(plthook_t **plthook_out, const struct mach_header *
     struct segment_command_ *segments[NUM_SEGMENTS];
     int segment_idx = 0;
     unsigned int nbind;
-    int addrdiff = 0;
-    int i;
+    ptrdiff_t addrdiff = 0;
+    uint32_t i;
 
     memset(segments, 0, sizeof(segments));
 #ifdef __LP64__
@@ -320,14 +320,14 @@ static int plthook_open_real(plthook_t **plthook_out, const struct mach_header *
     return 0;
 }
 
-static unsigned int get_bind_addr(plthook_t *plthook, const uint8_t *base, uint32_t lazy_bind_off, uint32_t lazy_bind_size, struct segment_command_ **segments, int addrdiff)
+static unsigned int get_bind_addr(plthook_t *plthook, const uint8_t *base, uint32_t lazy_bind_off, uint32_t lazy_bind_size, struct segment_command_ **segments, ptrdiff_t addrdiff)
 {
     const uint8_t *ptr = base + lazy_bind_off + addrdiff;
     const uint8_t *end = ptr + lazy_bind_size;
     const char *sym_name;
     int seg_index = 0;
     uint64_t seg_offset = 0;
-    int count, skip;
+    uint64_t count, skip;
     unsigned int idx;
     DEBUG_BIND("get_bind_addr(%p, 0x%x, 0x%x", base, lazy_bind_off, lazy_bind_size);
     for (idx = 0; segments[idx] != NULL; idx++) {
@@ -341,7 +341,7 @@ static unsigned int get_bind_addr(plthook_t *plthook, const uint8_t *base, uint3
         uint8_t imm = *ptr & BIND_IMMEDIATE_MASK;
         uint64_t ulebval;
         int64_t slebval;
-        int i;
+        uint64_t i;
 
         DEBUG_BIND("0x%02x: ", *ptr);
         ptr++;
@@ -410,10 +410,10 @@ static unsigned int get_bind_addr(plthook_t *plthook, const uint8_t *base, uint3
     return idx;
 }
 
-static void set_bind_addr(unsigned int *idx, plthook_t *plthook, const uint8_t *base, const char *sym_name, int seg_index, int seg_offset, struct segment_command_ **segments)
+static void set_bind_addr(unsigned int *idx, plthook_t *plthook, const uint8_t *base, const char *sym_name, int seg_index, uint64_t seg_offset, struct segment_command_ **segments)
 {
     if (plthook != NULL) {
-        uint32_t vmaddr = segments[seg_index]->vmaddr;
+        uint64_t vmaddr = segments[seg_index]->vmaddr;
         plthook->entries[*idx].name = sym_name;
         plthook->entries[*idx].addr = (void**)(base + vmaddr + seg_offset);
     }

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/lib/oci8/version.rb

@@ -1,3 +1,3 @@
 class OCI8
-  VERSION = "2.2.9"
+  VERSION = "2.2.10"
 end

data/lib/oci8.rb

@@ -110,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/test/test_break.rb

@@ -99,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
@@ -112,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_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,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: ruby-oci8
 version: !ruby/object:Gem::Version
-  version: 2.2.9
+  version: 2.2.10
 platform: ruby
 authors:
 - Kubo Takehiro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-30 00:00:00.000000000 Z
+date: 2022-01-12 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.
 
-'
+  '
 email: kubo@jiubao.org
 executables: []
 extensions:
@@ -38,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
@@ -153,8 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Ruby interface for Oracle using OCI8 API