ruby-oci8 2.0.6 → 2.1.0

data/ext/oci8/object.c

@@ -80,15 +80,17 @@ static VALUE oci8_tdo_setup(VALUE self, VALUE svc, VALUE md_obj)
         OCIObjectUnpin(oci8_envhp, oci8_errhp, tdo->hp.tdo);
         tdo->hp.tdo = NULL;
     }
-    oci_lc(OCIAttrGet(md->hp.ptr, OCI_DTYPE_PARAM, &tdo_ref, NULL, OCI_ATTR_REF_TDO, oci8_errhp));
+    chker2(OCIAttrGet(md->hp.ptr, OCI_DTYPE_PARAM, &tdo_ref, NULL, OCI_ATTR_REF_TDO, oci8_errhp),
+           &svcctx->base);
     if (tdo_ref == NULL)
         return Qnil;
-    oci_lc(OCIObjectPin_nb(svcctx, oci8_envhp, oci8_errhp, tdo_ref, 0, OCI_PIN_ANY, OCI_DURATION_SESSION, OCI_LOCK_NONE, &tdo->hp.ptr));
+    chker2(OCIObjectPin_nb(svcctx, oci8_envhp, oci8_errhp, tdo_ref, 0, OCI_PIN_ANY, OCI_DURATION_SESSION, OCI_LOCK_NONE, &tdo->hp.ptr),
+           &svcctx->base);
     oci8_link_to_parent(tdo, &svcctx->base);
     return self;
 }
 
