ruby-oci8 2.1.5 → 2.1.6

data/ChangeLog

@@ -1,3 +1,105 @@
+2013-12-29  KUBO Takehiro  <kubo@jiubao.org>
+	* NEWS: add changes between 2.1.6 and 2.1.5.
+	* VERSION: change the version to 2.1.6.
+
+2013-12-28  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/oraconf.rb: fix for Windows x64. OCI.lib for MSVC doesn't
+	    work with mingw64 compilers. fix URL in the error message.
+
+2013-12-14  KUBO Takehiro  <kubo@jiubao.org>
+	* lib/oci8/metadata.rb, test/test_metadata.rb: fix
+	    OCI8::Metadata::Synonym#schema_name and #translated_name
+	    for synonyms with a database link and without schema_name.
+
+2013-12-14  KUBO Takehiro  <kubo@jiubao.org>
+	* test/*.rb: suppress warnings "MiniTest::Unit::TestCase is now Minitest::Test"
+	    when minitest gem is installed.
+
+2013-12-14  KUBO Takehiro  <kubo@jiubao.org>
+	* test/test_metadata.rb: fix tests in an environment where
+	    the data size of "CAST('1' AS CHAR(1 char))" is wrong.
+
+2013-11-18  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/oraconf.rb: support cygwin x86_64.
+
+2013-11-10  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/error.c, ext/oci8/lob.c, ext/oci8/object.c, ext/oci8/oci8.h,
+	  ext/oci8/oci8lib.c, ext/oci8/ocihandle.c, ext/oci8/stmt.c:
+	    use rb_class_new_instance() instead of rb_funcall() with rb_intern("new").
+
+2013-11-09  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/error.c, ext/oci8/extconf.rb, ext/oci8/oci8.h:
+	    append the full path of the Oracle client library when OCIEnvCreate
+	    is failed such as "OCI Library Initialization Error - /path/to/libclntsh.so.12.1".
+
+2013-11-09  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/extconf.rb, lib/oci8.rb.in: support rubinius 2.x whose
+	    RUBY_VERSION is 2.1.0.
+	* ext/oci8/oraconf.rb: reduce the size of libOCI.a created for cygwin.
+
+2013-11-09  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/extconf.rb, lib/oci8.rb.in: support ruby 2.1.0-preview1.
+	    (requested by Yasuo Honda)
+
+2013-08-24  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/oraconf.rb: Use Dir.glob to find the Oracle instant client
+	    NLS data file. Its name depends on the Oracle major version on
+	    Windows.
+
+2013-08-03  KUBO Takehiro  <kubo@jiubao.org>
+	* lib/oci8/metadata.rb: fix undefined method 'char_used?' when
+	    OCI8::Metadata::Argument#inspect is called.
+	* test/test_metadata.rb: refactor and add tests for #inspect methods.
+	* test/test_package_type.rb: add some test data.
+
+2013-07-30  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/metadata.c, ext/oci8/ocihandle.c, test/test_metadata.rb:
+	    Fix segmentation fault when metadata are accessed after the
+	    session is disconnected.
+
+2013-07-24  KUBO Takehiro  <kubo@jiubao.org>
+	* lib/oci8/metadata.rb, test/test_package_type.rb:
+	    Add OCI8::Metadata::Type#package_name and
+	    OCI8::Metadata::ArgBase#has_default?.
+
+2013-07-22  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/oci8lib.c, lib/oci8.rb.in, lib/oci8/metadata.rb: Add
+	    OCI8::Metadata::Package:types to support package type
+	    description. It is a new feature of Oracle 12c.
+	* test/setup_test_package.sql, test/test_all.rb,
+	  test/test_package_type.rb: Add tests for package type description.
+
+2013-07-15  KUBO Takehiro  <kubo@jiubao.org>
+	* test/*.rb: Use MiniTest instead of Test::Unit.
+
+2013-06-23  KUBO Takehiro  <kubo@jiubao.org>
+	* lib/oci8/cursor.rb, lib/oci8/object.rb: fix to bind object types by
+	    name as OCI8::Cursor#bind_param(pos, val, :named_type, typename).
+	* test/test_object.rb: fix to test OCI8::Cursor#bind_param(pos, val,
+	    :named_type, typename).
+
+2013-06-23  KUBO Takehiro  <kubo@jiubao.org>
+	* lib/oci8/metadata.rb: OCI8#describe_synonym and OCI8#describe_any
+	    accept 'PUBLIC.XXX' as a public synonym name.
+	* test/test_metadata.rb: add tests for OCI8#describe_synonym.
+
+2013-06-11  KUBO Takehiro  <kubo@jiubao.org>
+	* ruby-oci8.gemspec: fix ruby version checking in binary gem.
+	    Gem::ruby_version of ruby 2.0.0p195 is 2.0.0.195, which
+	    doesn't match '= 2.0.0'.
+	    (github issue #36 reported by sodonnel)
+
+2013-03-30  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/oci8lib.c: fix potential SEGV when one connection
+	    is used by more than two threads and temporary lobs are
+	    freed by GC.
+
+2013-03-16  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/apiwrap.yml, ext/oci8/stmt.c: call OCIStmtPrepare2()
+	    without GVL to prevent OCI8#parse from blocking ruby itself
+	    while the connection is used by another thread even though
+	    non-blocking mode is set.
+
 2013-03-09  KUBO Takehiro  <kubo@jiubao.org>
 	* ruby-oci8.gemspec: revert the previous commit because old
 	    rubygems doesn't support:

data/NEWS

@@ -1,5 +1,46 @@
 # @markup markdown
 
+2.1.6
+=====
+
+New Features
+------------
+
+### Support ruby 2.1.0
+
+### Support cygwin x86_64
+
+### OCI8#describe_synonym and OCI8#describe_any accept 'PUBLIC.XXX' as a public synonym name.
+
+Fixed Issues
+------------
+
+-   fix wrong return valus of OCI8::Metadata::Synonym#schema_name
+    and #translated_name for synonyms with a database link but
+    without schema_name.
+
+-   fix ruby version checking in binary gem. Gem::ruby_version of
+    ruby 2.0.0p195 is 2.0.0.195, which doesn't match '= 2.0.0'.
+
+    (github issue #36 reported by sodonnel)
+
+-   fix SEGV when metadata are accessed after the session is disconnected.
+
+-   fix undefined method 'char_used?' when OCI8::Metadata::Argument#inspect is called.
+
+-   fix tests in an environment where the data size of "CAST('1' AS CHAR(1 char))"
+    is wrong.
+
+-   suppress warnings "MiniTest::Unit::TestCase is now Minitest::Test"
+    when minitest gem is installed.
+
+-   fix SEGV when oci8lib.so is compiled by mingw64 without runtime-check option.
+    Note that binary gems are compiled with runtime-check to check available Oracle
+    client features at runtime.
+
+-   fix SEGV when one connection is used by more than two threads and temporary
+    lobs are freed by GC.
+
 2.1.5
 =====
 

data/VERSION

@@ -1 +1 @@
-2.1.5
+2.1.6

data/ext/oci8/apiwrap.yml

@@ -1343,7 +1343,7 @@ OCINlsCharSetNameToId:
             - dvoid *envhp
             - const oratext *name
 
-OCIStmtPrepare2:
+OCIStmtPrepare2_nb:
   :version: 920
   :args:
             - OCISvcCtx *svchp

data/ext/oci8/error.c

@@ -5,7 +5,17 @@
   Copyright (C) 2002-2012 KUBO Takehiro <kubo@jiubao.org>
 
 */
