ruby-oci8 2.0.6 → 2.1.0

data/ext/oci8/extconf.rb

@@ -69,7 +69,9 @@ have_type('OCIInterval*', 'ociap.h')
 have_type('OCICallbackLobRead2', 'ociap.h')
 have_type('OCICallbackLobWrite2', 'ociap.h')
 have_type('OCIAdmin*', 'ociap.h')
+have_type('OCIAuthInfo*', 'ociap.h')
 have_type('OCIMsg*', 'ociap.h')
+have_type('OCICPool*', 'ociap.h')
 
 if with_config('oracle-version')
   oci_client_version = OCI8::OracleVersion.new(with_config('oracle-version')).to_i
@@ -84,10 +86,11 @@ if with_config('runtime-check')
 end
 
 $objs = ["oci8lib.o", "env.o", "error.o", "oci8.o", "ocihandle.o",
+         "connection_pool.o",
          "stmt.o", "bind.o", "metadata.o", "attr.o",
          "lob.o", "oradate.o",
          "ocinumber.o", "ocidatetime.o", "object.o", "apiwrap.o",
-         "encoding.o", "xmldb.o", "oranumber_util.o"]
+         "encoding.o", "oranumber_util.o", "thread_util.o"]
 
 if RUBY_PLATFORM =~ /mswin32|cygwin|mingw32|bccwin32/
   $defs << "-DUSE_WIN32_C"
@@ -112,7 +115,7 @@ have_type('rb_encoding', ['ruby/ruby.h', 'ruby/encoding.h'])
 have_var("ruby_errinfo", "ruby.h") # ruby 1.8
 have_func("rb_errinfo", "ruby.h")  # ruby 1.9
 
-have_type("rb_blocking_function_t", "ruby.h")
+have_type("rb_blocking_function_t*", "ruby.h")
 have_func("rb_set_end_proc", "ruby.h")
 have_func("rb_class_superclass", "ruby.h")
 have_func("rb_thread_blocking_region", "ruby.h")
@@ -139,6 +142,7 @@ so_basename += Config::CONFIG["ruby_version"].gsub(/\W/, '')
 
 $defs << "-DInit_oci8lib=Init_#{so_basename}"
 $defs << "-Doci8lib=#{so_basename}"
+$defs << "-DOCI8LIB_VERSION=\\\"#{RUBY_OCI8_VERSION}\\\""
 if defined? RUBY_ENGINE and RUBY_ENGINE == 'rbx'
   $defs << "-DCHAR_IS_NOT_A_SHORTCUT_TO_ID"
 end

data/ext/oci8/lob.c

@@ -41,7 +41,8 @@ static VALUE oci8_make_lob(VALUE klass, oci8_svcctx_t *svcctx, OCILobLocator *s)
     lob_obj = rb_funcall(klass, oci8_id_new, 1, svcctx->base.self);
     lob = DATA_PTR(lob_obj);
     /* If 's' is a temporary lob, use OCILobLocatorAssign instead. */
-    oci_lc(OCILobAssign(oci8_envhp, oci8_errhp, s, &lob->base.hp.lob));
+    chker2(OCILobAssign(oci8_envhp, oci8_errhp, s, &lob->base.hp.lob),
+           &svcctx->base);
     return lob_obj;
 }
 
@@ -68,7 +69,7 @@ VALUE oci8_make_bfile(oci8_svcctx_t *svcctx, OCILobLocator *s)
 static void oci8_assign_lob(VALUE klass, oci8_svcctx_t *svcctx, VALUE lob, OCILobLocator **dest)
 {
     oci8_base_t *base = oci8_get_handle(lob, klass);
-    oci_lc(OCILobLocatorAssign_nb(svcctx, svcctx->base.hp.svc, oci8_errhp, base->hp.lob, dest));
+    chker2(OCILobLocatorAssign_nb(svcctx, svcctx->base.hp.svc, oci8_errhp, base->hp.lob, dest), base);
 }
 
 void oci8_assign_clob(oci8_svcctx_t *svcctx, VALUE lob, OCILobLocator **dest)
@@ -102,7 +103,7 @@ static void oci8_lob_free(oci8_base_t *base)
     oci8_lob_t *lob = (oci8_lob_t *)base;
     boolean is_temporary;
 
