ruby-oci8 2.0.6 → 2.1.0

data/ext/oci8/oci8.h

@@ -29,9 +29,6 @@ extern "C"
 #ifdef __cplusplus
 }
 #endif
-#ifdef HAVE_XMLOTN_H
-#include "xmlotn.h"
-#endif
 
 #define ORAVERNUM(major, minor, update, patch, port_update) \
     (((major) << 24) | ((minor) << 20) | ((update) << 12) | ((patch) << 8) | (port_update))
@@ -93,9 +90,15 @@ typedef sb4 (*OCICallbackLobWrite2)(dvoid *ctxp, dvoid *bufp, oraub8 *lenp,
 #if !defined HAVE_TYPE_OCIADMIN_ && !defined HAVE_TYPE_OCIADMINP
 typedef struct OCIAdmin OCIAdmin;
 #endif
+#if !defined HAVE_TYPE_OCIAUTHINFO_ && !defined HAVE_TYPE_OCIAUTHINFOP
+typedef struct OCIAuthInfo OCIAuthInfo;
+#endif
 #if !defined HAVE_TYPE_OCIMSG_ && !defined HAVE_TYPE_OCIMSGP
 typedef struct OCIMsg  OCIMsg;
 #endif
+#if !defined HAVE_TYPE_OCICPOOL_ && !defined HAVE_TYPE_OCICPOOLP
+typedef struct OCICPool OCICPool;
+#endif
 
 /* new macros in ruby 1.8.6.
  * define compatible macros for ruby 1.8.5 or lower.
@@ -132,7 +135,7 @@ typedef struct OCIMsg  OCIMsg;
 #if !defined(HAVE_RB_ERRINFO) && defined(HAVE_RUBY_ERRINFO)
 #define rb_errinfo() ruby_errinfo
 #endif
-#ifndef HAVE_TYPE_RB_BLOCKING_FUNCTION_T
+#if !defined HAVE_TYPE_RB_BLOCKING_FUNCTION_T_ && !defined HAVE_TYPE_RB_BLOCKING_FUNCTION_TP
 typedef VALUE rb_blocking_function_t(void *);
 #endif
 
@@ -157,6 +160,14 @@ typedef VALUE rb_blocking_function_t(void *);
 #endif
 #endif
 
+#if defined(HAVE_NATIVETHREAD) || defined(HAVE_RB_THREAD_BLOCKING_REGION)
+/*
+ * oci8_errhp is a thread local object in ruby 1.9, rubinius
+ * and ruby 1.8 configured with --enable-pthread.
+ */
+#define USE_THREAD_LOCAL_ERRHP 1
+#endif
+
 /* macros depends on the compiler.
  *  LIKELY(x)      hint for the compiler that 'x' is 1(TRUE) in many cases.
  *  UNLIKELY(x)    hint for the compiler that 'x' is 0(FALSE) in many cases.
@@ -189,8 +200,8 @@ typedef VALUE rb_blocking_function_t(void *);
  *    set a value to the key.
  *
  */
-#ifdef HAVE_RB_THREAD_BLOCKING_REGION
-/* ruby 1.9 */
+#ifdef USE_THREAD_LOCAL_ERRHP
+/* rubies with native-thread support. */
 #if defined(_WIN32)
 #include <windows.h>
 #define oci8_tls_key_t           DWORD
@@ -209,17 +220,23 @@ typedef VALUE rb_blocking_function_t(void *);
 #define IS_OCI_ERROR(v) (((v) != OCI_SUCCESS) && ((v) != OCI_SUCCESS_WITH_INFO))
 #ifdef ALWAYS_INLINE
 #define TO_ORATEXT to_oratext
+#define TO_CONST_ORATEXT to_const_oratext
 #define TO_CHARPTR to_charptr
 static ALWAYS_INLINE OraText *to_oratext(char *c)
 {
     return (OraText*)c;
 }
+static ALWAYS_INLINE const OraText *to_const_oratext(const char *c)
+{
+    return (const OraText*)c;
+}
 static ALWAYS_INLINE char *to_charptr(OraText *c)
 {
     return (char*)c;
 }
 #else
 #define TO_ORATEXT(c) ((OraText*)(c))
+#define TO_CONST_ORATEXT(c) ((const OraText*)(c))
 #define TO_CHARPTR(c) ((char*)(c))
 #endif
 #define RSTRING_ORATEXT(obj) TO_ORATEXT(RSTRING_PTR(obj))
@@ -237,36 +254,47 @@ typedef struct {
     char buf[1];
 } oci8_vstr_t;
 
-typedef struct oci8_base_class oci8_base_class_t;
-typedef struct oci8_bind_class oci8_bind_class_t;
+typedef struct oci8_base_vtable oci8_base_vtable_t;
+typedef struct oci8_bind_vtable oci8_bind_vtable_t;
 
 typedef struct oci8_base oci8_base_t;
 typedef struct oci8_bind oci8_bind_t;
 
-struct oci8_base_class {
+/* The virtual method table of oci8_base_t */
+struct oci8_base_vtable {
     void (*mark)(oci8_base_t *base);
     void (*free)(oci8_base_t *base);
     size_t size;
+    void (*init)(oci8_base_t *base);
 };
 
-struct oci8_bind_class {
-    oci8_base_class_t base;
+/* The virtual method table of oci8_bind_t */
+struct oci8_bind_vtable {
+    oci8_base_vtable_t base;
     VALUE (*get)(oci8_bind_t *obind, void *data, void *null_struct);
     void (*set)(oci8_bind_t *obind, void *data, void **null_structp, VALUE val);
     void (*init)(oci8_bind_t *obind, VALUE svc, VALUE val, VALUE length);
     void (*init_elem)(oci8_bind_t *obind, VALUE svc);
-    ub1 (*in)(oci8_bind_t *obind, ub4 idx, ub1 piece, void **valuepp, ub4 **alenpp, void **indpp);
-    void (*out)(oci8_bind_t *obind, ub4 idx, ub1 piece, void **valuepp, ub4 **alenpp, void **indpp);
     void (*pre_fetch_hook)(oci8_bind_t *obind, VALUE svc);
     ub2 dty;
-    ub1 csfrm;
+    void (*post_bind_hook)(oci8_bind_t *obind);
 };
 
+/* Class structure implemented by C language.
+ * oci8_base_t represents OCIHandle and its subclasses.
+ *
+ * The vptr member points to a virtual method table.
+ * See: http://en.wikipedia.org/wiki/Virtual_method_table
+ */
 struct oci8_base {
+    const oci8_base_vtable_t *vptr;
     ub4 type;
     union {
         dvoid *ptr;
         OCISvcCtx *svc;
+        OCICPool *poolhp;
+        OCIServer *srvhp;
+        OCISession *usrhp;
         OCIStmt *stmt;
         OCIDefine *dfn;
         OCIBind *bnd;
@@ -276,13 +304,18 @@ struct oci8_base {
         OCIDescribe *dschp;
     } hp;
     VALUE self;
-    const oci8_base_class_t *klass;
     oci8_base_t *parent;
     oci8_base_t *next;
     oci8_base_t *prev;
     oci8_base_t *children;
 };
 
+/* Class structure implemented by C language.
+ * This represents OCI8::BindType::Base's subclasses.
+ *
+ * This is a subclass of oci8_base_t because the first member
+ * base is oci8_base_t itself.
+ */
 struct oci8_bind {
     oci8_base_t base;
     void *valuep;
@@ -298,15 +331,16 @@ struct oci8_bind {
     } u;
 };
 
-enum logon_type_t {T_NOT_LOGIN = 0, T_IMPLICIT, T_EXPLICIT};
+typedef struct oci8_logoff_strategy oci8_logoff_strategy_t;
 
-typedef struct  {
+typedef struct oci8_svcctx {
     oci8_base_t base;
     volatile VALUE executing_thread;
-    enum logon_type_t logon_type;
-    OCISession *authhp;
+    const oci8_logoff_strategy_t *logoff_strategy;
+    OCISession *usrhp;
     OCIServer *srvhp;
     rb_pid_t pid;
+    unsigned char state;
     char is_autocommit;
 #ifdef HAVE_RB_THREAD_BLOCKING_REGION
     char non_blocking;
@@ -314,6 +348,11 @@ typedef struct  {
     VALUE long_read_len;
 } oci8_svcctx_t;
 
+struct oci8_logoff_strategy {
+    void *(*prepare)(oci8_svcctx_t *svcctx);
+    rb_blocking_function_t *execute;
+};
+
 typedef struct {
     dvoid *hp; /* OCIBind* or OCIDefine* */
     dvoid *valuep;
@@ -341,13 +380,9 @@ typedef struct {
 #define oci8_raise_init_error() oci8_do_raise_init_error(__FILE__, __LINE__)
 #define oci8_raise_by_msgno(msgno, default_msg) oci8_do_raise_by_msgno(msgno, default_msg, __FILE__, __LINE__)
 
-/* raise on error */
-#define oci_lc(rv) do { \
-    sword __rv = (rv); \
-    if (__rv != OCI_SUCCESS) { \
-        oci8_raise(oci8_errhp, __rv, NULL); \
-    } \
-} while(0)
+#define chkerr(status) oci8_check_error_((status), NULL, NULL, __FILE__, __LINE__)
+#define chker2(status, base) oci8_check_error_((status), (base), NULL, __FILE__, __LINE__)
+#define chker3(status, base, stmt) oci8_check_error_((status), (base), (stmt), __FILE__, __LINE__)
 
 #if SIZEOF_LONG > 4
 #define UB4_TO_NUM INT2FIX
@@ -362,7 +397,7 @@ typedef struct {
  *   extern OCIError *oci8_errhp;
  */
 #define oci8_envhp (LIKELY(oci8_global_envhp != NULL) ? oci8_global_envhp : oci8_make_envhp())
-#ifdef HAVE_RB_THREAD_BLOCKING_REGION
+#ifdef USE_THREAD_LOCAL_ERRHP
 #define oci8_errhp oci8_get_errhp()
 #else
 #define oci8_errhp (LIKELY(oci8_global_errhp != NULL) ? oci8_global_errhp : oci8_make_errhp())
@@ -372,7 +407,7 @@ typedef struct {
 extern ub4 oci8_env_mode;
 extern OCIEnv *oci8_global_envhp;
 OCIEnv *oci8_make_envhp(void);
-#ifdef HAVE_RB_THREAD_BLOCKING_REGION
+#ifdef USE_THREAD_LOCAL_ERRHP
 extern oci8_tls_key_t oci8_tls_key; /* native thread key */
 OCIError *oci8_make_errhp(void);
 
@@ -389,11 +424,12 @@ OCIError *oci8_make_errhp(void);
 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_keys;
-extern ID oci8_id_oci8_class;
+extern ID oci8_id_oci8_vtable;
 #ifdef CHAR_IS_NOT_A_SHORTCUT_TO_ID
 extern ID oci8_id_add_op; /* ID of the addition operator '+' */
 extern ID oci8_id_sub_op; /* ID of the subtraction operator '-' */
@@ -408,9 +444,9 @@ extern ID oci8_id_div_op; /* ID of the division operator '/' */
 extern int oci8_in_finalizer;
 extern VALUE oci8_cOCIHandle;
 void oci8_base_free(oci8_base_t *base);
-VALUE oci8_define_class(const char *name, oci8_base_class_t *klass);
-VALUE oci8_define_class_under(VALUE outer, const char *name, oci8_base_class_t *klass);
-VALUE oci8_define_bind_class(const char *name, const oci8_bind_class_t *oci8_bind_class);
+VALUE oci8_define_class(const char *name, oci8_base_vtable_t *vptr);
+VALUE oci8_define_class_under(VALUE outer, const char *name, oci8_base_vtable_t *vptr);
+VALUE oci8_define_bind_class(const char *name, const oci8_bind_vtable_t *vptr);
 void oci8_link_to_parent(oci8_base_t *base, oci8_base_t *parent);
 void oci8_unlink_from_parent(oci8_base_t *base);
 sword oci8_blocking_region(oci8_svcctx_t *svcctx, rb_blocking_function_t func, void *data);
@@ -424,18 +460,19 @@ oci8_base_t *oci8_get_handle(VALUE obj, VALUE klass);
 extern VALUE eOCIException;
 extern VALUE eOCIBreak;
 void Init_oci8_error(void);
-NORETURN(void oci8_do_raise(OCIError *, sword status, OCIStmt *, const char *file, int line));
 NORETURN(void oci8_do_env_raise(OCIEnv *, sword status, const char *file, int line));
 NORETURN(void oci8_do_raise_init_error(const char *file, int line));
 sb4 oci8_get_error_code(OCIError *errhp);
 VALUE oci8_get_error_message(ub4 msgno, const char *default_msg);
 NORETURN(void oci8_do_raise_by_msgno(ub4 msgno, const char *default_msg, const char *file, int line));
+void oci8_check_error_(sword status, oci8_base_t *base, OCIStmt *stmthp, const char *file, int line);
 
 /* ocihandle.c */
 void Init_oci8_handle(void);
 
 /* oci8.c */
 VALUE Init_oci8(void);
+void oci8_do_parse_connect_string(VALUE conn_str, VALUE *user, VALUE *pass, VALUE *dbname, VALUE *mode);
 oci8_svcctx_t *oci8_get_svcctx(VALUE obj);
 OCISvcCtx *oci8_get_oci_svcctx(VALUE obj);
 OCISession *oci8_get_oci_session(VALUE obj);
@@ -443,6 +480,9 @@ void oci8_check_pid_consistency(oci8_svcctx_t *svcctx);
 #define TO_SVCCTX oci8_get_oci_svcctx
 #define TO_SESSION oci8_get_oci_session
 
+/* connection_pool.c */
+void Init_oci8_connection_pool(VALUE cOCI8);
+
 /* stmt.c */
 extern VALUE cOCIStmt;
 void Init_oci8_stmt(VALUE cOCI8);
@@ -479,6 +519,7 @@ void oci8_assign_bfile(oci8_svcctx_t *svcctx, VALUE lob, OCILobLocator **dest);
 void Init_ora_date(void);
 
 /* ocinumber.c */
+extern int oci8_float_conversion_type_is_ruby;
 void Init_oci_number(VALUE mOCI, OCIError *errhp);
 OCINumber *oci8_get_ocinumber(VALUE num);
 VALUE oci8_make_ocinumber(OCINumber *s, OCIError *errhp);
@@ -486,6 +527,8 @@ VALUE oci8_make_integer(OCINumber *s, OCIError *errhp);
 VALUE oci8_make_float(OCINumber *s, OCIError *errhp);
 OCINumber *oci8_set_ocinumber(OCINumber *result, VALUE self, OCIError *errhp);
 OCINumber *oci8_set_integer(OCINumber *result, VALUE self, OCIError *errhp);
+double oci8_onum_to_dbl(OCINumber *s, OCIError *errhp);
+OCINumber *oci8_dbl_to_onum(OCINumber *result, double dbl, OCIError *errhp);
 
 /* ocidatetim.c */
 void Init_oci_datetime(void);
@@ -499,29 +542,18 @@ VALUE oci8_make_interval_ds(OCIInterval *s);
 /* object.c */
 void Init_oci_object(VALUE mOCI);
 
-/* xmldb.c */
-#ifndef XMLCTX_DEFINED
-#define XMLCTX_DEFINED
-struct xmlctx;
-typedef struct xmlctx xmlctx;
-#endif
-#ifndef XML_TYPES
-typedef struct xmlnode xmlnode;
-#endif
-void Init_oci_xmldb(void);
-VALUE oci8_make_rexml(struct xmlctx *xctx, xmlnode *node);
-
 /* attr.c */
-VALUE oci8_get_sb1_attr(oci8_base_t *base, ub4 attrtype);
-VALUE oci8_get_ub2_attr(oci8_base_t *base, ub4 attrtype);
-VALUE oci8_get_sb2_attr(oci8_base_t *base, ub4 attrtype);
-VALUE oci8_get_ub4_attr(oci8_base_t *base, ub4 attrtype);
-VALUE oci8_get_string_attr(oci8_base_t *base, ub4 attrtype);
-VALUE oci8_get_rowid_attr(oci8_base_t *base, ub4 attrtype);
+VALUE oci8_get_sb1_attr(oci8_base_t *base, ub4 attrtype, OCIStmt *stmtp);
+VALUE oci8_get_ub2_attr(oci8_base_t *base, ub4 attrtype, OCIStmt *stmtp);
+VALUE oci8_get_sb2_attr(oci8_base_t *base, ub4 attrtype, OCIStmt *stmtp);
+VALUE oci8_get_ub4_attr(oci8_base_t *base, ub4 attrtype, OCIStmt *stmtp);
+VALUE oci8_get_string_attr(oci8_base_t *base, ub4 attrtype, OCIStmt *stmtp);
+VALUE oci8_get_rowid_attr(oci8_base_t *base, ub4 attrtype, OCIStmt *stmtp);
 
 /* encoding.c */
 void Init_oci8_encoding(VALUE cOCI8);
 VALUE oci8_charset_id2name(VALUE svc, VALUE charset_id);
+extern int oci8_nls_ratio;
 
 /* win32.c */
 void Init_oci8_win32(VALUE cOCI8);
@@ -542,6 +574,7 @@ extern rb_encoding *oci8_encoding;
 #define OCI8SafeStringValue(v) SafeStringValue(v)
 #endif
 
+#include "thread_util.h"
 #include "apiwrap.h"
 
 #endif

data/ext/oci8/oci8lib.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- * Copyright (C) 2002-2009 KUBO Takehiro <kubo@jiubao.org>
+ * Copyright (C) 2002-2011 KUBO Takehiro <kubo@jiubao.org>
  */
 
 #include "oci8.h"
@@ -10,11 +10,12 @@
 #include <signal.h>
 #endif
 
+ID oci8_id_at_last_error;
 ID oci8_id_new;
 ID oci8_id_get;
 ID oci8_id_set;
 ID oci8_id_keys;
-ID oci8_id_oci8_class;
+ID oci8_id_oci8_vtable;
 #ifdef CHAR_IS_NOT_A_SHORTCUT_TO_ID
 ID oci8_id_add_op;
 ID oci8_id_sub_op;
@@ -34,8 +35,8 @@ void oci8_base_free(oci8_base_t *base)
         oci8_base_free(base->children);
     }
     oci8_unlink_from_parent(base);
-    if (base->klass->free != NULL)
-        base->klass->free(base);
+    if (base->vptr->free != NULL)
+        base->vptr->free(base);
     if (base->type >= OCI_DTYPE_FIRST)
         OCIDescriptorFree(base->hp.ptr, base->type);
     else if (base->type >= OCI_HTYPE_FIRST)
@@ -64,6 +65,10 @@ Init_oci8lib()
 
 #ifdef RUNTIME_API_CHECK
     Init_oci8_apiwrap();
+    if (oracle_client_version < ORAVER_9_0) {
+        rb_raise(rb_eLoadError, "Oracle 8 (8.0) and Oracle 8i (8.1) is not supported anymore!");
+    }
+
     if (have_OCIClientVersion) {
         sword major, minor, update, patch, port_update;
         OCIClientVersion(&major, &minor, &update, &patch, &port_update);
@@ -71,11 +76,12 @@ 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_keys = rb_intern("keys");
-    oci8_id_oci8_class = rb_intern("__oci8_class__");
+    oci8_id_oci8_vtable = rb_intern("__oci8_vtable__");
 #ifdef CHAR_IS_NOT_A_SHORTCUT_TO_ID
     oci8_id_add_op = rb_intern("+");
     oci8_id_sub_op = rb_intern("-");
@@ -86,6 +92,7 @@ Init_oci8lib()
     rb_set_end_proc(at_exit_func, Qnil);
 #endif
 
+    Init_oci8_thread_util();
     Init_oci8_error();
     Init_oci8_env();
 
@@ -94,6 +101,10 @@ Init_oci8lib()
 
     /* OCI8 class */
     cOCI8 = Init_oci8();
+
+    /* OCI8::ConnectionPool class */
+    Init_oci8_connection_pool(cOCI8);
+
     /* OCI8::BindType module */
     mOCI8BindType = rb_define_module_under(cOCI8, "BindType");
     /* OCI8::BindType::Base class */
@@ -111,37 +122,20 @@ Init_oci8lib()
     Init_oci8_lob(cOCI8);
 
     /* allocate a temporary errhp to pass Init_oci_number() */
-    if (have_OCIEnvCreate) {
-        rv = OCIEnvCreate(&envhp, oci8_env_mode, NULL, NULL, NULL, NULL, 0, NULL);
-        if (rv != OCI_SUCCESS) {
-            oci8_raise_init_error();
-        }
-    } else {
-        rv = OCIInitialize(oci8_env_mode, NULL, NULL, NULL, NULL);
-        if (rv != OCI_SUCCESS) {
-            oci8_raise_init_error();
-        }
-        rv = OCIEnvInit(&envhp, OCI_DEFAULT, 0, NULL);
-        if (rv != OCI_SUCCESS) {
-            oci8_raise_init_error();
-        }
+    rv = OCIEnvCreate(&envhp, oci8_env_mode, NULL, NULL, NULL, NULL, 0, NULL);
+    if (rv != OCI_SUCCESS) {
+        oci8_raise_init_error();
     }
     rv = OCIHandleAlloc(envhp, (dvoid *)&errhp, OCI_HTYPE_ERROR, 0, NULL);
     if (rv != OCI_SUCCESS)
         oci8_env_raise(envhp, rv);
     Init_oci_number(cOCI8, errhp);
     OCIHandleFree(errhp, OCI_HTYPE_ERROR);
-    if (have_OCIEnvCreate) {
-        OCIHandleFree(envhp, OCI_HTYPE_ENV);
-    } else {
-        /* Delayed OCIEnv initialization cannot be used on Oracle 8.0. */
-        oci8_global_envhp = envhp;
-    }
+    OCIHandleFree(envhp, OCI_HTYPE_ENV);
 
     Init_ora_date();
     Init_oci_datetime();
     Init_oci_object(cOCI8);
-    Init_oci_xmldb();
 
 #ifdef USE_WIN32_C
     Init_oci8_win32(cOCI8);
@@ -150,33 +144,29 @@ Init_oci8lib()
 #ifdef DEBUG_CORE_FILE
     signal(SIGSEGV, SIG_DFL);
 #endif
-
-    if (have_OCIEnvCreate && oci8_global_envhp != NULL) {
-        rb_raise(rb_eRuntimeError, "Internal Error: OCIEnv should not be initialized here.");
-    }
 }
 
-VALUE oci8_define_class(const char *name, oci8_base_class_t *base_class)
+VALUE oci8_define_class(const char *name, oci8_base_vtable_t *vptr)
 {
     VALUE klass = rb_define_class(name, oci8_cOCIHandle);
-    VALUE obj = Data_Wrap_Struct(rb_cObject, 0, 0, base_class);
-    rb_ivar_set(klass, oci8_id_oci8_class, obj);
+    VALUE obj = Data_Wrap_Struct(rb_cObject, 0, 0, vptr);
+    rb_ivar_set(klass, oci8_id_oci8_vtable, obj);
     return klass;
 }
 
-VALUE oci8_define_class_under(VALUE outer, const char *name, oci8_base_class_t *base_class)
+VALUE oci8_define_class_under(VALUE outer, const char *name, oci8_base_vtable_t *vptr)
 {
     VALUE klass = rb_define_class_under(outer, name, oci8_cOCIHandle);
-    VALUE obj = Data_Wrap_Struct(rb_cObject, 0, 0, base_class);
-    rb_ivar_set(klass, oci8_id_oci8_class, obj);
+    VALUE obj = Data_Wrap_Struct(rb_cObject, 0, 0, vptr);
+    rb_ivar_set(klass, oci8_id_oci8_vtable, obj);
     return klass;
 }
 
-VALUE oci8_define_bind_class(const char *name, const oci8_bind_class_t *bind_class)
+VALUE oci8_define_bind_class(const char *name, const oci8_bind_vtable_t *vptr)
 {
     VALUE klass = rb_define_class_under(mOCI8BindType, name, cOCI8BindTypeBase);
-    VALUE obj = Data_Wrap_Struct(rb_cObject, 0, 0, (void*)bind_class);
-    rb_ivar_set(klass, oci8_id_oci8_class, obj);
+    VALUE obj = Data_Wrap_Struct(rb_cObject, 0, 0, (void*)vptr);
+    rb_ivar_set(klass, oci8_id_oci8_vtable, obj);
     return klass;
 }
 
@@ -258,8 +248,8 @@ sword oci8_blocking_region(oci8_svcctx_t *svcctx, rb_blocking_function_t func, v
             rb_raise(rb_eRuntimeError /* FIXME */, "executing in another thread");
         }
         svcctx->executing_thread = rb_thread_current();
+        /* Note: executing_thread is cleard at the end of the blocking function. */
         rv = (sword)rb_thread_blocking_region(func, data, oci8_unblock_func, svcctx);
-        svcctx->executing_thread = Qnil;
         if (rv == OCI_ERROR) {
             if (oci8_get_error_code(oci8_errhp) == 1013) {
                 rb_raise(eOCIBreak, "Canceled by user request.");
@@ -273,14 +263,20 @@ sword oci8_blocking_region(oci8_svcctx_t *svcctx, rb_blocking_function_t func, v
 #else /* HAVE_RB_THREAD_BLOCKING_REGION */
 
 /* ruby 1.8 */
-sword oci8_blocking_region(oci8_svcctx_t *svcctx, rb_blocking_function_t func, void *data)
+typedef struct {
+    oci8_svcctx_t *svcctx;
+    rb_blocking_function_t *func;
+    void *data;
+} blocking_region_arg_t;
+
+static VALUE blocking_function_execute(blocking_region_arg_t *arg)
 {
+    oci8_svcctx_t *svcctx = arg->svcctx;
+    rb_blocking_function_t *func = arg->func;
+    void *data = arg->data;
     struct timeval tv;
     sword rv;
 
-    if (!NIL_P(svcctx->executing_thread)) {
-        rb_raise(rb_eRuntimeError /* FIXME */, "executing in another thread");
-    }
     tv.tv_sec = 0;
     tv.tv_usec = 10000;
     svcctx->executing_thread = rb_thread_current();
@@ -291,8 +287,7 @@ sword oci8_blocking_region(oci8_svcctx_t *svcctx, rb_blocking_function_t func, v
     }
     if (rv == OCI_ERROR) {
         if (oci8_get_error_code(oci8_errhp) == 1013) {
-            if (have_OCIReset)
-                OCIReset(svcctx->base.hp.ptr, oci8_errhp);
+            OCIReset(svcctx->base.hp.ptr, oci8_errhp);
             svcctx->executing_thread = Qnil;
             rb_raise(eOCIBreak, "Canceled by user request.");
         }
@@ -300,6 +295,30 @@ sword oci8_blocking_region(oci8_svcctx_t *svcctx, rb_blocking_function_t func, v
     svcctx->executing_thread = Qnil;
     return rv;
 }
+
+static VALUE blocking_function_ensure(oci8_svcctx_t *svcctx)
+{
+    if (!NIL_P(svcctx->executing_thread)) {
+        /* The thread is killed. */
+        OCIBreak(svcctx->base.hp.ptr, oci8_errhp);
+        OCIReset(svcctx->base.hp.ptr, oci8_errhp);
+        svcctx->executing_thread = Qnil;
+    }
+    return Qnil;
+}
+
+sword oci8_blocking_region(oci8_svcctx_t *svcctx, rb_blocking_function_t func, void *data)
+{
+    blocking_region_arg_t arg;
+
+    arg.svcctx = svcctx;
+    arg.func = func;
+    arg.data = data;
+    if (!NIL_P(svcctx->executing_thread)) {
+        rb_raise(rb_eRuntimeError, "executing in another thread");
+    }
+    return (sword)rb_ensure(blocking_function_execute, (VALUE)&arg, blocking_function_ensure, (VALUE)svcctx);
+}
 #endif /* HAVE_RB_THREAD_BLOCKING_REGION */
 
 typedef struct {
@@ -344,23 +363,26 @@ static VALUE exec_sql(cb_arg_t *arg)
     if (rv != OCI_SUCCESS) {
         oci8_env_raise(oci8_envhp, rv);
     }
-    oci_lc(OCIStmtPrepare(arg->stmtp, oci8_errhp, (text*)arg->sql_text,
-                          strlen(arg->sql_text), OCI_NTV_SYNTAX, OCI_DEFAULT));
+    chker2(OCIStmtPrepare(arg->stmtp, oci8_errhp, (text*)arg->sql_text,
+                          strlen(arg->sql_text), OCI_NTV_SYNTAX, OCI_DEFAULT),
+           &arg->svcctx->base);
     for (pos = 0; pos < arg->num_define_vars; pos++) {
         arg->define_vars[pos].hp = NULL;
-        oci_lc(OCIDefineByPos(arg->stmtp, (OCIDefine**)&arg->define_vars[pos].hp,
+        chker3(OCIDefineByPos(arg->stmtp, (OCIDefine**)&arg->define_vars[pos].hp,
                               oci8_errhp, pos + 1, arg->define_vars[pos].valuep,
                               arg->define_vars[pos].value_sz,
                               arg->define_vars[pos].dty, arg->define_vars[pos].indp,
-                              arg->define_vars[pos].alenp, NULL, OCI_DEFAULT));
+                              arg->define_vars[pos].alenp, NULL, OCI_DEFAULT),
+               &arg->svcctx->base, arg->stmtp);
     }
     for (pos = 0; pos < arg->num_bind_vars; pos++) {
         arg->bind_vars[pos].hp = NULL;
-        oci_lc(OCIBindByPos(arg->stmtp, (OCIBind**)&arg->bind_vars[pos].hp,
+        chker3(OCIBindByPos(arg->stmtp, (OCIBind**)&arg->bind_vars[pos].hp,
                             oci8_errhp, pos + 1, arg->bind_vars[pos].valuep,
                             arg->bind_vars[pos].value_sz, arg->bind_vars[pos].dty,
                             arg->bind_vars[pos].indp, arg->bind_vars[pos].alenp,
-                            NULL, 0, NULL, OCI_DEFAULT));
+                            NULL, 0, NULL, OCI_DEFAULT),
+               &arg->svcctx->base, arg->stmtp);
     }
     rv = OCIStmtExecute_nb(arg->svcctx, arg->svcctx->base.hp.svc, arg->stmtp, oci8_errhp, 1, 0, NULL, NULL, OCI_DEFAULT);
     if (rv == OCI_ERROR) {
@@ -373,7 +395,7 @@ static VALUE exec_sql(cb_arg_t *arg)
         }
     }
     if (arg->raise_on_error) {
-        oci_lc(rv);
+        chker3(rv, &arg->svcctx->base, arg->stmtp);
     }
     return (VALUE)rv;
 }