+#if defined __linux && !defined(_GNU_SOURCE)
+#define _GNU_SOURCE 1
+#endif
 #include "oci8.h"
+#ifdef HAVE_DLADDR
+#include <dlfcn.h>
+#endif
+#ifdef __CYGWIN__
+#undef boolean
+#include <windows.h>
+#endif
 
 #ifndef DLEXT
 #define DLEXT ".so"
@@ -84,6 +94,7 @@ static VALUE oci8_make_exc(dvoid *errhp, sword status, ub4 type, OCIStmt *stmthp
     VALUE parse_error_offset = Qnil;
     VALUE sql = Qnil;
     int rv;
+    VALUE args[4];
     int numarg = 1;
 
     switch (status) {
@@ -137,7 +148,11 @@ static VALUE oci8_make_exc(dvoid *errhp, sword status, ub4 type, OCIStmt *stmthp
             sql = rb_external_str_new_with_enc(TO_CHARPTR(text), size, oci8_encoding);
         }
     }
-    exc = rb_funcall(exc, oci8_id_new, numarg, msg, INT2FIX(errcode), sql, parse_error_offset);
+    args[0] = msg;
+    args[1] = INT2FIX(errcode);
+    args[2] = sql;
+    args[3] = parse_error_offset;
+    exc = rb_class_new_instance(numarg, args, exc);
     return set_backtrace(exc, file, line);
 }
 