-    if (have_OCILobIsTemporary && lob->svchp != NULL
+    if (lob->svchp != NULL
         && OCILobIsTemporary(oci8_envhp, oci8_errhp, lob->base.hp.lob, &is_temporary) == OCI_SUCCESS
         && is_temporary) {
 
@@ -113,7 +114,7 @@ static void oci8_lob_free(oci8_base_t *base)
     lob->svchp = NULL;
 }
 
-static oci8_base_class_t oci8_lob_class = {
+static oci8_base_vtable_t oci8_lob_vtable = {
     oci8_lob_mark,
     oci8_lob_free,
     sizeof(oci8_lob_t),
@@ -124,18 +125,18 @@ static ub4 oci8_lob_get_length(oci8_lob_t *lob)
     oci8_svcctx_t *svcctx = oci8_get_svcctx(lob->svc);
     ub4 len;
 
-    oci_lc(OCILobGetLength_nb(svcctx, svcctx->base.hp.svc, oci8_errhp, lob->base.hp.lob, &len));
+    chker2(OCILobGetLength_nb(svcctx, svcctx->base.hp.svc, oci8_errhp, lob->base.hp.lob, &len),
+           &svcctx->base);
     return len;
 }
 
 static void lob_open(oci8_lob_t *lob)
 {
     if (lob->state == S_CLOSE) {
-        if (have_OCILobOpen_nb) {
-            oci8_svcctx_t *svcctx = oci8_get_svcctx(lob->svc);
+        oci8_svcctx_t *svcctx = oci8_get_svcctx(lob->svc);
 
-            oci_lc(OCILobOpen_nb(svcctx, svcctx->base.hp.svc, oci8_errhp, lob->base.hp.lob, OCI_DEFAULT));
-        }
+        chker2(OCILobOpen_nb(svcctx, svcctx->base.hp.svc, oci8_errhp, lob->base.hp.lob, OCI_DEFAULT),
+               &svcctx->base);
         lob->state = S_OPEN;
     }
 }
@@ -143,11 +144,10 @@ static void lob_open(oci8_lob_t *lob)
 static void lob_close(oci8_lob_t *lob)
 {
     if (lob->state == S_OPEN) {
-        if (have_OCILobClose_nb) {
-            oci8_svcctx_t *svcctx = oci8_get_svcctx(lob->svc);
+        oci8_svcctx_t *svcctx = oci8_get_svcctx(lob->svc);
 
-            oci_lc(OCILobClose_nb(svcctx, svcctx->base.hp.svc, oci8_errhp, lob->base.hp.lob));
-        }
+        chker2(OCILobClose_nb(svcctx, svcctx->base.hp.svc, oci8_errhp, lob->base.hp.lob),
+               &svcctx->base);
         lob->state = S_CLOSE;
     }
 }
@@ -157,7 +157,8 @@ static void bfile_close(oci8_lob_t *lob)
     if (lob->state == S_BFILE_OPEN) {
         oci8_svcctx_t *svcctx = oci8_get_svcctx(lob->svc);
 
-        oci_lc(OCILobFileClose_nb(svcctx, svcctx->base.hp.svc, oci8_errhp, lob->base.hp.lob));
+        chker2(OCILobFileClose_nb(svcctx, svcctx->base.hp.svc, oci8_errhp, lob->base.hp.lob),
+               &svcctx->base);
         lob->state = S_BFILE_CLOSE;
     }
 }
@@ -192,15 +193,12 @@ static VALUE oci8_lob_do_initialize(int argc, VALUE *argv, VALUE self, ub1 csfrm
     lob->state = S_NO_OPEN_CLOSE;
     oci8_link_to_parent((oci8_base_t*)lob, (oci8_base_t*)DATA_PTR(svc));
     if (!NIL_P(val)) {
-        if (have_OCILobCreateTemporary_nb) {
-            oci8_svcctx_t *svcctx = oci8_get_svcctx(svc);
-            OCI8StringValue(val);
-            oci_lc(OCILobCreateTemporary_nb(svcctx, svcctx->base.hp.svc, oci8_errhp, lob->base.hp.lob, 0, csfrm, lobtype, TRUE, OCI_DURATION_SESSION));
-            lob->svchp = oci8_get_oci_svcctx(svc);
-            oci8_lob_write(self, val);
-        } else {
-            rb_raise(rb_eRuntimeError, "creating a temporary lob is not supported on this Oracle version");
-        }
+        oci8_svcctx_t *svcctx = oci8_get_svcctx(svc);
+        OCI8StringValue(val);
+        chker2(OCILobCreateTemporary_nb(svcctx, svcctx->base.hp.svc, oci8_errhp, lob->base.hp.lob, 0, csfrm, lobtype, TRUE, OCI_DURATION_SESSION),
+               &svcctx->base);
+        lob->svchp = oci8_get_oci_svcctx(svc);
+        oci8_lob_write(self, val);
     }
     return Qnil;
 }
@@ -241,7 +239,8 @@ static VALUE oci8_lob_available_p(VALUE self)
     oci8_lob_t *lob = DATA_PTR(self);
     boolean is_initialized;
 
-    oci_lc(OCILobLocatorIsInit(oci8_envhp, oci8_errhp, lob->base.hp.lob, &is_initialized));
+    chker2(OCILobLocatorIsInit(oci8_envhp, oci8_errhp, lob->base.hp.lob, &is_initialized),
+           &lob->base);
     return is_initialized ? Qtrue : Qfalse;
 }
 
@@ -302,7 +301,8 @@ static VALUE oci8_lob_truncate(VALUE self, VALUE len)
     oci8_svcctx_t *svcctx = oci8_get_svcctx(lob->svc);
 
     lob_open(lob);
-    oci_lc(OCILobTrim_nb(svcctx, svcctx->base.hp.svc, oci8_errhp, lob->base.hp.lob, NUM2UINT(len)));
+    chker2(OCILobTrim_nb(svcctx, svcctx->base.hp.svc, oci8_errhp, lob->base.hp.lob, NUM2UINT(len)),
+           &svcctx->base);
     return self;
 }
 
@@ -354,11 +354,11 @@ static VALUE oci8_lob_read(int argc, VALUE *argv, VALUE self)
                         }
                     }
                 }