-static oci8_base_class_t oci8_tdo_class = {
+static oci8_base_vtable_t oci8_tdo_vtable = {
     oci8_tdo_mark,
     oci8_tdo_free,
     sizeof(oci8_base_t)
@@ -233,11 +235,11 @@ static VALUE oci8_named_coll_get_coll_element(VALUE self, VALUE datatype, VALUE
     if (*ind) {
         return Qnil;
     }
-    oci_lc(OCICollSize(oci8_envhp, oci8_errhp, coll, &size));
+    chker2(OCICollSize(oci8_envhp, oci8_errhp, coll, &size), &obj->base);
     ary = rb_ary_new2(size);
     for (idx = 0; idx < size; idx++) {
         boolean exists;
-        oci_lc(OCICollGetElem(oci8_envhp, oci8_errhp, coll, idx, &exists, &data, (dvoid**)&ind));
+        chker2(OCICollGetElem(oci8_envhp, oci8_errhp, coll, idx, &exists, &data, (dvoid**)&ind), &obj->base);
         if (exists) {
             void *tmp;
             if (datatype == INT2FIX(ATTR_NAMED_COLLECTION)) {
@@ -330,11 +332,13 @@ static VALUE oci8_named_coll_set_coll_element(VALUE self, VALUE datatype, VALUE
     cb_data.coll = (OCIColl*)*obj->instancep;
     switch (FIX2INT(datatype)) {
     case ATTR_STRING:
-        oci_lc(OCIObjectNew(oci8_envhp, oci8_errhp, svcctx->hp.svc, OCI_TYPECODE_VARCHAR2, NULL, NULL, OCI_DURATION_SESSION, TRUE, &cb_data.data.ptr));
+        chker2(OCIObjectNew(oci8_envhp, oci8_errhp, svcctx->hp.svc, OCI_TYPECODE_VARCHAR2, NULL, NULL, OCI_DURATION_SESSION, TRUE, &cb_data.data.ptr),
+               svcctx);
         cb_data.indp = &cb_data.ind;
         break;
     case ATTR_RAW:
-        oci_lc(OCIObjectNew(oci8_envhp, oci8_errhp, svcctx->hp.svc, OCI_TYPECODE_RAW, NULL, NULL, OCI_DURATION_SESSION, TRUE, &cb_data.data.ptr));
+        chker2(OCIObjectNew(oci8_envhp, oci8_errhp, svcctx->hp.svc, OCI_TYPECODE_RAW, NULL, NULL, OCI_DURATION_SESSION, TRUE, &cb_data.data.ptr),
+               svcctx);
         cb_data.indp = &cb_data.ind;
         break;
     case ATTR_OCINUMBER:
@@ -357,14 +361,18 @@ static VALUE oci8_named_coll_set_coll_element(VALUE self, VALUE datatype, VALUE
     case ATTR_NAMED_TYPE:
         Check_Object(typeinfo, cOCI8TDO);
         tdo = DATA_PTR(typeinfo);
-        oci_lc(OCIObjectNew(oci8_envhp, oci8_errhp, svcctx->hp.svc, OCI_TYPECODE_OBJECT, tdo->hp.tdo, NULL, OCI_DURATION_SESSION, TRUE, &cb_data.data.ptr));
-        oci_lc(OCIObjectGetInd(oci8_envhp, oci8_errhp, cb_data.data.ptr, (dvoid**)&cb_data.indp));
+        chker2(OCIObjectNew(oci8_envhp, oci8_errhp, svcctx->hp.svc, OCI_TYPECODE_OBJECT, tdo->hp.tdo, NULL, OCI_DURATION_SESSION, TRUE, &cb_data.data.ptr),
+               svcctx);
+        chker2(OCIObjectGetInd(oci8_envhp, oci8_errhp, cb_data.data.ptr, (dvoid**)&cb_data.indp),
+               svcctx);
         break;
     case ATTR_NAMED_COLLECTION:
         Check_Object(typeinfo, cOCI8TDO);
         tdo = DATA_PTR(typeinfo);
-        oci_lc(OCIObjectNew(oci8_envhp, oci8_errhp, svcctx->hp.svc, OCI_TYPECODE_NAMEDCOLLECTION, tdo->hp.tdo, NULL, OCI_DURATION_SESSION, TRUE, &cb_data.data.ptr));
-        oci_lc(OCIObjectGetInd(oci8_envhp, oci8_errhp, cb_data.data.ptr, (dvoid**)&cb_data.indp));
+        chker2(OCIObjectNew(oci8_envhp, oci8_errhp, svcctx->hp.svc, OCI_TYPECODE_NAMEDCOLLECTION, tdo->hp.tdo, NULL, OCI_DURATION_SESSION, TRUE, &cb_data.data.ptr),
+               svcctx);
+        chker2(OCIObjectGetInd(oci8_envhp, oci8_errhp, cb_data.data.ptr, (dvoid**)&cb_data.indp),
+               svcctx);
         break;
     case ATTR_CLOB:
     case ATTR_NCLOB:
@@ -381,6 +389,7 @@ static VALUE oci8_named_coll_set_coll_element(VALUE self, VALUE datatype, VALUE
     set_coll_element_func(&cb_data);
     set_coll_element_ensure(&cb_data);
 #endif
+    *ind = 0;
     return Qnil;
 }
 
@@ -395,9 +404,9 @@ static VALUE set_coll_element_func(set_coll_element_cb_data_t *cb_data)
     sb4 idx;
     void *elem_ptr;
 
-    oci_lc(OCICollSize(oci8_envhp, oci8_errhp, coll, &size));
+    chkerr(OCICollSize(oci8_envhp, oci8_errhp, coll, &size));
     if (RARRAY_LEN(val) < size) {
-        oci_lc(OCICollTrim(oci8_envhp, oci8_errhp, size - RARRAY_LEN(val), coll));
+        chkerr(OCICollTrim(oci8_envhp, oci8_errhp, size - RARRAY_LEN(val), coll));
     }
     for (idx = 0; idx < RARRAY_LEN(val); idx++) {
         switch (FIX2INT(datatype)) {
@@ -422,9 +431,9 @@ static VALUE set_coll_element_func(set_coll_element_cb_data_t *cb_data)
             break;
         }
         if (idx < size) {
-            oci_lc(OCICollAssignElem(oci8_envhp, oci8_errhp, idx, elem_ptr, cb_data->indp, cb_data->coll));
+            chkerr(OCICollAssignElem(oci8_envhp, oci8_errhp, idx, elem_ptr, cb_data->indp, cb_data->coll));
         } else {
-            oci_lc(OCICollAppend(oci8_envhp, oci8_errhp, elem_ptr, cb_data->indp, coll));
+            chkerr(OCICollAppend(oci8_envhp, oci8_errhp, elem_ptr, cb_data->indp, coll));
         }
     }
     return Qnil;
@@ -468,13 +477,13 @@ static void set_attribute(VALUE self, VALUE datatype, VALUE typeinfo, void *data
     switch (FIX2INT(datatype)) {
     case ATTR_STRING:
         OCI8StringValue(val);
-        oci_lc(OCIStringAssignText(oci8_envhp, oci8_errhp,
+        chkerr(OCIStringAssignText(oci8_envhp, oci8_errhp,
                                    RSTRING_ORATEXT(val), RSTRING_LEN(val),
                                    (OCIString **)data));
         break;
     case ATTR_RAW:
         StringValue(val);
-        oci_lc(OCIRawAssignBytes(oci8_envhp, oci8_errhp,
+        chkerr(OCIRawAssignBytes(oci8_envhp, oci8_errhp,
                                  RSTRING_ORATEXT(val), RSTRING_LEN(val),
                                  (OCIRaw **)data));
         break;
@@ -536,7 +545,7 @@ static void set_attribute(VALUE self, VALUE datatype, VALUE typeinfo, void *data
     *ind = 0;
 }
 
-static oci8_base_class_t oci8_named_type_class = {
+static oci8_base_vtable_t oci8_named_type_vtable = {
     oci8_named_type_mark,
     oci8_named_type_free,
     sizeof(oci8_named_type_t)
@@ -624,13 +633,32 @@ static void bind_named_type_init_elem(oci8_bind_t *obind, VALUE svc)
         obj->null_structp = (char**)&obind->u.null_structs[idx];
         oci8_link_to_parent(&obj->base, &obind->base);
 
-        oci_lc(OCIObjectNew(oci8_envhp, oci8_errhp, svcctx->base.hp.svc, tc, tdo->hp.tdo, NULL, OCI_DURATION_SESSION, TRUE, (dvoid**)obj->instancep));
-        oci_lc(OCIObjectGetInd(oci8_envhp, oci8_errhp, (dvoid*)*obj->instancep, (dvoid**)obj->null_structp));
+        chker2(OCIObjectNew(oci8_envhp, oci8_errhp, svcctx->base.hp.svc, tc, tdo->hp.tdo, NULL, OCI_DURATION_SESSION, TRUE, (dvoid**)obj->instancep),
+               &svcctx->base);
+        chker2(OCIObjectGetInd(oci8_envhp, oci8_errhp, (dvoid*)*obj->instancep, (dvoid**)obj->null_structp),
+               &svcctx->base);
         *(OCIInd*)*obj->null_structp = -1;
     } while (++idx < obind->maxar_sz);
 }
 
-static const oci8_bind_class_t bind_named_type_class = {
+static void bind_name_type_post_bind_hook(oci8_bind_t *obind)
+{
+    oci8_base_t *tdo = DATA_PTR(obind->tdo);
+    switch (obind->base.type) {
+    case OCI_HTYPE_DEFINE:
+        chker2(OCIDefineObject(obind->base.hp.dfn, oci8_errhp, tdo->hp.tdo,
+                               obind->valuep, 0, obind->u.null_structs, 0),
+               &obind->base);
+        break;
+    case OCI_HTYPE_BIND:
+        chker2(OCIBindObject(obind->base.hp.bnd, oci8_errhp, tdo->hp.tdo,
+                             obind->valuep, 0, obind->u.null_structs, 0),
+               &obind->base);
+        break;
+    }
+}
+
+static const oci8_bind_vtable_t bind_named_type_vtable = {
     {
         bind_named_type_mark,
         bind_named_type_free,
@@ -641,9 +669,8 @@ static const oci8_bind_class_t bind_named_type_class = {
     bind_named_type_init,
     bind_named_type_init_elem,
     NULL,
-    NULL,
-    NULL,
-    SQLT_NTY
+    SQLT_NTY,
+    bind_name_type_post_bind_hook,
 };
 
 void Init_oci_object(VALUE cOCI8)
@@ -652,7 +679,7 @@ void Init_oci_object(VALUE cOCI8)
     id_set_attributes = rb_intern("attributes=");
 
     /* OCI8::TDO */
-    cOCI8TDO = oci8_define_class_under(cOCI8, "TDO", &oci8_tdo_class);
+    cOCI8TDO = oci8_define_class_under(cOCI8, "TDO", &oci8_tdo_vtable);
     rb_define_private_method(cOCI8TDO, "setup", oci8_tdo_setup, 2);
     rb_define_const(cOCI8TDO, "ATTR_STRING", INT2FIX(ATTR_STRING));
     rb_define_const(cOCI8TDO, "ATTR_RAW", INT2FIX(ATTR_RAW));
@@ -681,7 +708,7 @@ void Init_oci_object(VALUE cOCI8)
     rb_define_const(cOCI8TDO, "ALIGNMENT_OF_DOUBLE", INT2FIX(ALIGNMENT_OF(double)));
 
     /* OCI8::NamedType */
-    cOCI8NamedType = oci8_define_class_under(cOCI8, "NamedType", &oci8_named_type_class);
+    cOCI8NamedType = oci8_define_class_under(cOCI8, "NamedType", &oci8_named_type_vtable);
     rb_define_method(cOCI8NamedType, "initialize", oci8_named_type_initialize, 0);
     rb_define_method(cOCI8NamedType, "tdo", oci8_named_type_tdo, 0);
     rb_define_private_method(cOCI8NamedType, "get_attribute", oci8_named_type_get_attribute, 4);
@@ -690,12 +717,12 @@ void Init_oci_object(VALUE cOCI8)
     rb_define_method(cOCI8NamedType, "null=", oci8_named_type_set_null, 1);
 
     /* OCI8::NamedCollection */
-    cOCI8NamedCollection = oci8_define_class_under(cOCI8, "NamedCollection", &oci8_named_type_class);
+    cOCI8NamedCollection = oci8_define_class_under(cOCI8, "NamedCollection", &oci8_named_type_vtable);
     rb_define_method(cOCI8NamedCollection, "initialize", oci8_named_type_initialize, 0);
     rb_define_method(cOCI8NamedCollection, "tdo", oci8_named_type_tdo, 0);
     rb_define_private_method(cOCI8NamedCollection, "get_coll_element", oci8_named_coll_get_coll_element, 2);
     rb_define_private_method(cOCI8NamedCollection, "set_coll_element", oci8_named_coll_set_coll_element, 3);
 
     /* OCI8::BindType::NamedType */
-    cOCI8BindNamedType = oci8_define_bind_class("NamedType", &bind_named_type_class);
+    cOCI8BindNamedType = oci8_define_bind_class("NamedType", &bind_named_type_vtable);
 }

data/ext/oci8/oci8.c

@@ -2,10 +2,11 @@
 /*
  * oci8.c - part of ruby-oci8
  *
- * Copyright (C) 2002-2009 KUBO Takehiro <kubo@jiubao.org>
+ * Copyright (C) 2002-2011 KUBO Takehiro <kubo@jiubao.org>
  *
  */
 #include "oci8.h"
+#include <errno.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h> /* getpid() */
 #endif
@@ -30,33 +31,107 @@ extern rb_pid_t rb_w32_getpid(void);
 #define OCI_ATTR_CLIENT_INFO 368
 #endif
 
+#define OCI8_STATE_SESSION_BEGIN_WAS_CALLED 0x01
+#define OCI8_STATE_SERVER_ATTACH_WAS_CALLED 0x02
+#define OCI8_STATE_CPOOL 0x04
+
 static VALUE cOCI8;
+static VALUE cSession;
+static VALUE cServer;
+static ID id_at_session_handle;
+static ID id_at_server_handle;
+
+typedef struct oci8_svcctx_associate {
+    oci8_base_t base;
+    oci8_svcctx_t *svcctx;
+} oci8_svcctx_associate_t;
+
+static void oci8_svcctx_associate_free(oci8_base_t *base)
+{
+    base->type = 0;
+    base->hp.ptr = NULL;
+}
+
+static oci8_base_vtable_t oci8_svcctx_associate_vtable = {
+    NULL,
+    oci8_svcctx_associate_free,
+    sizeof(oci8_svcctx_associate_t),
+};
+
+static void copy_session_handle(oci8_svcctx_t *svcctx)
+{
+    VALUE obj = rb_ivar_get(svcctx->base.self, id_at_session_handle);
+    oci8_base_t *base;
+
+    Check_Handle(obj, cSession, base);
+    base->type = OCI_HTYPE_SESSION;
+    base->hp.usrhp = svcctx->usrhp;
+}
+
+static void copy_server_handle(oci8_svcctx_t *svcctx)
+{
+    VALUE obj = rb_ivar_get(svcctx->base.self, id_at_server_handle);
+    oci8_base_t *base;
+
+    Check_Handle(obj, cServer, base);
+    base->type = OCI_HTYPE_SERVER;
+    base->hp.srvhp = svcctx->srvhp;
+}
 
 static void oci8_svcctx_free(oci8_base_t *base)
 {
     oci8_svcctx_t *svcctx = (oci8_svcctx_t *)base;
-
-    if (svcctx->authhp) {
-        OCIHandleFree(svcctx->authhp, OCI_HTYPE_SESSION);
-        svcctx->authhp = NULL;
-    }
-    if (svcctx->srvhp) {
-        OCIHandleFree(svcctx->srvhp, OCI_HTYPE_SERVER);
-        svcctx->srvhp = NULL;
+    if (svcctx->logoff_strategy != NULL) {
+        const oci8_logoff_strategy_t *strategy = svcctx->logoff_strategy;
+        void *data = strategy->prepare(svcctx);
+        int rv;
+        svcctx->base.type = 0;
+        svcctx->logoff_strategy = NULL;
+        rv = oci8_run_native_thread(strategy->execute, data);
+        if (rv != 0) {
+            errno = rv;
+#ifdef WIN32
+            rb_sys_fail("_beginthread");
+#else
+            rb_sys_fail("pthread_create");
+#endif
+        }
     }
+    svcctx->base.type = 0;
 }
 
-static oci8_base_class_t oci8_svcctx_class = {
+static void oci8_svcctx_init(oci8_base_t *base)
+{
+    oci8_svcctx_t *svcctx = (oci8_svcctx_t *)base;
+    VALUE obj;
+
+    svcctx->executing_thread = Qnil;
+    /* set session handle */
+    obj = rb_obj_alloc(cSession);
+    rb_ivar_set(base->self, id_at_session_handle, obj);
+    oci8_link_to_parent(DATA_PTR(obj), base);
+    /* set server handle */
+    obj = rb_obj_alloc(cServer);
+    rb_ivar_set(base->self, id_at_server_handle, obj);
+    oci8_link_to_parent(DATA_PTR(obj), base);
+
+    svcctx->pid = getpid();
+    svcctx->is_autocommit = 0;
+#ifdef HAVE_RB_THREAD_BLOCKING_REGION
+    svcctx->non_blocking = 1;
+#endif
+    svcctx->long_read_len = INT2FIX(65535);
+}
+
+static oci8_base_vtable_t oci8_svcctx_vtable = {
     NULL,
     oci8_svcctx_free,
-    sizeof(oci8_svcctx_t)
+    sizeof(oci8_svcctx_t),
+    oci8_svcctx_init,
 };
 
 static VALUE oracle_client_vernum; /* Oracle client version number */
-static VALUE sym_SYSDBA;
-static VALUE sym_SYSOPER;
 static ID id_at_prefetch_rows;
-static ID id_at_username;
 static ID id_set_prefetch_rows;
 
 static VALUE oci8_s_oracle_client_vernum(VALUE klass)
@@ -64,6 +139,27 @@ static VALUE oci8_s_oracle_client_vernum(VALUE klass)
     return oracle_client_vernum;
 }
 
+static VALUE oci8_s_set_property(VALUE klass, VALUE name, VALUE val)
+{
+    const char *name_str;
+
+    Check_Type(name, T_SYMBOL);
+    name_str = rb_id2name(SYM2ID(name));
+    if (strcmp(name_str, "float_conversion_type") == 0) {
+        const char *val_str;
+        Check_Type(val, T_SYMBOL);
+        val_str = rb_id2name(SYM2ID(val));
+        if (strcmp(val_str, "ruby") == 0) {
+            oci8_float_conversion_type_is_ruby = 1;
+        } else if (strcmp(val_str, "oracle") == 0) {
+            oci8_float_conversion_type_is_ruby = 0;
+        } else {
+            rb_raise(rb_eArgError, "float_conversion_type's value should be either :ruby or :oracle.");
+        }
+    }
+    return Qnil;
+}
+
 /*
  * call-seq:
  *   OCI8.error_message(message_no) -> string
@@ -87,7 +183,7 @@ static VALUE oci8_s_error_message(VALUE klass, VALUE msgid)
 }
 
 #define CONN_STR_REGEX "/^([^(\\s|\\@)]*)\\/([^(\\s|\\@)]*)(?:\\@(\\S+))?(?:\\s+as\\s+(\\S*)\\s*)?$/i"
-static void oci8_do_parse_connect_string(VALUE conn_str, VALUE *user, VALUE *pass, VALUE *dbname, VALUE *mode)
+void oci8_do_parse_connect_string(VALUE conn_str, VALUE *user, VALUE *pass, VALUE *dbname, VALUE *mode)
 {
     static VALUE re = Qnil;
     if (NIL_P(re)) {
@@ -106,14 +202,7 @@ static void oci8_do_parse_connect_string(VALUE conn_str, VALUE *user, VALUE *pas
             *pass = Qnil;
         }
         if (!NIL_P(*mode)) {
-            char *ptr;
-            SafeStringValue(*mode);
-            ptr = RSTRING_PTR(*mode);
-            if (strcasecmp(ptr, "SYSDBA") == 0) {
-                *mode = sym_SYSDBA;
-            } else if (strcasecmp(ptr, "SYSOPER") == 0) {
-                *mode = sym_SYSOPER;
-            }
+            *mode = ID2SYM(rb_to_id(rb_funcall(*mode, rb_intern("upcase"), 0)));
         }
     } else {
         rb_raise(rb_eArgError, "invalid connect string \"%s\" (expect \"username/password[@(tns_name|//host[:port]/service_name)][ as (sysdba|sysoper)]\"", RSTRING_PTR(conn_str));
@@ -143,184 +232,291 @@ static VALUE oci8_parse_connect_string(VALUE self, VALUE conn_str)
     return rb_ary_new3(4, user, pass, dbname, mode);
 }
 
+/*
+ * Logoff strategy for sessions connected by OCILogon.
+ */
+typedef struct {
+    OCISvcCtx *svchp;
+    OCISession *usrhp;
+    OCIServer *srvhp;
+} simple_logoff_arg_t;
+
+static void *simple_logoff_prepare(oci8_svcctx_t *svcctx)
+{
+    simple_logoff_arg_t *sla = xmalloc(sizeof(simple_logoff_arg_t));
+    sla->svchp = svcctx->base.hp.svc;
+    sla->usrhp = svcctx->usrhp;
+    sla->srvhp = svcctx->srvhp;
+    svcctx->usrhp = NULL;
+    svcctx->srvhp = NULL;
+    return sla;
+}
+
+static VALUE simple_logoff_execute(void *arg)
+{
+    simple_logoff_arg_t *sla = (simple_logoff_arg_t *)arg;
+    OCIError *errhp = oci8_errhp;
+    sword rv;
+
+    OCITransRollback(sla->svchp, errhp, OCI_DEFAULT);
+    rv = OCILogoff(sla->svchp, errhp);
+    xfree(sla);
+    return (VALUE)rv;
+}
+
+static const oci8_logoff_strategy_t simple_logoff = {
+    simple_logoff_prepare,
+    simple_logoff_execute,
+};
+
+/*
+ * Logoff strategy for sessions connected by OCIServerAttach and OCISessionBegin.
+ */
+
+typedef struct {
+    OCISvcCtx *svchp;
+    OCISession *usrhp;
+    OCIServer *srvhp;
+    unsigned char state;
+} complex_logoff_arg_t;
+
+static void *complex_logoff_prepare(oci8_svcctx_t *svcctx)
+{
+    complex_logoff_arg_t *cla = xmalloc(sizeof(complex_logoff_arg_t));
+    cla->svchp = svcctx->base.hp.svc;
+    cla->usrhp = svcctx->usrhp;
+    cla->srvhp = svcctx->srvhp;
+    cla->state = svcctx->state;
+    svcctx->usrhp = NULL;
+    svcctx->srvhp = NULL;
+    svcctx->state = 0;
+    return cla;
+}
+
+static VALUE complex_logoff_execute(void *arg)
+{
+    complex_logoff_arg_t *cla = (complex_logoff_arg_t *)arg;
+    OCIError *errhp = oci8_errhp;
+    sword rv = OCI_SUCCESS;
+
+    OCITransRollback(cla->svchp, errhp, OCI_DEFAULT);
+
+    if (cla->state & OCI8_STATE_SESSION_BEGIN_WAS_CALLED) {
+        rv = OCISessionEnd(cla->svchp, oci8_errhp, cla->usrhp, OCI_DEFAULT);
+        cla->state &= ~OCI8_STATE_SESSION_BEGIN_WAS_CALLED;
+    }
+    if (cla->state & OCI8_STATE_SERVER_ATTACH_WAS_CALLED) {
+        rv = OCIServerDetach(cla->srvhp, oci8_errhp, OCI_DEFAULT);
+        cla->state &= ~OCI8_STATE_SERVER_ATTACH_WAS_CALLED;
+    }
+    if (cla->usrhp != NULL) {
+        OCIHandleFree(cla->usrhp, OCI_HTYPE_SESSION);
+    }
+    if (cla->srvhp != NULL) {
+        OCIHandleFree(cla->srvhp, OCI_HTYPE_SERVER);
+    }
+    if (cla->svchp != NULL) {
+        OCIHandleFree(cla->svchp, OCI_HTYPE_SVCCTX);
+    }
+    xfree(cla);
+    return (VALUE)rv;
+}
+
+static const oci8_logoff_strategy_t complex_logoff = {
+    complex_logoff_prepare,
+    complex_logoff_execute,
+};
+
 /*
  * call-seq:
- *   new(username, password, dbname = nil, privilege = nil)
- *
- * Connects to an Oracle database server by +username+ and +password+
- * at +dbname+ as +privilege+.
- *
- * === connecting to the local server
- *
- * Set +username+ and +password+ or pass "username/password" as a
- * single argument.
- *
- *   OCI8.new('scott', 'tiger')
- * or
- *   OCI8.new('scott/tiger')
- *
- * === connecting to a remote server
- *
- * Set +username+, +password+ and +dbname+ or pass
- * "username/password@dbname" as a single argument.
+ *   logon(username, password, dbname) -> connection
  *
- *   OCI8.new('scott', 'tiger', 'orcl.world')
- * or
- *   OCI8.new('scott/tiger@orcl.world')
+ * <b>internal use only</b>
  *
- * The +dbname+ is a net service name or an easy connectection
- * identifier. The former is a name listed in the file tnsnames.ora.
- * Ask to your DBA if you don't know what it is. The latter has the
- * syntax as "//host:port/service_name".
- *
- *   OCI8.new('scott', 'tiger', '//remote-host:1521/XE')
- * or
- *   OCI8.new('scott/tiger@//remote-host:1521/XE')
- *
- * === connecting as a privileged user
- *
- * Set :SYSDBA or :SYSOPER to +privilege+, otherwise
- * "username/password as sysdba" or "username/password as sysoper"
- * as a single argument.
+ * Creates a simple logon session by the OCI function OCILogon().
+ */
+static VALUE oci8_logon(VALUE self, VALUE username, VALUE password, VALUE dbname)
+{
+    oci8_svcctx_t *svcctx = DATA_PTR(self);
+
+    if (svcctx->logoff_strategy != NULL) {
+        rb_raise(rb_eRuntimeError, "Could not reuse the session.");
+    }
+
+    /* check arugmnets */
+    OCI8SafeStringValue(username);
+    OCI8SafeStringValue(password);
+    if (!NIL_P(dbname)) {
+        OCI8SafeStringValue(dbname);
+    }
+
+    /* logon */
+    svcctx->base.type = OCI_HTYPE_SVCCTX;
+    chker2(OCILogon_nb(svcctx, oci8_envhp, oci8_errhp, &svcctx->base.hp.svc,
+                       RSTRING_ORATEXT(username), RSTRING_LEN(username),
+                       RSTRING_ORATEXT(password), RSTRING_LEN(password),
+                       NIL_P(dbname) ? NULL : RSTRING_ORATEXT(dbname),
+                       NIL_P(dbname) ? 0 : RSTRING_LEN(dbname)),
+           &svcctx->base);
+    svcctx->logoff_strategy = &simple_logoff;
+
+    /* setup the session handle */
+    chker2(OCIAttrGet(svcctx->base.hp.ptr, OCI_HTYPE_SVCCTX, &svcctx->usrhp, 0, OCI_ATTR_SESSION, oci8_errhp),
+           &svcctx->base);
+    copy_session_handle(svcctx);
+
+    /* setup the server handle */
+    chker2(OCIAttrGet(svcctx->base.hp.ptr, OCI_HTYPE_SVCCTX, &svcctx->srvhp, 0, OCI_ATTR_SERVER, oci8_errhp),
+           &svcctx->base);
+    copy_server_handle(svcctx);
+
+    return Qnil;
+}
+
+/*
+ * call-seq:
+ *   allocate_handles()
  *
- *   OCI8.new('sys', 'change_on_install', nil, :SYSDBA)
- * or
- *   OCI8.new('sys/change_on_install as sysdba')
+ * <b>internal use only</b>
  *
- * === external OS authentication
+ * Allocates a service context handle, a session handle and a
+ * server handle to use explicit attach and begin-session calls.
+ */
+static VALUE oci8_allocate_handles(VALUE self)
+{
+    oci8_svcctx_t *svcctx = DATA_PTR(self);
+    sword rv;
+
+    if (svcctx->logoff_strategy != NULL) {
+        rb_raise(rb_eRuntimeError, "Could not reuse the session.");
+    }
+    svcctx->logoff_strategy = &complex_logoff;
+    svcctx->state = 0;
+
+    /* allocate a service context handle */
+    rv = OCIHandleAlloc(oci8_envhp, &svcctx->base.hp.ptr, OCI_HTYPE_SVCCTX, 0, 0);
+    if (rv != OCI_SUCCESS)
+        oci8_env_raise(oci8_envhp, rv);
+    svcctx->base.type = OCI_HTYPE_SVCCTX;
+
+    /* alocalte a session handle */
+    rv = OCIHandleAlloc(oci8_envhp, (void*)&svcctx->usrhp, OCI_HTYPE_SESSION, 0, 0);
+    if (rv != OCI_SUCCESS)
+        oci8_env_raise(oci8_envhp, rv);
+    copy_session_handle(svcctx);
+
+    /* alocalte a server handle */
+    rv = OCIHandleAlloc(oci8_envhp, (void*)&svcctx->srvhp, OCI_HTYPE_SERVER, 0, 0);
+    if (rv != OCI_SUCCESS)
+        oci8_env_raise(oci8_envhp, rv);
+    copy_server_handle(svcctx);
+    return self;
+}
+
+/*
+ * call-seq:
+ *   session_handle -> a session handle
  *
- * Set nil to +username+ and +password+, or "/" as a single argument.
+ * <b>internal use only</b>
  *
- *   OCI8.new(nil, nil)
- * or
- *   OCI8.new('/')
+ * Returns a session handle associated with the service context handle.
+ */
+static VALUE oci8_get_session_handle(VALUE self)
+{
+    return rb_ivar_get(self, id_at_session_handle);
+}
+
+/*
+ * call-seq:
+ *   server_handle -> a server handle
  *
- * To connect to a remote host:
+ * <b>internal use only</b>
  *
- *   OCI8.new(nil, nil, 'dbname')
- * or
- *   OCI8.new('/@dbname')
+ * Returns a server handle associated with the service context handle.
+ */
+static VALUE oci8_get_server_handle(VALUE self)
+{
+    return rb_ivar_get(self, id_at_server_handle);
+}
+
+/*
+ * call-seq:
+ *   server_attach(dbname, mode)
  *
- * === proxy authentication
+ * <b>internal use only</b>
  *
- * Enclose end user's username with square brackets and add it at the
- * end of proxy user's username.
+ * Attachs to the server by the OCI function OCIServerAttach().
+ */
+static VALUE oci8_server_attach(VALUE self, VALUE dbname, VALUE attach_mode)
+{
+    oci8_svcctx_t *svcctx = oci8_get_svcctx(self);
+    ub4 mode = NUM2UINT(attach_mode);
+
+    if (svcctx->logoff_strategy != &complex_logoff) {
+        rb_raise(rb_eRuntimeError, "Use this method only for the service context handle created by OCI8#server_handle().");
+    }
+    if (svcctx->state & OCI8_STATE_SERVER_ATTACH_WAS_CALLED) {
+        rb_raise(rb_eRuntimeError, "Could not use this method twice.");
+    }
+
+    /* check arguments */
+    if (!NIL_P(dbname)) {
+        OCI8SafeStringValue(dbname);
+    }
+
+    /* 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),
+                              mode),
+           &svcctx->base);
+    chker2(OCIAttrSet(svcctx->base.hp.ptr, OCI_HTYPE_SVCCTX,
+                      svcctx->srvhp, 0, OCI_ATTR_SERVER,
+                      oci8_errhp),
+           &svcctx->base);
+    svcctx->state |= OCI8_STATE_SERVER_ATTACH_WAS_CALLED;
+    if (mode & OCI_CPOOL) {
+        svcctx->state |= OCI8_STATE_CPOOL;
+    }
+    return self;
+}
+
+/*
+ * call-seq:
+ *   session_begin(cred, mode)
  *
- *   OCI8.new('proxy_user_name[end_user_name]', 'proxy_password')
- * or
- *   OCI8.new('proxy_user_name[end_user_name]/proxy_password')
+ * <b>internal use only</b>
  *
+ * Begins the session by the OCI function OCISessionBegin().
  */
-static VALUE oci8_svcctx_initialize(int argc, VALUE *argv, VALUE self)
+static VALUE oci8_session_begin(VALUE self, VALUE cred, VALUE mode)
 {
-    VALUE vusername;
-    VALUE vpassword;
-    VALUE vdbname;
-    VALUE vmode;
     oci8_svcctx_t *svcctx = DATA_PTR(self);
-    sword rv;
-    enum logon_type_t logon_type = T_IMPLICIT;
-    ub4 cred = OCI_CRED_RDBMS;
-    ub4 mode = OCI_DEFAULT;
-    OCISvcCtx *svchp = NULL;
 
-    svcctx->executing_thread = Qnil;
-    if (argc == 1) {
-        oci8_do_parse_connect_string(argv[0], &vusername, &vpassword, &vdbname, &vmode);
-    } else {
-        rb_scan_args(argc, argv, "22", &vusername, &vpassword, &vdbname, &vmode);
+    if (svcctx->logoff_strategy != &complex_logoff) {
+        rb_raise(rb_eRuntimeError, "Use this method only for the service context handle created by OCI8#server_handle().");
     }
-
-    rb_ivar_set(self, id_at_prefetch_rows, Qnil);
-    rb_ivar_set(self, id_at_username, Qnil);
-    if (NIL_P(vusername) && NIL_P(vpassword)) {
-        /* external credential */
-        logon_type = T_EXPLICIT;
-        cred = OCI_CRED_EXT;
-    } else {
-        /* RDBMS credential */
-        OCI8SafeStringValue(vusername); /* 1 */
-        OCI8SafeStringValue(vpassword); /* 2 */
-    }
-    if (!NIL_P(vdbname)) {
-        OCI8SafeStringValue(vdbname); /* 3 */
-    }
-    if (!NIL_P(vmode)) { /* 4 */
-        logon_type = T_EXPLICIT;
-        Check_Type(vmode, T_SYMBOL);
-        if (vmode == sym_SYSDBA) {
-            mode = OCI_SYSDBA;
-        } else if (vmode == sym_SYSOPER) {
-            mode = OCI_SYSOPER;
-        } else {
-            rb_raise(rb_eArgError, "invalid privilege name %s (expect :SYSDBA or :SYSOPER)", rb_id2name(SYM2ID(vmode)));
-        }
+    if (svcctx->state & OCI8_STATE_SESSION_BEGIN_WAS_CALLED) {
+        rb_raise(rb_eRuntimeError, "Could not use this method twice.");
     }
-    switch (logon_type) {
-    case T_IMPLICIT:
-        rv = OCILogon_nb(svcctx, oci8_envhp, oci8_errhp, &svchp,
-                         RSTRING_ORATEXT(vusername), RSTRING_LEN(vusername),
-                         RSTRING_ORATEXT(vpassword), RSTRING_LEN(vpassword),
-                         NIL_P(vdbname) ? NULL : RSTRING_ORATEXT(vdbname),
-                         NIL_P(vdbname) ? 0 : RSTRING_LEN(vdbname));
-        if (IS_OCI_ERROR(rv)) {
-            oci8_raise(oci8_errhp, rv, NULL);
-        }
-        svcctx->base.hp.svc = svchp;
-        svcctx->base.type = OCI_HTYPE_SVCCTX;
-        svcctx->logon_type = T_IMPLICIT;
-        break;
-    case T_EXPLICIT:
-        /* allocate OCI handles. */
-        rv = OCIHandleAlloc(oci8_envhp, &svcctx->base.hp.ptr, OCI_HTYPE_SVCCTX, 0, 0);
-        if (rv != OCI_SUCCESS)
-            oci8_env_raise(oci8_envhp, rv);
-        svcctx->base.type = OCI_HTYPE_SVCCTX;
-        rv = OCIHandleAlloc(oci8_envhp, (void*)&svcctx->authhp, OCI_HTYPE_SESSION, 0, 0);
-        if (rv != OCI_SUCCESS)
-            oci8_env_raise(oci8_envhp, rv);
-        rv = OCIHandleAlloc(oci8_envhp, (void*)&svcctx->srvhp, OCI_HTYPE_SERVER, 0, 0);
-        if (rv != OCI_SUCCESS)
-            oci8_env_raise(oci8_envhp, rv);
-
-        /* set username and password to OCISession. */
-        if (cred == OCI_CRED_RDBMS) {
-            oci_lc(OCIAttrSet(svcctx->authhp, OCI_HTYPE_SESSION,
-                              RSTRING_PTR(vusername), RSTRING_LEN(vusername),
-                              OCI_ATTR_USERNAME, oci8_errhp));
-            oci_lc(OCIAttrSet(svcctx->authhp, OCI_HTYPE_SESSION,
-                              RSTRING_PTR(vpassword), RSTRING_LEN(vpassword),
-                              OCI_ATTR_PASSWORD, oci8_errhp));
-        }
 
-        /* attach to server and set to OCISvcCtx. */
-        rv = OCIServerAttach_nb(svcctx, svcctx->srvhp, oci8_errhp,
-                                NIL_P(vdbname) ? NULL : RSTRING_ORATEXT(vdbname),
-                                NIL_P(vdbname) ? 0 : RSTRING_LEN(vdbname), OCI_DEFAULT);
-        if (rv != OCI_SUCCESS)
-            oci8_raise(oci8_errhp, rv, NULL);
-        oci_lc(OCIAttrSet(svcctx->base.hp.ptr, OCI_HTYPE_SVCCTX, svcctx->srvhp, 0, OCI_ATTR_SERVER, oci8_errhp));
-
-        /* begin session. */
-        rv = OCISessionBegin_nb(svcctx, svcctx->base.hp.ptr, oci8_errhp, svcctx->authhp, cred, mode);
-        if (rv != OCI_SUCCESS)
-            oci8_raise(oci8_errhp, rv, NULL);
-        oci_lc(OCIAttrSet(svcctx->base.hp.ptr, OCI_HTYPE_SVCCTX, svcctx->authhp, 0, OCI_ATTR_SESSION, oci8_errhp));
-        svcctx->logon_type = T_EXPLICIT;
-        break;
-    default:
-        break;
-    }
-    svcctx->pid = getpid();
-    svcctx->is_autocommit = 0;
-#ifdef HAVE_RB_THREAD_BLOCKING_REGION
-    svcctx->non_blocking = 1;
-#endif
-    svcctx->long_read_len = INT2FIX(65535);
+    /* check arguments */
+    Check_Type(cred, T_FIXNUM);
+    Check_Type(mode, T_FIXNUM);
+
+    /* begin session */
+    chker2(OCISessionBegin_nb(svcctx, svcctx->base.hp.ptr, oci8_errhp,
+                              svcctx->usrhp, FIX2UINT(cred),
+                              FIX2UINT(mode)),
+           &svcctx->base);
+    chker2(OCIAttrSet(svcctx->base.hp.ptr, OCI_HTYPE_SVCCTX,
+                      svcctx->usrhp, 0, OCI_ATTR_SESSION,
+                      oci8_errhp),
+           &svcctx->base);
+    svcctx->state |= OCI8_STATE_SESSION_BEGIN_WAS_CALLED;
     return Qnil;
 }
 
-
 /*
  * call-seq:
  *   logoff
@@ -331,54 +527,20 @@ static VALUE oci8_svcctx_initialize(int argc, VALUE *argv, VALUE self)
 static VALUE oci8_svcctx_logoff(VALUE self)
 {
     oci8_svcctx_t *svcctx = (oci8_svcctx_t *)DATA_PTR(self);
-    sword rv;
 
     while (svcctx->base.children != NULL) {
         oci8_base_free(svcctx->base.children);
     }
-    switch (svcctx->logon_type) {
-    case T_IMPLICIT:
-        oci_lc(OCITransRollback_nb(svcctx, svcctx->base.hp.svc, oci8_errhp, OCI_DEFAULT));
-        rv = OCILogoff_nb(svcctx, svcctx->base.hp.svc, oci8_errhp);
+    if (svcctx->logoff_strategy != NULL) {
+        const oci8_logoff_strategy_t *strategy = svcctx->logoff_strategy;
+        void *data = strategy->prepare(svcctx);
         svcctx->base.type = 0;
-        svcctx->logon_type = T_NOT_LOGIN;
-        if (rv != OCI_SUCCESS)
-            oci8_raise(oci8_errhp, rv, NULL);
-        svcctx->authhp = NULL;
-        svcctx->srvhp = NULL;
-        break;
-    case T_EXPLICIT:
-        oci_lc(OCITransRollback_nb(svcctx, svcctx->base.hp.svc, oci8_errhp, OCI_DEFAULT));
-        rv = OCISessionEnd_nb(svcctx, svcctx->base.hp.svc, oci8_errhp, svcctx->authhp, OCI_DEFAULT);
-        if (rv == OCI_SUCCESS) {
-            rv = OCIServerDetach_nb(svcctx, svcctx->srvhp, oci8_errhp, OCI_DEFAULT);
-        }
-        svcctx->logon_type = T_NOT_LOGIN;
-        if (rv != OCI_SUCCESS)
-            oci8_raise(oci8_errhp, rv, NULL);
-        break;
-    case T_NOT_LOGIN:
-        break;
+        svcctx->logoff_strategy = NULL;
+        chker2(oci8_blocking_region(svcctx, strategy->execute, data), &svcctx->base);
     }
     return Qtrue;
 }
 
-/*
- * call-seq:
- *   parse(sql_text) -> an instance of OCI8::Cursor
- *
- * Prepares the SQL statement and returns a new OCI8::Cursor.
- */
-static VALUE oci8_svcctx_parse(VALUE self, VALUE sql)
-{
-    VALUE obj = rb_funcall(cOCIStmt, oci8_id_new, 2, self, sql);
-    VALUE prefetch_rows = rb_ivar_get(self, id_at_prefetch_rows);
-    if (!NIL_P(prefetch_rows)) {
-        rb_funcall(obj, id_set_prefetch_rows, 1, prefetch_rows);
-    }
-    return obj;
-}
-
 /*
  * call-seq:
  *   commit
@@ -388,7 +550,7 @@ static VALUE oci8_svcctx_parse(VALUE self, VALUE sql)
 static VALUE oci8_commit(VALUE self)
 {
     oci8_svcctx_t *svcctx = DATA_PTR(self);
-    oci_lc(OCITransCommit_nb(svcctx, svcctx->base.hp.svc, oci8_errhp, OCI_DEFAULT));
+    chker2(OCITransCommit_nb(svcctx, svcctx->base.hp.svc, oci8_errhp, OCI_DEFAULT), &svcctx->base);
     return self;
 }
 
@@ -401,7 +563,7 @@ static VALUE oci8_commit(VALUE self)
 static VALUE oci8_rollback(VALUE self)
 {
     oci8_svcctx_t *svcctx = DATA_PTR(self);
-    oci_lc(OCITransRollback_nb(svcctx, svcctx->base.hp.svc, oci8_errhp, OCI_DEFAULT));
+    chker2(OCITransRollback_nb(svcctx, svcctx->base.hp.svc, oci8_errhp, OCI_DEFAULT), &svcctx->base);
     return self;
 }
 
@@ -422,10 +584,7 @@ static VALUE oci8_non_blocking_p(VALUE self)
 #else
     sb1 non_blocking;
 
-    if (svcctx->srvhp == NULL) {
-        oci_lc(OCIAttrGet(svcctx->base.hp.ptr, OCI_HTYPE_SVCCTX, &svcctx->srvhp, 0, OCI_ATTR_SERVER, oci8_errhp));
-    }
-    oci_lc(OCIAttrGet(svcctx->srvhp, OCI_HTYPE_SERVER, &non_blocking, 0, OCI_ATTR_NONBLOCKING_MODE, oci8_errhp));
+    chker2(OCIAttrGet(svcctx->srvhp, OCI_HTYPE_SERVER, &non_blocking, 0, OCI_ATTR_NONBLOCKING_MODE, oci8_errhp), &svcctx->base);
     return non_blocking ? Qtrue : Qfalse;
 #endif
 }
@@ -475,13 +634,13 @@ static VALUE oci8_set_non_blocking(VALUE self, VALUE val)
 #else
     sb1 non_blocking;
 
-    if (svcctx->srvhp == NULL) {
-        oci_lc(OCIAttrGet(svcctx->base.hp.ptr, OCI_HTYPE_SVCCTX, &svcctx->srvhp, 0, OCI_ATTR_SERVER, oci8_errhp));
+    if (svcctx->state & OCI8_STATE_CPOOL) {
+        rb_raise(rb_eRuntimeError, "Could not set non-blocking mode to a connection allocated from OCI8::ConnectionPool.");
     }
-    oci_lc(OCIAttrGet(svcctx->srvhp, OCI_HTYPE_SERVER, &non_blocking, 0, OCI_ATTR_NONBLOCKING_MODE, oci8_errhp));
+    chker2(OCIAttrGet(svcctx->srvhp, OCI_HTYPE_SERVER, &non_blocking, 0, OCI_ATTR_NONBLOCKING_MODE, oci8_errhp), &svcctx->base);
     if ((RTEST(val) && !non_blocking) || (!RTEST(val) && non_blocking)) {
         /* toggle blocking / non-blocking. */
-        oci_lc(OCIAttrSet(svcctx->srvhp, OCI_HTYPE_SERVER, 0, 0, OCI_ATTR_NONBLOCKING_MODE, oci8_errhp));
+        chker2(OCIAttrSet(svcctx->srvhp, OCI_HTYPE_SERVER, 0, 0, OCI_ATTR_NONBLOCKING_MODE, oci8_errhp), &svcctx->base);
     }
 #endif
     return val;
@@ -560,17 +719,12 @@ static VALUE oci8_set_long_read_len(VALUE self, VALUE val)
 static VALUE oci8_break(VALUE self)
 {
     oci8_svcctx_t *svcctx = DATA_PTR(self);
-#ifndef HAVE_RB_THREAD_BLOCKING_REGION
-    sword rv;
-#endif
 
     if (NIL_P(svcctx->executing_thread)) {
         return Qfalse;
     }
 #ifndef HAVE_RB_THREAD_BLOCKING_REGION
-    rv = OCIBreak(svcctx->base.hp.ptr, oci8_errhp);
-    if (rv != OCI_SUCCESS)
-        oci8_raise(oci8_errhp, rv, NULL);
+    chker2(OCIBreak(svcctx->base.hp.ptr, oci8_errhp), &svcctx->base);
 #endif
     rb_thread_wakeup(svcctx->executing_thread);
     return Qtrue;
@@ -608,26 +762,9 @@ static VALUE oci8_oracle_server_vernum(VALUE self)
     oci8_svcctx_t *svcctx = DATA_PTR(self);
     char buf[100];
     ub4 version;
-    char *p;
 
-    if (have_OCIServerRelease) {
-        /* Oracle 9i or later */
-        oci_lc(OCIServerRelease(svcctx->base.hp.ptr, oci8_errhp, (text*)buf, sizeof(buf), (ub1)svcctx->base.type, &version));
-        return UINT2NUM(version);
-    } else {
-        /* Oracle 8.x */
-        oci_lc(OCIServerVersion(svcctx->base.hp.ptr, oci8_errhp, (text*)buf, sizeof(buf), (ub1)svcctx->base.type));
-        if ((p = strchr(buf, '.')) != NULL) {
-            unsigned int major, minor, update, patch, port_update;
-            while (p >= buf && *p != ' ') {
-                p--;
-            }
-            if (sscanf(p + 1, "%u.%u.%u.%u.%u", &major, &minor, &update, &patch, &port_update) == 5) {
-                return INT2FIX(ORAVERNUM(major, minor, update, patch, port_update));
-            }
-        }
-        return Qnil;
-    }
+    chker2(OCIServerRelease(svcctx->base.hp.ptr, oci8_errhp, (text*)buf, sizeof(buf), (ub1)svcctx->base.type, &version), &svcctx->base);
+    return UINT2NUM(version);
 }
 
 /*
@@ -693,9 +830,8 @@ static VALUE oci8_ping(VALUE self)
  */
 static VALUE oci8_set_client_identifier(VALUE self, VALUE val)
 {
-    char *ptr;
+    const char *ptr;
     ub4 size;
-    int use_attr_set = 1;
 
     if (!NIL_P(val)) {
         OCI8SafeStringValue(val);
@@ -706,24 +842,19 @@ static VALUE oci8_set_client_identifier(VALUE self, VALUE val)
         size = 0;
     }
 
-    if (oracle_client_version < ORAVER_9_0) {
-        use_attr_set = 0;
-    } else if (oracle_client_version < ORAVERNUM(9, 2, 0, 3, 0) && size == 0) {
-        /* Workaround for Bug 2449486 */
-        use_attr_set = 0;
-    }
-
-    if (use_attr_set) {
+    if (oracle_client_version >= ORAVERNUM(9, 2, 0, 3, 0) || size > 0) {
         if (size > 0 && ptr[0] == ':') {
             rb_raise(rb_eArgError, "client identifier should not start with ':'.");
         }
-        oci_lc(OCIAttrSet(oci8_get_oci_session(self), OCI_HTYPE_SESSION, ptr,
-                          size, OCI_ATTR_CLIENT_IDENTIFIER, oci8_errhp));
+        chker2(OCIAttrSet(oci8_get_oci_session(self), OCI_HTYPE_SESSION, (dvoid*)ptr,
+                          size, OCI_ATTR_CLIENT_IDENTIFIER, oci8_errhp),
+               DATA_PTR(self));
     } else {
+        /* Workaround for Bug 2449486 */
         oci8_exec_sql_var_t bind_vars[1];
 
         /* :client_id */
-        bind_vars[0].valuep = ptr;
+        bind_vars[0].valuep = (dvoid*)ptr;
         bind_vars[0].value_sz = size;
         bind_vars[0].dty = SQLT_CHR;
         bind_vars[0].indp = NULL;
@@ -773,7 +904,7 @@ static VALUE oci8_set_client_identifier(VALUE self, VALUE val)
  */
 static VALUE oci8_set_module(VALUE self, VALUE val)
 {
-    char *ptr;
+    const char *ptr;
     ub4 size;
 
     if (!NIL_P(val)) {
@@ -786,14 +917,15 @@ static VALUE oci8_set_module(VALUE self, VALUE val)
     }
     if (oracle_client_version >= ORAVER_10_1) {
         /* Oracle 10g or upper */
-        oci_lc(OCIAttrSet(oci8_get_oci_session(self), OCI_HTYPE_SESSION, ptr,
-                          size, OCI_ATTR_MODULE, oci8_errhp));
+        chker2(OCIAttrSet(oci8_get_oci_session(self), OCI_HTYPE_SESSION, (dvoid*)ptr,
+                          size, OCI_ATTR_MODULE, oci8_errhp),
+               DATA_PTR(self));
     } else {
         /* Oracle 9i or lower */
         oci8_exec_sql_var_t bind_vars[1];
 
         /* :module */
-        bind_vars[0].valuep = ptr;
+        bind_vars[0].valuep = (dvoid*)ptr;
         bind_vars[0].value_sz = size;
         bind_vars[0].dty = SQLT_CHR;
         bind_vars[0].indp = NULL;
@@ -842,7 +974,7 @@ static VALUE oci8_set_module(VALUE self, VALUE val)
  */
 static VALUE oci8_set_action(VALUE self, VALUE val)
 {
-    char *ptr;
+    const char *ptr;
     ub4 size;
 
     if (!NIL_P(val)) {
@@ -855,14 +987,15 @@ static VALUE oci8_set_action(VALUE self, VALUE val)
     }
     if (oracle_client_version >= ORAVER_10_1) {
         /* Oracle 10g or upper */
-        oci_lc(OCIAttrSet(oci8_get_oci_session(self), OCI_HTYPE_SESSION, ptr,
-                          size, OCI_ATTR_ACTION, oci8_errhp));
+        chker2(OCIAttrSet(oci8_get_oci_session(self), OCI_HTYPE_SESSION, (dvoid*)ptr,
+                          size, OCI_ATTR_ACTION, oci8_errhp),
+               DATA_PTR(self));
     } else {
         /* Oracle 9i or lower */
         oci8_exec_sql_var_t bind_vars[1];
 
         /* :action */
-        bind_vars[0].valuep = ptr;
+        bind_vars[0].valuep = (dvoid*)ptr;
         bind_vars[0].value_sz = size;
         bind_vars[0].dty = SQLT_CHR;
         bind_vars[0].indp = NULL;
@@ -904,7 +1037,7 @@ static VALUE oci8_set_action(VALUE self, VALUE val)
  */
 static VALUE oci8_set_client_info(VALUE self, VALUE val)
 {
-    char *ptr;
+    const char *ptr;
     ub4 size;
 
     if (!NIL_P(val)) {
@@ -917,14 +1050,15 @@ static VALUE oci8_set_client_info(VALUE self, VALUE val)
     }
     if (oracle_client_version >= ORAVER_10_1) {
         /* Oracle 10g or upper */
-        oci_lc(OCIAttrSet(oci8_get_oci_session(self), OCI_HTYPE_SESSION, ptr,
-                          size, OCI_ATTR_CLIENT_INFO, oci8_errhp));
+        chker2(OCIAttrSet(oci8_get_oci_session(self), OCI_HTYPE_SESSION, (dvoid*)ptr,
+                          size, OCI_ATTR_CLIENT_INFO, oci8_errhp),
+               DATA_PTR(self));
     } else {
         /* Oracle 9i or lower */
         oci8_exec_sql_var_t bind_vars[1];
 
         /* :client_info */
-        bind_vars[0].valuep = ptr;
+        bind_vars[0].valuep = (dvoid*)ptr;
         bind_vars[0].value_sz = size;
         bind_vars[0].dty = SQLT_CHR;
         bind_vars[0].indp = NULL;
@@ -941,14 +1075,14 @@ static VALUE oci8_set_client_info(VALUE self, VALUE val)
 VALUE Init_oci8(void)
 {
 #if 0
-    /*
-     * OCIHandle is the abstract base class for all OCI handles and
-     * descriptors which are opaque data types of Oracle Call Interface.
-     */
     oci8_cOCIHandle = rb_define_class("OCIHandle", rb_cObject);
     cOCI8 = rb_define_class("OCI8", oci8_cOCIHandle);
 #endif
-    cOCI8 = oci8_define_class("OCI8", &oci8_svcctx_class);
+    cOCI8 = oci8_define_class("OCI8", &oci8_svcctx_vtable);
+    cSession = oci8_define_class_under(cOCI8, "Session", &oci8_svcctx_associate_vtable);
+    cServer = oci8_define_class_under(cOCI8, "Server", &oci8_svcctx_associate_vtable);
+    id_at_session_handle = rb_intern("@session_handle");
+    id_at_server_handle = rb_intern("@server_handle");
 
     oracle_client_vernum = INT2FIX(oracle_client_version);
     if (have_OCIClientVersion) {
@@ -957,20 +1091,21 @@ VALUE Init_oci8(void)
         oracle_client_vernum = INT2FIX(ORAVERNUM(major, minor, update, patch, port_update));
     }
 
-    sym_SYSDBA = ID2SYM(rb_intern("SYSDBA"));
-    sym_SYSOPER = ID2SYM(rb_intern("SYSOPER"));
     id_at_prefetch_rows = rb_intern("@prefetch_rows");
-    id_at_username = rb_intern("@username");
     id_set_prefetch_rows = rb_intern("prefetch_rows=");
 
+    rb_define_const(cOCI8, "VERSION", rb_obj_freeze(rb_usascii_str_new_cstr(OCI8LIB_VERSION)));
     rb_define_singleton_method_nodoc(cOCI8, "oracle_client_vernum", oci8_s_oracle_client_vernum, 0);
-    if (have_OCIMessageOpen && have_OCIMessageGet) {
-        rb_define_singleton_method(cOCI8, "error_message", oci8_s_error_message, 1);
-    }
+    rb_define_singleton_method_nodoc(cOCI8, "__set_property", oci8_s_set_property, 2);
+    rb_define_singleton_method(cOCI8, "error_message", oci8_s_error_message, 1);
     rb_define_private_method(cOCI8, "parse_connect_string", oci8_parse_connect_string, 1);
-    rb_define_method(cOCI8, "initialize", oci8_svcctx_initialize, -1);
+    rb_define_private_method(cOCI8, "logon", oci8_logon, 3);
+    rb_define_private_method(cOCI8, "allocate_handles", oci8_allocate_handles, 0);
+    rb_define_private_method(cOCI8, "session_handle", oci8_get_session_handle, 0);
+    rb_define_private_method(cOCI8, "server_handle", oci8_get_server_handle, 0);
+    rb_define_private_method(cOCI8, "server_attach", oci8_server_attach, 2);
+    rb_define_private_method(cOCI8, "session_begin", oci8_session_begin, 2);
     rb_define_method(cOCI8, "logoff", oci8_svcctx_logoff, 0);
-    rb_define_method(cOCI8, "parse", oci8_svcctx_parse, 1);
     rb_define_method(cOCI8, "commit", oci8_commit, 0);
     rb_define_method(cOCI8, "rollback", oci8_rollback, 0);
     rb_define_method(cOCI8, "non_blocking?", oci8_non_blocking_p, 0);
@@ -987,6 +1122,7 @@ VALUE Init_oci8(void)
     rb_define_method(cOCI8, "module=", oci8_set_module, 1);
     rb_define_method(cOCI8, "action=", oci8_set_action, 1);
     rb_define_method(cOCI8, "client_info=", oci8_set_client_info, 1);
+    rb_define_attr(cOCI8, "last_error", 1, 1);
     return cOCI8;
 }
 
@@ -1004,11 +1140,7 @@ OCISvcCtx *oci8_get_oci_svcctx(VALUE obj)
 OCISession *oci8_get_oci_session(VALUE obj)
 {
     oci8_svcctx_t *svcctx = oci8_get_svcctx(obj);
-
-    if (svcctx->authhp == NULL) {
-        oci_lc(OCIAttrGet(svcctx->base.hp.ptr, OCI_HTYPE_SVCCTX, &svcctx->authhp, 0, OCI_ATTR_SESSION, oci8_errhp));
-    }
-    return svcctx->authhp;
+    return svcctx->usrhp;
 }
 
 void oci8_check_pid_consistency(oci8_svcctx_t *svcctx)