@@ -211,8 +226,28 @@ void oci8_do_env_raise(OCIEnv *envhp, sword status, const char *file, int line)
 void oci8_do_raise_init_error(const char *file, int line)
 {
     VALUE msg = rb_usascii_str_new_cstr("OCI Library Initialization Error");
-    VALUE exc = rb_funcall(eOCIError, oci8_id_new, 2, msg, INT2FIX(-1));
-
+    VALUE exc;
+    const char *dll_path = NULL;
+#if defined _WIN32 || defined __CYGWIN__
+    HMODULE hMod = GetModuleHandleA("OCI.DLL");
+    char buf[MAX_PATH];
+    if (hMod != NULL) {
+        if (GetModuleFileName(hMod, buf, sizeof(buf))) {
+            dll_path = buf;
+        }
+    }
+#elif defined HAVE_DLADDR
+    void *addr = dlsym(RTLD_DEFAULT, "OCIEnvCreate");
+    Dl_info info;
+    if (addr != NULL && dladdr(addr, &info)) {
+        dll_path = info.dli_fname;
+    }
+#endif
+    if (dll_path != NULL) {
+        msg = rb_str_buf_cat_ascii(msg, " - ");
+        msg = rb_enc_str_buf_cat(msg, dll_path, strlen(dll_path), rb_filesystem_encoding());
+    }
+    exc = rb_class_new_instance(1, &msg, eOCIError);
     rb_exc_raise(set_backtrace(exc, file, line));
 }
 
@@ -246,9 +281,11 @@ VALUE oci8_get_error_message(ub4 msgno, const char *default_msg)
 void oci8_do_raise_by_msgno(ub4 msgno, const char *default_msg, const char *file, int line)
 {
     VALUE msg = oci8_get_error_message(msgno, default_msg);
-    VALUE exc = rb_funcall(eOCIError, oci8_id_new, 2, msg, INT2FIX(-1));
+    VALUE args[2];
+    args[0] = msg;
+    args[1] = INT2FIX(-1);
 
-    rb_exc_raise(set_backtrace(exc, file, line));
+    rb_exc_raise(set_backtrace(rb_class_new_instance(2, args, eOCIError), file, line));
 }
 
 void oci8_check_error_(sword status, oci8_base_t *base, OCIStmt *stmthp, const char *file, int line)

data/ext/oci8/extconf.rb

@@ -103,6 +103,7 @@ if oraconf.cc_is_gcc
 end
 
 have_func("localtime_r")
+have_func("dladdr")
 
 # ruby 1.8 headers
 have_header("intern.h")
@@ -121,6 +122,10 @@ have_func("rb_set_end_proc", "ruby.h")
 have_func("rb_class_superclass", "ruby.h")
 have_func("rb_thread_blocking_region", "ruby.h")
 have_func("rb_thread_call_without_gvl", "ruby/thread.h")