-                oci_lc(OCILobFileCloseAll_nb(svcctx, svcctx->base.hp.svc, oci8_errhp));
+                chker2(OCILobFileCloseAll_nb(svcctx, svcctx->base.hp.svc, oci8_errhp),
+                       &svcctx->base);
                 continue;
             }
-            if (rv != OCI_SUCCESS)
-                oci8_raise(oci8_errhp, rv, NULL);
+            chker2(rv, &svcctx->base);
             lob->state = S_BFILE_OPEN;
         }
         /* initialize buf in zeros everytime to check a nul characters. */
@@ -369,8 +369,9 @@ static VALUE oci8_lob_read(int argc, VALUE *argv, VALUE self)
             if (lob->state == S_BFILE_CLOSE)
                 continue;
         }
-        if (rv != OCI_SUCCESS && rv != OCI_NEED_DATA)
-            oci8_raise(oci8_errhp, rv, NULL);
+        if (rv != OCI_SUCCESS && rv != OCI_NEED_DATA) {
+            chker2(rv, &svcctx->base);
+        }
 
         /* Workaround when using Oracle 10.2.0.4 or 11.1.0.6 client and
          * variable-length character set (e.g. AL32UTF8).
@@ -426,7 +427,8 @@ static VALUE oci8_lob_write(VALUE self, VALUE data)
     }
     RB_GC_GUARD(data);
     amt = RSTRING_LEN(data);
-    oci_lc(OCILobWrite_nb(svcctx, svcctx->base.hp.svc, oci8_errhp, lob->base.hp.lob, &amt, lob->pos + 1, RSTRING_PTR(data), amt, OCI_ONE_PIECE, NULL, NULL, 0, lob->csfrm));
+    chker2(OCILobWrite_nb(svcctx, svcctx->base.hp.svc, oci8_errhp, lob->base.hp.lob, &amt, lob->pos + 1, RSTRING_PTR(data), amt, OCI_ONE_PIECE, NULL, NULL, 0, lob->csfrm),
+           &svcctx->base);
     lob->pos += amt;
     return UINT2NUM(amt);
 }
@@ -459,16 +461,13 @@ static VALUE oci8_lob_flush(VALUE self)
 
 static VALUE oci8_lob_get_chunk_size(VALUE self)
 {
-    if (have_OCILobGetChunkSize_nb) {
-        oci8_lob_t *lob = DATA_PTR(self);
-        oci8_svcctx_t *svcctx = oci8_get_svcctx(lob->svc);
-        ub4 len;
+    oci8_lob_t *lob = DATA_PTR(self);
+    oci8_svcctx_t *svcctx = oci8_get_svcctx(lob->svc);
+    ub4 len;
 
-        oci_lc(OCILobGetChunkSize_nb(svcctx, svcctx->base.hp.svc, oci8_errhp, lob->base.hp.lob, &len));
-        return UINT2NUM(len);
-    } else {
-        rb_notimplement();
-    }
+    chker2(OCILobGetChunkSize_nb(svcctx, svcctx->base.hp.svc, oci8_errhp, lob->base.hp.lob, &len),
+           &svcctx->base);
+    return UINT2NUM(len);
 }
 
 static VALUE oci8_lob_clone(VALUE self)
@@ -476,21 +475,17 @@ static VALUE oci8_lob_clone(VALUE self)
     oci8_lob_t *lob = DATA_PTR(self);
     oci8_lob_t *newlob;
     VALUE newobj;
-    sword rv;
     boolean is_temporary;
 
     newobj = rb_funcall(CLASS_OF(self), oci8_id_new, 1, lob->svc);
     newlob = DATA_PTR(newobj);
-    if (have_OCILobLocatorAssign_nb && have_OCILobIsTemporary
-            && OCILobIsTemporary(oci8_envhp, oci8_errhp, lob->base.hp.lob, &is_temporary) == OCI_SUCCESS
-            && is_temporary) {
+    if (OCILobIsTemporary(oci8_envhp, oci8_errhp, lob->base.hp.lob, &is_temporary) == OCI_SUCCESS
+        && is_temporary) {
         oci8_svcctx_t *svcctx = oci8_get_svcctx(lob->svc);
-        rv = OCILobLocatorAssign_nb(svcctx, svcctx->base.hp.svc, oci8_errhp, lob->base.hp.lob, &newlob->base.hp.lob);
+        chker2(OCILobLocatorAssign_nb(svcctx, svcctx->base.hp.svc, oci8_errhp, lob->base.hp.lob, &newlob->base.hp.lob),
+               &svcctx->base);
     } else {
-        rv = OCILobAssign(oci8_envhp, oci8_errhp, lob->base.hp.lob, &newlob->base.hp.lob);
-    }
-    if (rv != OCI_SUCCESS) {
-        oci8_raise(oci8_errhp, rv, NULL);
+        chker2(OCILobAssign(oci8_envhp, oci8_errhp, lob->base.hp.lob, &newlob->base.hp.lob), &lob->base);
     }
     return newobj;
 }
@@ -517,7 +512,8 @@ static void oci8_bfile_get_name(VALUE self, VALUE *dir_alias_p, VALUE *filename_
         VALUE dir_alias;
         VALUE filename;
 
-        oci_lc(OCILobFileGetName(oci8_envhp, oci8_errhp, lob->base.hp.lob, TO_ORATEXT(d_buf), &d_length, TO_ORATEXT(f_buf), &f_length));
+        chker2(OCILobFileGetName(oci8_envhp, oci8_errhp, lob->base.hp.lob, TO_ORATEXT(d_buf), &d_length, TO_ORATEXT(f_buf), &f_length),
+               &lob->base);
         dir_alias = rb_external_str_new_with_enc(d_buf, d_length, oci8_encoding);
         filename = rb_external_str_new_with_enc(f_buf, f_length, oci8_encoding);
         rb_ivar_set(self, id_dir_alias, dir_alias);
@@ -542,9 +538,10 @@ static void oci8_bfile_set_name(VALUE self, VALUE dir_alias, VALUE filename)
     if (RSTRING_LEN(filename) > UB2MAXVAL) {
         rb_raise(rb_eRuntimeError, "filename is too long.");
     }
-    oci_lc(OCILobFileSetName(oci8_envhp, oci8_errhp, &lob->base.hp.lob,
+    chker2(OCILobFileSetName(oci8_envhp, oci8_errhp, &lob->base.hp.lob,
                              RSTRING_ORATEXT(dir_alias), (ub2)RSTRING_LEN(dir_alias),
-                             RSTRING_ORATEXT(filename), (ub2)RSTRING_LEN(filename)));
+                             RSTRING_ORATEXT(filename), (ub2)RSTRING_LEN(filename)),
+           &lob->base);
 }
 
 static VALUE oci8_bfile_initialize(int argc, VALUE *argv, VALUE self)
@@ -553,10 +550,14 @@ static VALUE oci8_bfile_initialize(int argc, VALUE *argv, VALUE self)
     VALUE svc;
     VALUE dir_alias;
     VALUE filename;
+    int rv;
 
     rb_scan_args(argc, argv, "12", &svc, &dir_alias, &filename);
     TO_SVCCTX(svc); /* check argument type */