+if (defined? RUBY_ENGINE) && RUBY_ENGINE == 'rbx'
+  have_func("rb_str_buf_cat_ascii", "ruby.h")
+  have_func("rb_enc_str_buf_cat", "ruby.h")
+end
 
 # replace files
 replace = {
@@ -158,8 +163,6 @@ when 'ruby'
   # if it wasn't explicitly changed by the configure option --with-ruby-version.
   #
   case RUBY_VERSION
-  when /^2\.0/
-    so_basename += RUBY_VERSION.gsub(/\W/, '')
   when /^1\.9\.0/
     raise 'unsupported ruby version: 1.9.0'
   when /^1\.9/
@@ -167,20 +170,10 @@ when 'ruby'
   when /^1\.8/
     so_basename += '18'
   else
-    raise 'unsupported ruby version: ' + RUBY_VERSION
+    so_basename += RUBY_VERSION.gsub(/\W/, '')
   end
 when 'rbx'
-  # "rbx -X18" and "rbx -X19" use different C header files.
-  case RUBY_VERSION
-  when /^2\.0/
-    so_basename += 'rbx20'
-  when /^1\.9/
-    so_basename += 'rbx19'
-  when /^1\.8/
-    so_basename += 'rbx18'
-  else
-    raise 'unsupported language mode: ' + RUBY_VERSION
-  end
+  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."
 else

data/ext/oci8/lob.c

@@ -52,7 +52,7 @@ static VALUE oci8_make_lob(VALUE klass, oci8_svcctx_t *svcctx, OCILobLocator *s)
     boolean is_temp;
     VALUE lob_obj;
 
-    lob_obj = rb_funcall(klass, oci8_id_new, 1, svcctx->base.self);
+    lob_obj = rb_class_new_instance(1, &svcctx->base.self, klass);
     lob = DATA_PTR(lob_obj);
     /* If 's' is a temporary lob, use OCILobLocatorAssign instead. */
     chker2(OCILobIsTemporary(oci8_envhp, oci8_errhp, s, &is_temp), &svcctx->base);
@@ -719,10 +719,10 @@ static VALUE oci8_lob_clone(VALUE self)
 {
     oci8_lob_t *lob = DATA_PTR(self);
     oci8_lob_t *newlob;
-    VALUE newobj;
+    VALUE newobj = lob->svcctx ? lob->svcctx->base.self : Qnil;
     boolean is_temporary;
 
-    newobj = rb_funcall(CLASS_OF(self), oci8_id_new, 1, lob->svcctx ? lob->svcctx->base.self : Qnil);
+    newobj = rb_class_new_instance(1, &newobj, CLASS_OF(self));
     newlob = DATA_PTR(newobj);
     if (OCILobIsTemporary(oci8_envhp, oci8_errhp, lob->base.hp.lob, &is_temporary) == OCI_SUCCESS
         && is_temporary) {
@@ -992,7 +992,7 @@ static void bind_lob_init_elem(oci8_bind_t *obind, VALUE svc)
     ub4 idx = 0;
 
     do {
-        oho[idx].obj = rb_funcall(*vptr->klass, oci8_id_new, 1, svc);
+        oho[idx].obj = rb_class_new_instance(1, &svc, *vptr->klass);
         h = DATA_PTR(oho[idx].obj);
         oho[idx].hp = h->hp.ptr;
     } while (++idx < obind->maxar_sz);

data/ext/oci8/metadata.c

@@ -154,6 +154,7 @@ static VALUE oci8_do_describe(VALUE self, void *objptr, ub4 objlen, ub1 objtype,
     chker2(OCIDescribeAny_nb(svcctx, svcctx->base.hp.svc, oci8_errhp, objptr, objlen,
                              objtype, OCI_DEFAULT, (ub1)FIX2INT(type), desc->hp.dschp),
            &svcctx->base);
+    oci8_link_to_parent(desc, &svcctx->base);
     chker2(OCIAttrGet(desc->hp.dschp, OCI_HTYPE_DESCRIBE, &parmhp, 0, OCI_ATTR_PARAM, oci8_errhp),
            &svcctx->base);
     return oci8_metadata_create(parmhp, self, obj);

data/ext/oci8/object.c

@@ -183,7 +183,7 @@ static VALUE get_attribute(VALUE self, VALUE datatype, VALUE typeinfo, void *dat
     case ATTR_NAMED_TYPE:
         Check_Object(typeinfo, cOCI8TDO);
         /* Be carefull. Don't use *tmp_obj* out of this function. */
-        tmp_obj = rb_funcall(cOCI8NamedType, oci8_id_new, 0);
+        tmp_obj = rb_class_new_instance(0, NULL, cOCI8NamedType);
         obj = DATA_PTR(tmp_obj);
         obj->tdo = typeinfo;
         obj->instancep = (char**)&data;
@@ -195,7 +195,7 @@ static VALUE get_attribute(VALUE self, VALUE datatype, VALUE typeinfo, void *dat
     case ATTR_NAMED_COLLECTION:
         Check_Object(typeinfo, cOCI8TDO);
         /* Be carefull. Don't use *tmp_obj* out of this function. */
-        tmp_obj = rb_funcall(cOCI8NamedCollection, oci8_id_new, 0);
+        tmp_obj = rb_class_new_instance(0, NULL, cOCI8NamedCollection);
         obj = DATA_PTR(tmp_obj);
         obj->tdo = typeinfo;
         obj->instancep = (char**)data;
@@ -506,7 +506,7 @@ static void set_attribute(VALUE self, VALUE datatype, VALUE typeinfo, void *data
     case ATTR_NAMED_TYPE:
         Check_Object(typeinfo, cOCI8TDO);
         /* Be carefull. Don't use *tmp_obj* out of this function. */
-        tmp_obj = rb_funcall(cOCI8NamedType, oci8_id_new, 0);
+        tmp_obj = rb_class_new_instance(0, NULL, cOCI8NamedType);
         obj = DATA_PTR(tmp_obj);
         obj->tdo = typeinfo;
         obj->instancep = (char**)&data;
@@ -518,7 +518,7 @@ static void set_attribute(VALUE self, VALUE datatype, VALUE typeinfo, void *data
     case ATTR_NAMED_COLLECTION:
         Check_Object(typeinfo, cOCI8TDO);
         /* Be carefull. Don't use *tmp_obj* out of this function. */
-        tmp_obj = rb_funcall(cOCI8NamedCollection, oci8_id_new, 0);
+        tmp_obj = rb_class_new_instance(0, NULL, cOCI8NamedCollection);
         obj = DATA_PTR(tmp_obj);
         obj->tdo = typeinfo;
         obj->instancep = (char**)data;
@@ -626,7 +626,7 @@ static void bind_named_type_init_elem(oci8_bind_t *obind, VALUE svc)
     }
     svcctx = oci8_get_svcctx(svc);
     do {
-        oho[idx].obj = rb_funcall(klass, oci8_id_new, 0);
+        oho[idx].obj = rb_class_new_instance(0, NULL, klass);
         obj = DATA_PTR(oho[idx].obj);
         obj->tdo = obind->tdo;
         obj->instancep = (char**)&oho[idx].hp;

data/ext/oci8/oci8.h

@@ -150,13 +150,26 @@ static inline volatile VALUE *rb_gc_guarded_ptr(volatile VALUE *ptr) {return ptr
 #endif
 
 #ifndef HAVE_TYPE_RB_ENCODING
+/* ruby 1.8, rubinuis 1.2 */
 #define rb_enc_associate(str, enc) do {} while(0)
+#define rb_enc_str_buf_cat(str, ptr, len, enc) rb_str_buf_cat((str), (ptr), (len))
 #define rb_external_str_new_with_enc(ptr, len, enc) rb_tainted_str_new((ptr), (len))
 #define rb_locale_str_new_cstr(ptr)  rb_str_new2(ptr)
+#define rb_str_buf_cat_ascii(str, ptr) rb_str_buf_cat2((str), (ptr))
 #define rb_str_conv_enc(str, from, to) (str)
 #define rb_str_export_to_enc(str, enc) (str)
 #define rb_usascii_str_new(ptr, len) rb_str_new((ptr), (len))
 #define rb_usascii_str_new_cstr(ptr) rb_str_new2(ptr)
+#elif defined RBX_CAPI_RUBY_H
+/* rubinius 2.0 */
+#ifndef HAVE_RB_ENC_STR_BUF_CAT
+#define rb_enc_str_buf_cat(str, ptr, len, enc) \
+    rb_str_concat((str), rb_enc_str_new((ptr), (len), (enc)))
+#endif
+#ifndef HAVE_RB_STR_BUF_CAT_ASCII
+#define rb_str_buf_cat_ascii(str, ptr) \
+    rb_str_concat((str), rb_usascii_str_new_cstr(ptr))
+#endif
 #endif
 
 /* a new function in ruby 1.9.3.
@@ -446,7 +459,6 @@ void Init_oci8_env(void);
 
 /* oci8lib.c */
 extern ID oci8_id_at_last_error;
-extern ID oci8_id_new;
 extern ID oci8_id_get;
 extern ID oci8_id_set;
 extern ID oci8_id_oci8_vtable;

data/ext/oci8/oci8lib.c

@@ -9,7 +9,6 @@
 #endif
 
 ID oci8_id_at_last_error;
-ID oci8_id_new;
 ID oci8_id_get;
 ID oci8_id_set;
 ID oci8_id_oci8_vtable;
@@ -87,7 +86,6 @@ Init_oci8lib()
 #endif
 
     oci8_id_at_last_error = rb_intern("@last_error");
-    oci8_id_new = rb_intern("new");
     oci8_id_get = rb_intern("get");
     oci8_id_set = rb_intern("set");
     oci8_id_oci8_vtable = rb_intern("__oci8_vtable__");
@@ -234,64 +232,83 @@ static void *free_temp_lob(void *user_data)
     return (void*)(VALUE)rv;
 }
 
+typedef struct protected_call_arg {
+    void *(*func)(void *);
+    void *data;
+    oci8_svcctx_t *svcctx;
+} protected_call_arg_t;
+
+static VALUE protected_call(VALUE data)
+{
+    struct protected_call_arg *parg = (struct protected_call_arg*)data;
+    VALUE rv;
+
+    if (!NIL_P(parg->svcctx->executing_thread)) {
+        rb_raise(rb_eRuntimeError, "executing in another thread");
+    }
+    parg->svcctx->executing_thread = rb_thread_current();
+#ifdef HAVE_RB_THREAD_CALL_WITHOUT_GVL
+    rv = (VALUE)rb_thread_call_without_gvl(parg->func, parg->data, oci8_unblock_func, parg->svcctx);
+#else
+    rv = rb_thread_blocking_region((VALUE(*)(void*))parg->func, parg->data, oci8_unblock_func, parg->svcctx);
+#endif
+    if ((sword)rv == OCI_ERROR) {
+        if (oci8_get_error_code(oci8_errhp) == 1013) {
+            rb_raise(eOCIBreak, "Canceled by user request.");
+        }
+    }
+    return rv;
+}
+
 /* ruby 1.9 */
 sword oci8_call_without_gvl(oci8_svcctx_t *svcctx, void *(*func)(void *), void *data)
 {
     OCIError *errhp = oci8_errhp;
+    protected_call_arg_t parg;
+    sword rv;
+    int state;
 
     if (!NIL_P(svcctx->executing_thread)) {
-        rb_raise(rb_eRuntimeError /* FIXME */, "executing in another thread");
+        rb_raise(rb_eRuntimeError, "executing in another thread");
     }
-
     if (!svcctx->suppress_free_temp_lobs) {
-        oci8_temp_lob_t *lob = svcctx->temp_lobs;
-        while (lob != NULL) {
-            oci8_temp_lob_t *lob_next = lob->next;
+        oci8_temp_lob_t *lob;
+        while ((lob = svcctx->temp_lobs) != NULL) {
+            svcctx->temp_lobs = lob->next;
 
             if (svcctx->non_blocking) {
                 free_temp_lob_arg_t arg;
-                sword rv;
 
                 arg.svcctx = svcctx;
                 arg.svchp = svcctx->base.hp.svc;
                 arg.errhp = errhp;
                 arg.lob = lob->lob;
 
-                svcctx->executing_thread = rb_thread_current();
-#ifdef HAVE_RB_THREAD_CALL_WITHOUT_GVL
-                rv = (sword)(VALUE)rb_thread_call_without_gvl(free_temp_lob, &arg, oci8_unblock_func, svcctx);
-#else
-                rv = (sword)rb_thread_blocking_region((VALUE(*)(void*))free_temp_lob, &arg, oci8_unblock_func, svcctx);
-#endif
-                if (rv == OCI_ERROR) {
-                    if (oci8_get_error_code(errhp) == 1013) {
-                        rb_raise(eOCIBreak, "Canceled by user request.");
-                    }
+                parg.svcctx = svcctx;
+                parg.func = free_temp_lob;
+                parg.data = &arg;
+
+                rb_protect(protected_call, (VALUE)&parg, &state);
+                if (state) {
+                    lob->next = svcctx->temp_lobs;
+                    svcctx->temp_lobs = lob;
+                    rb_jump_tag(state);
                 }
             } else {
                 OCILobFreeTemporary(svcctx->base.hp.svc, errhp, lob->lob);
             }
             OCIDescriptorFree(lob->lob, OCI_DTYPE_LOB);
-
             xfree(lob);
-            svcctx->temp_lobs = lob = lob_next;
         }
     }
 
     if (svcctx->non_blocking) {
-        sword rv;
-
-        svcctx->executing_thread = rb_thread_current();
-        /* Note: executing_thread is cleard at the end of the blocking function. */
-#ifdef HAVE_RB_THREAD_CALL_WITHOUT_GVL
-        rv = (sword)(VALUE)rb_thread_call_without_gvl(func, data, oci8_unblock_func, svcctx);
-#else
-        rv = (sword)rb_thread_blocking_region((VALUE(*)(void*))func, data, oci8_unblock_func, svcctx);
-#endif
-        if (rv == OCI_ERROR) {
-            if (oci8_get_error_code(errhp) == 1013) {
-                rb_raise(eOCIBreak, "Canceled by user request.");
-            }
+        parg.svcctx = svcctx;
+        parg.func = func;
+        parg.data = data;
+        rv = (sword)rb_protect(protected_call, (VALUE)&parg, &state);
+        if (state) {
+            rb_jump_tag(state);
         }
         return rv;
     } else {
@@ -489,16 +506,19 @@ void *oci8_find_symbol(const char *symbol_name)
             "libclntsh.a(shr.o)",
 #elif defined(__hppa)
             /* HP-UX(PA-RISC) */
+            "libclntsh.sl.12.1",
             "libclntsh.sl.11.1",
             "libclntsh.sl.10.1",
             "libclntsh.sl.9.0",
             "libclntsh.sl.8.0",
 #elif defined(__APPLE__)
             /* Mac OS X */
+            "libclntsh.dylib.12.1",
             "libclntsh.dylib.11.1",
             "libclntsh.dylib.10.1",
 #else
             /* Linux, Solaris and HP-UX(IA64) */
+            "libclntsh.so.12.1",
             "libclntsh.so.11.1",
             "libclntsh.so.10.1",
             "libclntsh.so.9.0",