-    oci_lc(OCIDescriptorAlloc(oci8_envhp, &lob->base.hp.ptr, OCI_DTYPE_LOB, 0, NULL));
+    rv = OCIDescriptorAlloc(oci8_envhp, &lob->base.hp.ptr, OCI_DTYPE_LOB, 0, NULL);
+    if (rv != OCI_SUCCESS) {
+        oci8_env_raise(oci8_envhp, rv);
+    }
     lob->base.type = OCI_DTYPE_LOB;
     lob->svc = svc;
     lob->pos = 0;
@@ -617,7 +618,8 @@ static VALUE oci8_bfile_exists_p(VALUE self)
     oci8_svcctx_t *svcctx = oci8_get_svcctx(lob->svc);
     boolean flag;
 
-    oci_lc(OCILobFileExists_nb(svcctx, svcctx->base.hp.svc, oci8_errhp, lob->base.hp.lob, &flag));
+    chker2(OCILobFileExists_nb(svcctx, svcctx->base.hp.svc, oci8_errhp, lob->base.hp.lob, &flag),
+           &svcctx->base);
     return flag ? Qtrue : Qfalse;
 }
 
@@ -631,9 +633,9 @@ static VALUE oci8_bfile_error(VALUE self, VALUE dummy)
  */
 
 typedef struct {
-    oci8_bind_class_t bind;
+    oci8_bind_vtable_t bind;
     VALUE *klass;
-} oci8_bind_lob_class_t;
+} oci8_bind_lob_vtable_t;
 
 static VALUE bind_lob_get(oci8_bind_t *obind, void *data, void *null_struct)
 {
@@ -644,10 +646,10 @@ static VALUE bind_lob_get(oci8_bind_t *obind, void *data, void *null_struct)
 static void bind_lob_set(oci8_bind_t *obind, void *data, void **null_structp, VALUE val)
 {
     oci8_hp_obj_t *oho = (oci8_hp_obj_t *)data;
-    const oci8_bind_lob_class_t *klass = (const oci8_bind_lob_class_t *)obind->base.klass;
+    const oci8_bind_lob_vtable_t *vptr = (const oci8_bind_lob_vtable_t *)obind->base.vptr;
     oci8_base_t *h;
-    if (!rb_obj_is_kind_of(val, *klass->klass))
-        rb_raise(rb_eArgError, "Invalid argument: %s (expect %s)", rb_class2name(CLASS_OF(val)), rb_class2name(*klass->klass));
+    if (!rb_obj_is_kind_of(val, *vptr->klass))
+        rb_raise(rb_eArgError, "Invalid argument: %s (expect %s)", rb_class2name(CLASS_OF(val)), rb_class2name(*vptr->klass));
     h = DATA_PTR(val);
     oho->hp = h->hp.ptr;
     oho->obj = val;
@@ -661,19 +663,27 @@ static void bind_lob_init(oci8_bind_t *obind, VALUE svc, VALUE val, VALUE length
 
 static void bind_lob_init_elem(oci8_bind_t *obind, VALUE svc)
 {
-    const oci8_bind_lob_class_t *klass = (const oci8_bind_lob_class_t *)obind->base.klass;
+    const oci8_bind_lob_vtable_t *vptr = (const oci8_bind_lob_vtable_t *)obind->base.vptr;
     oci8_hp_obj_t *oho = (oci8_hp_obj_t *)obind->valuep;
     oci8_base_t *h;
     ub4 idx = 0;
 
     do {
-        oho[idx].obj = rb_funcall(*klass->klass, oci8_id_new, 1, svc);
+        oho[idx].obj = rb_funcall(*vptr->klass, oci8_id_new, 1, svc);
         h = DATA_PTR(oho[idx].obj);
         oho[idx].hp = h->hp.ptr;
     } while (++idx < obind->maxar_sz);
 }
 
-static const oci8_bind_lob_class_t bind_clob_class = {
+static void bind_lob_post_bind_hook_for_nclob(oci8_bind_t *obind)
+{
+    ub1 csfrm = SQLCS_NCHAR;
+
+    chker2(OCIAttrSet(obind->base.hp.ptr, obind->base.type, (void*)&csfrm, 0, OCI_ATTR_CHARSET_FORM, oci8_errhp),
+           &obind->base);
+}
+
+static const oci8_bind_lob_vtable_t bind_clob_vtable = {
     {
         {
             oci8_bind_hp_obj_mark,
@@ -685,14 +695,12 @@ static const oci8_bind_lob_class_t bind_clob_class = {
         bind_lob_init,
         bind_lob_init_elem,
         NULL,
-        NULL,
-        NULL,
         SQLT_CLOB
     },
     &cOCI8CLOB
 };
 
-static const oci8_bind_lob_class_t bind_nclob_class = {
+static const oci8_bind_lob_vtable_t bind_nclob_vtable = {
     {
         {
             oci8_bind_hp_obj_mark,
@@ -704,15 +712,13 @@ static const oci8_bind_lob_class_t bind_nclob_class = {
         bind_lob_init,
         bind_lob_init_elem,
         NULL,
-        NULL,
-        NULL,
         SQLT_CLOB,
-        SQLCS_NCHAR,
+        bind_lob_post_bind_hook_for_nclob,
     },
     &cOCI8NCLOB
 };
 
-static const oci8_bind_lob_class_t bind_blob_class = {
+static const oci8_bind_lob_vtable_t bind_blob_vtable = {
     {
         {
             oci8_bind_hp_obj_mark,
@@ -724,14 +730,12 @@ static const oci8_bind_lob_class_t bind_blob_class = {
         bind_lob_init,
         bind_lob_init_elem,
         NULL,
-        NULL,
-        NULL,
         SQLT_BLOB
     },
     &cOCI8BLOB
 };
 
-static const oci8_bind_lob_class_t bind_bfile_class = {
+static const oci8_bind_lob_vtable_t bind_bfile_vtable = {
     {
         {
             oci8_bind_hp_obj_mark,
@@ -743,8 +747,6 @@ static const oci8_bind_lob_class_t bind_bfile_class = {
         bind_lob_init,
         bind_lob_init_elem,
         NULL,
-        NULL,
-        NULL,
         SQLT_BFILE
     },
     &cOCI8BFILE
@@ -759,7 +761,7 @@ void Init_oci8_lob(VALUE cOCI8)
     seek_cur = rb_eval_string("::IO::SEEK_CUR");
     seek_end = rb_eval_string("::IO::SEEK_END");
 
-    cOCI8LOB = oci8_define_class_under(cOCI8, "LOB", &oci8_lob_class);
+    cOCI8LOB = oci8_define_class_under(cOCI8, "LOB", &oci8_lob_vtable);
     cOCI8CLOB = rb_define_class_under(cOCI8, "CLOB", cOCI8LOB);
     cOCI8NCLOB = rb_define_class_under(cOCI8, "NCLOB", cOCI8LOB);
     cOCI8BLOB = rb_define_class_under(cOCI8, "BLOB", cOCI8LOB);
@@ -796,8 +798,8 @@ void Init_oci8_lob(VALUE cOCI8)
     rb_define_method(cOCI8BFILE, "size=", oci8_bfile_error, 1);
     rb_define_method(cOCI8BFILE, "write", oci8_bfile_error, 1);
 
-    oci8_define_bind_class("CLOB", &bind_clob_class.bind);
-    oci8_define_bind_class("NCLOB", &bind_nclob_class.bind);
-    oci8_define_bind_class("BLOB", &bind_blob_class.bind);
-    oci8_define_bind_class("BFILE", &bind_bfile_class.bind);
+    oci8_define_bind_class("CLOB", &bind_clob_vtable.bind);
+    oci8_define_bind_class("NCLOB", &bind_nclob_vtable.bind);
+    oci8_define_bind_class("BLOB", &bind_blob_vtable.bind);
+    oci8_define_bind_class("BFILE", &bind_bfile_vtable.bind);
 }

data/ext/oci8/metadata.c

@@ -40,7 +40,7 @@ VALUE oci8_metadata_create(OCIParam *parmhp, VALUE svc, VALUE parent)
 
     p = oci8_get_handle(parent, oci8_cOCIHandle);
 
-    oci_lc(OCIAttrGet(parmhp, OCI_DTYPE_PARAM, &ptype, &size, OCI_ATTR_PTYPE, oci8_errhp));
+    chker2(OCIAttrGet(parmhp, OCI_DTYPE_PARAM, &ptype, &size, OCI_ATTR_PTYPE, oci8_errhp), p);
     klass = rb_hash_aref(ptype_to_class, INT2FIX(ptype));
     if (NIL_P(klass))
         rb_raise(rb_eRuntimeError, "unknown parameter type %d", ptype);
@@ -69,150 +69,16 @@ static VALUE metadata_s_register_ptype(VALUE klass, VALUE ptype)
     return Qnil;
 }
 
-static VALUE metadata_get_ub1(VALUE self, VALUE idx)
-{
-    oci8_base_t *base = DATA_PTR(self);
-    ub1 value = 0;
-    ub4 size = sizeof(value);
-
-    oci_lc(OCIAttrGet(base->hp.ptr, base->type, &value, &size, FIX2INT(idx), oci8_errhp));
-    if (size != 1) {
-        rb_raise(rb_eRuntimeError, "Invalid attribute size. expect 1, but %d", size);
-    }
-    return INT2FIX(value);
-}
-
-static VALUE metadata_get_ub2(VALUE self, VALUE idx)
-{
-    oci8_base_t *base = DATA_PTR(self);
-    ub2 value = 0;
-    ub4 size = sizeof(value);
-
-    oci_lc(OCIAttrGet(base->hp.ptr, base->type, &value, &size, FIX2INT(idx), oci8_errhp));
-    if (size != 2) {
-        rb_raise(rb_eRuntimeError, "Invalid attribute size. expect 2, but %d", size);
-    }
-    return INT2FIX(value);
-}
-
-/* get ub2 without size check. */
-static VALUE metadata_get_ub2_nc(VALUE self, VALUE idx)
-{
-    oci8_base_t *base = DATA_PTR(self);
-    ub2 value = 0;
-
-    oci_lc(OCIAttrGet(base->hp.ptr, base->type, &value, 0, FIX2INT(idx), oci8_errhp));
-    return INT2FIX(value);
-}
-
-static VALUE metadata_get_ub4(VALUE self, VALUE idx)
-{
-    oci8_base_t *base = DATA_PTR(self);
-    ub4 value = 0;
-    ub4 size = sizeof(value);
-
-    oci_lc(OCIAttrGet(base->hp.ptr, base->type, &value, &size, FIX2INT(idx), oci8_errhp));
-    if (size != 4) {
-        rb_raise(rb_eRuntimeError, "Invalid attribute size. expect 4, but %d", size);
-    }
-#if SIZEOF_LONG > 4
-    return INT2FIX(value);
-#else
-    return UINT2NUM(value);
-#endif
-}
-
-static VALUE metadata_get_sb1(VALUE self, VALUE idx)
-{
-    oci8_base_t *base = DATA_PTR(self);
-    sb1 value = 0;
-    ub4 size = sizeof(value);
-
-    oci_lc(OCIAttrGet(base->hp.ptr, base->type, &value, &size, FIX2INT(idx), oci8_errhp));
-    if (size != 1) {
-        rb_raise(rb_eRuntimeError, "Invalid attribute size. expect 1, but %d", size);
-    }
-    return INT2FIX(value);
-}
-
-static VALUE metadata_get_sb2(VALUE self, VALUE idx)
-{
-    oci8_base_t *base = DATA_PTR(self);
-    sb2 value = 0;
-    ub4 size = sizeof(value);
-
-    oci_lc(OCIAttrGet(base->hp.ptr, base->type, &value, &size, FIX2INT(idx), oci8_errhp));
-    if (size != 2) {
-        rb_raise(rb_eRuntimeError, "Invalid attribute size. expect 2, but %d", size);
-    }
-    return INT2FIX(value);
-}
-
-static VALUE metadata_get_sb4(VALUE self, VALUE idx)
-{
-    oci8_base_t *base = DATA_PTR(self);
-    sb4 value = 0;
-    ub4 size = sizeof(value);
-
-    oci_lc(OCIAttrGet(base->hp.ptr, base->type, &value, &size, FIX2INT(idx), oci8_errhp));
-    if (size != 4) {
-        rb_raise(rb_eRuntimeError, "Invalid attribute size. expect 4, but %d", size);
-    }
-#if SIZEOF_LONG > 4
-    return INT2FIX(value);
-#else
-    return INT2NUM(value);
-#endif
-}
-
-static VALUE metadata_get_text(VALUE self, VALUE idx)
-{
-    oci8_metadata_t *md = DATA_PTR(self);
-    oci8_svcctx_t *svcctx = oci8_get_svcctx(md->svc);
-    text *value;
-    ub4 size;
-
-    /* remote call sometimes? */
-    oci_lc(OCIAttrGet_nb(svcctx, md->base.hp.ptr, md->base.type, &value, &size, FIX2INT(idx), oci8_errhp));
-    return rb_external_str_new_with_enc(TO_CHARPTR(value), size, oci8_encoding);
-}
-
-static VALUE metadata_get_oradate(VALUE self, VALUE idx)
-{
-    oci8_base_t *base = DATA_PTR(self);
-    ub1 *value;
-    ub4 size = 7;
-    static VALUE cOraDate = Qnil;
-    VALUE obj;
-
-    oci_lc(OCIAttrGet(base->hp.ptr, base->type, &value, &size, FIX2INT(idx), oci8_errhp));
-    if (size != 7) {
-        rb_raise(rb_eRuntimeError, "Invalid attribute size. expect 7, but %d", size);
-    }
-    if (NIL_P(cOraDate))
-        cOraDate = rb_eval_string("OraDate");
-    obj = rb_funcall(cOraDate, oci8_id_new, 0);
-    memcpy(DATA_PTR(obj), value, 7);
-    return obj;
-}
-
-static VALUE metadata_get_oraint(VALUE self, VALUE idx)
-{
-    oci8_base_t *base = DATA_PTR(self);
-    ub1 *value;
-    ub4 size = 21;
-    OCINumber on;
-
-    oci_lc(OCIAttrGet(base->hp.ptr, base->type, &value, &size, FIX2INT(idx), oci8_errhp));
-    if (size >= 22) {
-        rb_raise(rb_eRuntimeError, "Invalid attribute size. expect less than 22, but %d", size);
-    }
-    memset(&on, 0, sizeof(on));
-    on.OCINumberPart[0] = size;
-    memcpy(&on.OCINumberPart[1], value, size);
-    return oci8_make_integer(&on, oci8_errhp);
-}
-
+/*
+ * call-seq:
+ *   __param(attr_type) -> metadata information or nil
+ *
+ * Gets the value of the attribute specified by +attr_type+
+ * as an instance of an OCI8::Metadata::Base's subclass.
+ *
+ * <b>Caution:</b> If the specified attr_type's datatype is not a
+ * metadata, it causes a segmentation fault.
+ */
 static VALUE metadata_get_param(VALUE self, VALUE idx)
 {
     oci8_metadata_t *md = DATA_PTR(self);
@@ -220,11 +86,16 @@ static VALUE metadata_get_param(VALUE self, VALUE idx)
     OCIParam *value;
     ub4 size = sizeof(value);
 
-    /* remote call? */
-    oci_lc(OCIAttrGet_nb(svcctx, md->base.hp.ptr, md->base.type, &value, &size, FIX2INT(idx), oci8_errhp));
+    Check_Type(idx, T_FIXNUM);
+    /* Is it remote call? */
+    chker2(OCIAttrGet_nb(svcctx, md->base.hp.ptr, md->base.type, &value, &size, FIX2INT(idx), oci8_errhp),
+           &svcctx->base);
     if (size != sizeof(OCIParam *)) {
         rb_raise(rb_eRuntimeError, "Invalid attribute size. expect %d, but %d", (sb4)sizeof(OCIParam *), size);
     }
+    if (value == NULL) {
+        return Qnil;
+    }
     return oci8_metadata_create(value, md->svc, self);
 }
 
@@ -233,17 +104,11 @@ static VALUE metadata_get_param_at(VALUE self, VALUE idx)
     oci8_metadata_t *md = DATA_PTR(self);
     OCIParam *value;
 
-    oci_lc(OCIParamGet(md->base.hp.ptr, md->base.type, oci8_errhp, (dvoid *)&value, FIX2INT(idx)));
+    chker2(OCIParamGet(md->base.hp.ptr, md->base.type, oci8_errhp, (dvoid *)&value, FIX2INT(idx)),
+           &md->base);
     return oci8_metadata_create(value, md->svc, self);
 }
 
-static VALUE metadata_get_charset_name(VALUE self, VALUE charset_id)
-{
-    oci8_metadata_t *md = DATA_PTR(self);
-
-    return oci8_charset_id2name(md->svc, charset_id);
-}
-
 static VALUE metadata_get_con(VALUE self)
 {
     oci8_metadata_t *md = DATA_PTR(self);
@@ -263,22 +128,29 @@ static VALUE oci8_do_describe(VALUE self, void *objptr, ub4 objlen, ub1 objtype,
     VALUE type;
     VALUE obj;
     oci8_base_t *desc;
+    int rv;
 
     /* make a describe handle object */
     obj = rb_obj_alloc(oci8_cOCIHandle);
     desc = DATA_PTR(obj);
-    oci_lc(OCIHandleAlloc(oci8_envhp, (dvoid *)&desc->hp.dschp, OCI_HTYPE_DESCRIBE, 0, 0));
+    rv = OCIHandleAlloc(oci8_envhp, (dvoid *)&desc->hp.dschp, OCI_HTYPE_DESCRIBE, 0, 0);
+    if (rv != OCI_SUCCESS) {
+        oci8_env_raise(oci8_envhp, rv);
+    }
     desc->type = OCI_HTYPE_DESCRIBE;
 
     type = rb_hash_aref(class_to_ptype, klass);
     if (RTEST(check_public)) {
         sb4 val = -1;
         /* size of OCI_ATTR_DESC_PUBLIC is undocumented. */
-        oci_lc(OCIAttrSet(desc->hp.dschp, OCI_HTYPE_DESCRIBE, &val, 0, OCI_ATTR_DESC_PUBLIC, oci8_errhp));
+        chker2(OCIAttrSet(desc->hp.dschp, OCI_HTYPE_DESCRIBE, &val, 0, OCI_ATTR_DESC_PUBLIC, oci8_errhp),
+               &svcctx->base);
     }
-    oci_lc(OCIDescribeAny_nb(svcctx, svcctx->base.hp.svc, oci8_errhp, objptr, objlen,
-                             objtype, OCI_DEFAULT, (ub1)FIX2INT(type), desc->hp.dschp));
-    oci_lc(OCIAttrGet(desc->hp.dschp, OCI_HTYPE_DESCRIBE, &parmhp, 0, OCI_ATTR_PARAM, oci8_errhp));
+    chker2(OCIDescribeAny_nb(svcctx, svcctx->base.hp.svc, oci8_errhp, objptr, objlen,
+                             objtype, OCI_DEFAULT, (ub1)FIX2INT(type), desc->hp.dschp),
+           &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);
 }
 
@@ -298,7 +170,8 @@ static VALUE metadata_get_type_metadata(VALUE self, VALUE klass)
     OCIRef *ref = NULL;
 
     /* remote call */
-    oci_lc(OCIAttrGet_nb(svcctx, md->base.hp.ptr, md->base.type, &ref, NULL, OCI_ATTR_REF_TDO, oci8_errhp));
+    chker2(OCIAttrGet_nb(svcctx, md->base.hp.ptr, md->base.type, &ref, NULL, OCI_ATTR_REF_TDO, oci8_errhp),
+           &svcctx->base);
     return oci8_do_describe(md->svc, ref, 0, OCI_OTYPE_REF, klass, Qfalse);
 }
 
@@ -309,11 +182,14 @@ static VALUE metadata_get_tdo_id(VALUE self)
     OCIRef *tdo_ref = NULL;
     void *tdo;
 
-    oci_lc(OCIAttrGet_nb(svcctx, md->base.hp.ptr, md->base.type, &tdo_ref, NULL, OCI_ATTR_REF_TDO, oci8_errhp));
+    chker2(OCIAttrGet_nb(svcctx, md->base.hp.ptr, md->base.type, &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));
-    oci_lc(OCIObjectUnpin(oci8_envhp, oci8_errhp, tdo));
+    chker2(OCIObjectPin_nb(svcctx, oci8_envhp, oci8_errhp, tdo_ref, 0, OCI_PIN_ANY, OCI_DURATION_SESSION, OCI_LOCK_NONE, &tdo),
+           &svcctx->base);
+    chker2(OCIObjectUnpin(oci8_envhp, oci8_errhp, tdo),
+           &svcctx->base);
 #if SIZEOF_LONG == SIZEOF_VOIDP
     return ((VALUE)tdo | (VALUE)1);
 #else
@@ -321,7 +197,7 @@ static VALUE metadata_get_tdo_id(VALUE self)
 #endif
 }
 
-oci8_base_class_t oci8_metadata_class = {
+oci8_base_vtable_t oci8_metadata_vtable = {
     oci8_metadata_mark,
     NULL,
     sizeof(oci8_metadata_t),
@@ -330,26 +206,15 @@ oci8_base_class_t oci8_metadata_class = {
 void Init_oci8_metadata(VALUE cOCI8)
 {
     mOCI8Metadata = rb_define_module_under(cOCI8, "Metadata");
-    cOCI8MetadataBase = oci8_define_class_under(mOCI8Metadata, "Base", &oci8_metadata_class);
+    cOCI8MetadataBase = oci8_define_class_under(mOCI8Metadata, "Base", &oci8_metadata_vtable);
     ptype_to_class = rb_hash_new();
     class_to_ptype = rb_hash_new();
     rb_global_variable(&ptype_to_class);
     rb_global_variable(&class_to_ptype);
 
     rb_define_singleton_method(cOCI8MetadataBase, "register_ptype", metadata_s_register_ptype, 1);
-    rb_define_private_method(cOCI8MetadataBase, "__ub1", metadata_get_ub1, 1);
-    rb_define_private_method(cOCI8MetadataBase, "__ub2", metadata_get_ub2, 1);
-    rb_define_private_method(cOCI8MetadataBase, "__ub2_nc", metadata_get_ub2_nc, 1);
-    rb_define_private_method(cOCI8MetadataBase, "__ub4", metadata_get_ub4, 1);
-    rb_define_private_method(cOCI8MetadataBase, "__sb1", metadata_get_sb1, 1);
-    rb_define_private_method(cOCI8MetadataBase, "__sb2", metadata_get_sb2, 1);
-    rb_define_private_method(cOCI8MetadataBase, "__sb4", metadata_get_sb4, 1);
-    rb_define_private_method(cOCI8MetadataBase, "__text", metadata_get_text, 1);
-    rb_define_private_method(cOCI8MetadataBase, "__oradate", metadata_get_oradate, 1);
-    rb_define_private_method(cOCI8MetadataBase, "__oraint", metadata_get_oraint, 1);
     rb_define_private_method(cOCI8MetadataBase, "__param", metadata_get_param, 1);
     rb_define_private_method(cOCI8MetadataBase, "__param_at", metadata_get_param_at, 1);
-    rb_define_private_method(cOCI8MetadataBase, "__charset_name", metadata_get_charset_name, 1);
     rb_define_private_method(cOCI8MetadataBase, "__con", metadata_get_con, 0);
     rb_define_private_method(cOCI8MetadataBase, "__is_implicit?", metadata_is_implicit_p, 0);