ruby-oci8 2.0.6 → 2.1.0

data/ext/oci8/ocidatetime.c

@@ -2,10 +2,7 @@
 /*
  *  ocidatetime.c
  *
- * $Author: kubo $
- * $Date: 2011-06-14 20:45:16 +0900 (Tue, 14 Jun 2011) $
- *
- * Copyright (C) 2005-2008 KUBO Takehiro <kubo@jiubao.org>
+ * Copyright (C) 2005-2011 KUBO Takehiro <kubo@jiubao.org>
  *
  */
 #include "oci8.h"
@@ -68,40 +65,12 @@ OCIDate *oci8_set_ocidate(OCIDate *od, VALUE val)
     return od;
 }
 
-static VALUE bind_ocidate_get(oci8_bind_t *obind, void *data, void *null_struct)
-{
-    return oci8_make_ocidate((OCIDate *)data);
-}
-
-static void bind_ocidate_set(oci8_bind_t *obind, void *data, void **null_structp, VALUE val)
-{
-    oci8_set_ocidate((OCIDate *)data, val);
-}
-
-static void bind_ocidate_init(oci8_bind_t *obind, VALUE svc, VALUE val, VALUE length)
+static void bind_init_common(oci8_bind_t *obind, VALUE svc, VALUE val, VALUE length)
 {
-    obind->value_sz = sizeof(OCIDate);
-    obind->alloc_sz = sizeof(OCIDate);
+    obind->value_sz = sizeof(void *);
+    obind->alloc_sz = sizeof(void *);
 }
 
-static const oci8_bind_class_t bind_ocidate_class = {
-    {
-        NULL,
-        oci8_bind_free,
-        sizeof(oci8_bind_t)
-    },
-    bind_ocidate_get,
-    bind_ocidate_set,
-    bind_ocidate_init,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    SQLT_ODT,
-};
-
-#if defined RUNTIME_API_CHECK || ORACLE_CLIENT_VERSION >= ORAVER_9_0
-
 static void bind_init_elem_common(oci8_bind_t *obind, VALUE svc, ub4 type)
 {
     ub4 idx = 0;
@@ -132,7 +101,7 @@ static void bind_free_common(oci8_base_t *base, ub4 type)
     oci8_bind_free(base);
 }
 
-VALUE oci8_make_ocitimestamp_tz(OCIDateTime *dttm)
+VALUE oci8_make_ocitimestamp(OCIDateTime *dttm, boolean have_tz)
 {
     sb2 year;
     ub1 month;
@@ -144,9 +113,11 @@ VALUE oci8_make_ocitimestamp_tz(OCIDateTime *dttm)
     sb1 tz_hour;
     sb1 tz_minute;
 
-    oci_lc(OCIDateTimeGetDate(oci8_envhp, oci8_errhp, dttm, &year, &month, &day));
-    oci_lc(OCIDateTimeGetTime(oci8_envhp, oci8_errhp, dttm, &hour, &minute, &sec, &fsec));
-    oci_lc(OCIDateTimeGetTimeZoneOffset(oci8_envhp, oci8_errhp, dttm, &tz_hour, &tz_minute));
+    chkerr(OCIDateTimeGetDate(oci8_envhp, oci8_errhp, dttm, &year, &month, &day));
+    chkerr(OCIDateTimeGetTime(oci8_envhp, oci8_errhp, dttm, &hour, &minute, &sec, &fsec));
+    if (have_tz) {
+        chkerr(OCIDateTimeGetTimeZoneOffset(oci8_envhp, oci8_errhp, dttm, &tz_hour, &tz_minute));
+    }
     return rb_ary_new3(9,
                        INT2FIX(year),
                        INT2FIX(month),
@@ -155,8 +126,8 @@ VALUE oci8_make_ocitimestamp_tz(OCIDateTime *dttm)
                        INT2FIX(minute),
                        INT2FIX(sec),
                        INT2FIX(fsec),
-                       INT2FIX(tz_hour),
-                       INT2FIX(tz_minute));
+                       have_tz ? INT2FIX(tz_hour) : Qnil,
+                       have_tz ? INT2FIX(tz_minute) : Qnil);
 }
 
 OCIDateTime *oci8_set_ocitimestamp_tz(OCIDateTime *dttm, VALUE val, VALUE svc)
@@ -229,7 +200,7 @@ OCIDateTime *oci8_set_ocitimestamp_tz(OCIDateTime *dttm, VALUE val, VALUE svc)
         tzlen = strlen(tz_str);
     }
     /* construct */
-    oci_lc(OCIDateTimeConstruct(seshp ? (void*)seshp : (void*)oci8_envhp, oci8_errhp, dttm,
+    chkerr(OCIDateTimeConstruct(seshp ? (void*)seshp : (void*)oci8_envhp, oci8_errhp, dttm,
                                 (sb2)year,
                                 (ub1)month,
                                 (ub1)day,
@@ -241,9 +212,43 @@ OCIDateTime *oci8_set_ocitimestamp_tz(OCIDateTime *dttm, VALUE val, VALUE svc)
     return dttm;
 }
 
+static VALUE bind_ocitimestamp_get(oci8_bind_t *obind, void *data, void *null_struct)
+{
+    return oci8_make_ocitimestamp(*(OCIDateTime **)data, FALSE);
+}
+
+static void bind_ocitimestamp_set(oci8_bind_t *obind, void *data, void **null_structp, VALUE val)
+{
+    oci8_set_ocitimestamp_tz(*(OCIDateTime **)data, val, Qnil);
+}
+
+static void bind_ocitimestamp_init_elem(oci8_bind_t *obind, VALUE svc)
+{
+    bind_init_elem_common(obind, svc, OCI_DTYPE_TIMESTAMP);
+}
+
+static void bind_ocitimestamp_free(oci8_base_t *base)
+{
+    bind_free_common(base, OCI_DTYPE_TIMESTAMP);
+}
+
+static const oci8_bind_vtable_t bind_ocitimestamp_vtable = {
+    {
+        NULL,
+        bind_ocitimestamp_free,
+        sizeof(oci8_bind_t)
+    },
+    bind_ocitimestamp_get,
+    bind_ocitimestamp_set,
+    bind_init_common,
+    bind_ocitimestamp_init_elem,
+    NULL,
+    SQLT_TIMESTAMP
+};
+
 static VALUE bind_ocitimestamp_tz_get(oci8_bind_t *obind, void *data, void *null_struct)
 {
-    return oci8_make_ocitimestamp_tz(*(OCIDateTime **)data);
+    return oci8_make_ocitimestamp(*(OCIDateTime **)data, TRUE);
 }
 
 static void bind_ocitimestamp_tz_set(oci8_bind_t *obind, void *data, void **null_structp, VALUE val)
@@ -260,8 +265,8 @@ static void bind_ocitimestamp_tz_set(oci8_bind_t *obind, void *data, void **null
     if (svcctx == NULL || svcctx->type != OCI_HTYPE_SVCCTX) {
         rb_raise(rb_eRuntimeError, "oci8lib.so internal error [%s:%d, %p, %d, %p, %d]",
                  __FILE__, __LINE__,
-                 parent, parent ? parent->type : -1,
-                 svcctx, svcctx ? svcctx->type : -1);
+                 parent, parent ? (int)parent->type : -1,
+                 svcctx, svcctx ? (int)svcctx->type : -1);
     }
     oci8_set_ocitimestamp_tz(*(OCIDateTime **)data, val, svcctx->self);
 }
@@ -283,7 +288,7 @@ static void bind_ocitimestamp_tz_free(oci8_base_t *base)
     bind_free_common(base, OCI_DTYPE_TIMESTAMP_TZ);
 }
 
-static const oci8_bind_class_t bind_ocitimestamp_tz_class = {
+static const oci8_bind_vtable_t bind_ocitimestamp_tz_vtable = {
     {
         NULL,
         bind_ocitimestamp_tz_free,
@@ -294,8 +299,6 @@ static const oci8_bind_class_t bind_ocitimestamp_tz_class = {
     bind_ocitimestamp_tz_init,
     bind_ocitimestamp_tz_init_elem,
     NULL,
-    NULL,
-    NULL,
     SQLT_TIMESTAMP_TZ
 };
 
@@ -304,7 +307,7 @@ VALUE oci8_make_ociinterval_ym(OCIInterval *s)
     sb4 year;
     sb4 month;
 
-    oci_lc(OCIIntervalGetYearMonth(oci8_envhp, oci8_errhp, &year, &month, s));
+    chkerr(OCIIntervalGetYearMonth(oci8_envhp, oci8_errhp, &year, &month, s));
     return rb_ary_new3(2, INT2FIX(year), INT2FIX(month));
 }
 
@@ -320,12 +323,12 @@ OCIInterval *oci8_set_ociinterval_ym(OCIInterval *intvl, VALUE val)
     year = NUM2INT(RARRAY_PTR(val)[0]);
     month = NUM2INT(RARRAY_PTR(val)[1]);
     if (oracle_client_version >= ORAVERNUM(9, 2, 0, 3, 0)) {
-        oci_lc(OCIIntervalSetYearMonth(oci8_envhp, oci8_errhp,
+        chkerr(OCIIntervalSetYearMonth(oci8_envhp, oci8_errhp,
                                        year, month, intvl));
     } else {
         /* Workaround for Bug 2227982 */
         char buf[64];
-        char *sign = "";
+        const char *sign = "";
 
         if (year < 0 && month != 0) {
             year += 1;
@@ -337,7 +340,7 @@ OCIInterval *oci8_set_ociinterval_ym(OCIInterval *intvl, VALUE val)
             month = -month;
         }
         sprintf(buf, "%s%d-%d", sign, year, month);
-        oci_lc(OCIIntervalFromText(oci8_envhp, oci8_errhp, (text*)buf, strlen(buf), intvl));
+        chkerr(OCIIntervalFromText(oci8_envhp, oci8_errhp, (text*)buf, strlen(buf), intvl));
     }
     return intvl;
 }
@@ -350,7 +353,7 @@ VALUE oci8_make_ociinterval_ds(OCIInterval *s)
     sb4 sec;
     sb4 fsec;
 
-    oci_lc(OCIIntervalGetDaySecond(oci8_envhp, oci8_errhp, &day, &hour, &minute, &sec, &fsec, s));
+    chkerr(OCIIntervalGetDaySecond(oci8_envhp, oci8_errhp, &day, &hour, &minute, &sec, &fsec, s));
     return rb_ary_new3(5,
                        INT2FIX(day), INT2FIX(hour),
                        INT2FIX(minute), INT2FIX(sec),
@@ -375,12 +378,12 @@ OCIInterval *oci8_set_ociinterval_ds(OCIInterval *intvl, VALUE val)
     sec = NUM2INT(RARRAY_PTR(val)[3]);
     fsec = NUM2INT(RARRAY_PTR(val)[4]);
     if (oracle_client_version >= ORAVERNUM(9, 2, 0, 3, 0)) {
-        oci_lc(OCIIntervalSetDaySecond(oci8_envhp, oci8_errhp,
+        chkerr(OCIIntervalSetDaySecond(oci8_envhp, oci8_errhp,
                                        day, hour, minute, sec, fsec, intvl));
     } else {
         /* Workaround for Bug 2227982 */
         char buf[64];
-        char *sign = "";
+        const char *sign = "";
 
         if (day == 0) {
             if (hour < 0) {
@@ -398,7 +401,7 @@ OCIInterval *oci8_set_ociinterval_ds(OCIInterval *intvl, VALUE val)
             }
         }
         sprintf(buf, "%s%d %02d:%02d:%02d.%09d", sign, day, hour, minute, sec, fsec);
-        oci_lc(OCIIntervalFromText(oci8_envhp, oci8_errhp, (text*)buf, strlen(buf), intvl));
+        chkerr(OCIIntervalFromText(oci8_envhp, oci8_errhp, (text*)buf, strlen(buf), intvl));
     }
     return intvl;
 }
@@ -414,12 +417,6 @@ static void bind_ociinterval_ym_set(oci8_bind_t *obind, void *data, void **null_
     oci8_set_ociinterval_ym(*(OCIInterval **)data, val);
 }
 
-static void bind_ociinterval_ym_init(oci8_bind_t *obind, VALUE svc, VALUE val, VALUE length)
-{
-    obind->value_sz = sizeof(OCIInterval*);
-    obind->alloc_sz = sizeof(OCIInterval*);
-}
-
 static void bind_ociinterval_ym_init_elem(oci8_bind_t *obind, VALUE svc)
 {
     bind_init_elem_common(obind, svc, OCI_DTYPE_INTERVAL_YM);
@@ -440,12 +437,6 @@ static void bind_ociinterval_ds_set(oci8_bind_t *obind, void *data, void **null_
     oci8_set_ociinterval_ds(*(OCIInterval **)data, val);
 }
 
-static void bind_ociinterval_ds_init(oci8_bind_t *obind, VALUE svc, VALUE val, VALUE length)
-{
-    obind->value_sz = sizeof(OCIInterval *);
-    obind->alloc_sz = sizeof(OCIInterval *);
-}
-
 static void bind_ociinterval_ds_init_elem(oci8_bind_t *obind, VALUE svc)
 {
     bind_init_elem_common(obind, svc, OCI_DTYPE_INTERVAL_DS);
@@ -456,7 +447,7 @@ static void bind_ociinterval_ds_free(oci8_base_t *base)
     bind_free_common(base, OCI_DTYPE_INTERVAL_DS);
 }
 
-static const oci8_bind_class_t bind_ociinterval_ym_class = {
+static const oci8_bind_vtable_t bind_ociinterval_ym_vtable = {
     {
         NULL,
         bind_ociinterval_ym_free,
@@ -464,15 +455,13 @@ static const oci8_bind_class_t bind_ociinterval_ym_class = {
     },
     bind_ociinterval_ym_get,
     bind_ociinterval_ym_set,
-    bind_ociinterval_ym_init,
+    bind_init_common,
     bind_ociinterval_ym_init_elem,
     NULL,
-    NULL,
-    NULL,
     SQLT_INTERVAL_YM
 };
 
-static const oci8_bind_class_t bind_ociinterval_ds_class = {
+static const oci8_bind_vtable_t bind_ociinterval_ds_vtable = {
     {
         NULL,
         bind_ociinterval_ds_free,
@@ -480,26 +469,16 @@ static const oci8_bind_class_t bind_ociinterval_ds_class = {
     },
     bind_ociinterval_ds_get,
     bind_ociinterval_ds_set,
-    bind_ociinterval_ds_init,
+    bind_init_common,
     bind_ociinterval_ds_init_elem,
     NULL,
-    NULL,
-    NULL,
     SQLT_INTERVAL_DS
 };
 
-#endif /* defined RUNTIME_API_CHECK || ORACLE_CLIENT_VERSION >= ORAVER_9_0 */
-
 void Init_oci_datetime(void)
 {
-    oci8_define_bind_class("OCIDate", &bind_ocidate_class);
-
-#if defined RUNTIME_API_CHECK || ORACLE_CLIENT_VERSION >= ORAVER_9_0
-    if (oracle_client_version >= ORAVER_9_0) {
-        oci8_define_bind_class("OCITimestampTZ", &bind_ocitimestamp_tz_class);
-        oci8_define_bind_class("OCIIntervalYM", &bind_ociinterval_ym_class);
-        oci8_define_bind_class("OCIIntervalDS", &bind_ociinterval_ds_class);
-    }
-#endif
-
+    oci8_define_bind_class("OCITimestamp", &bind_ocitimestamp_vtable);
+    oci8_define_bind_class("OCITimestampTZ", &bind_ocitimestamp_tz_vtable);
+    oci8_define_bind_class("OCIIntervalYM", &bind_ociinterval_ym_vtable);
+    oci8_define_bind_class("OCIIntervalDS", &bind_ociinterval_ds_vtable);
 }

data/ext/oci8/ocihandle.c

@@ -2,7 +2,7 @@
 /*
  * ocihandle.c
  *
- * Copyright (C) 2009 KUBO Takehiro <kubo@jiubao.org>
+ * Copyright (C) 2009-2010 KUBO Takehiro <kubo@jiubao.org>
  *
  * implement OCIHandle
  *
@@ -26,7 +26,7 @@ static long check_data_range(VALUE val, long min, long max, const char *type)
 }
 
 
-static oci8_base_class_t oci8_base_class = {
+static oci8_base_vtable_t oci8_base_vtable = {
     NULL,
     NULL,
     sizeof(oci8_base_t),
@@ -55,8 +55,8 @@ static VALUE oci8_handle_free(VALUE self)
 
 static void oci8_handle_mark(oci8_base_t *base)
 {
-    if (base->klass->mark != NULL)
-        base->klass->mark(base);
+    if (base->vptr->mark != NULL)
+        base->vptr->mark(base);
 }
 
 static void oci8_handle_cleanup(oci8_base_t *base)
@@ -76,29 +76,32 @@ static void oci8_handle_cleanup(oci8_base_t *base)
 static VALUE oci8_s_allocate(VALUE klass)
 {
     oci8_base_t *base;
-    const oci8_base_class_t *base_class;
+    const oci8_base_vtable_t *vptr;
     VALUE superklass;
     VALUE obj;
 
     superklass = klass;
-    while (!RTEST(rb_ivar_defined(superklass, oci8_id_oci8_class))) {
+    while (!RTEST(rb_ivar_defined(superklass, oci8_id_oci8_vtable))) {
         superklass = rb_class_superclass(superklass);
         if (superklass == rb_cObject)
             rb_raise(rb_eRuntimeError, "private method `new' called for %s:Class", rb_class2name(klass));
     }
-    obj = rb_ivar_get(superklass, oci8_id_oci8_class);
-    base_class = DATA_PTR(obj);
+    obj = rb_ivar_get(superklass, oci8_id_oci8_vtable);
+    vptr = DATA_PTR(obj);
 
-    base = xmalloc(base_class->size);
-    memset(base, 0, base_class->size);
+    base = xmalloc(vptr->size);
+    memset(base, 0, vptr->size);
 
     obj = Data_Wrap_Struct(klass, oci8_handle_mark, oci8_handle_cleanup, base);
     base->self = obj;
-    base->klass = base_class;
+    base->vptr = vptr;
     base->parent = NULL;
     base->next = base;
     base->prev = base;
     base->children = NULL;
+    if (vptr->init != NULL) {
+        vptr->init(base);
+    }
     return obj;
 }
 
@@ -120,7 +123,7 @@ static VALUE attr_get_ub1(VALUE self, VALUE attr_type)
 
     v.dummy = MAGIC_NUMBER;
     Check_Type(attr_type, T_FIXNUM);
-    oci_lc(OCIAttrGet(base->hp.ptr, base->type, &v.value, NULL, FIX2INT(attr_type), oci8_errhp));
+    chker2(OCIAttrGet(base->hp.ptr, base->type, &v.value, NULL, FIX2INT(attr_type), oci8_errhp), base);
     return INT2FIX(v.value);
 }
 
@@ -142,7 +145,7 @@ static VALUE attr_get_ub2(VALUE self, VALUE attr_type)
 
     v.dummy = MAGIC_NUMBER;
     Check_Type(attr_type, T_FIXNUM);
-    oci_lc(OCIAttrGet(base->hp.ptr, base->type, &v.value, NULL, FIX2INT(attr_type), oci8_errhp));
+    chker2(OCIAttrGet(base->hp.ptr, base->type, &v.value, NULL, FIX2INT(attr_type), oci8_errhp), base);
     return INT2FIX(v.value);
 }
 
@@ -164,7 +167,7 @@ static VALUE attr_get_ub4(VALUE self, VALUE attr_type)
 
     v.dummy = MAGIC_NUMBER;
     Check_Type(attr_type, T_FIXNUM);
-    oci_lc(OCIAttrGet(base->hp.ptr, base->type, &v.value, NULL, FIX2INT(attr_type), oci8_errhp));
+    chker2(OCIAttrGet(base->hp.ptr, base->type, &v.value, NULL, FIX2INT(attr_type), oci8_errhp), base);
     return UINT2NUM(v.value);
 }
 
@@ -186,7 +189,7 @@ static VALUE attr_get_ub8(VALUE self, VALUE attr_type)
 
     v.dummy = MAGIC_NUMBER;
     Check_Type(attr_type, T_FIXNUM);
-    oci_lc(OCIAttrGet(base->hp.ptr, base->type, &v.value, NULL, FIX2INT(attr_type), oci8_errhp));
+    chker2(OCIAttrGet(base->hp.ptr, base->type, &v.value, NULL, FIX2INT(attr_type), oci8_errhp), base);
     return ULL2NUM(v.value);
 }
 
@@ -208,7 +211,7 @@ static VALUE attr_get_sb1(VALUE self, VALUE attr_type)
 
     v.dummy = MAGIC_NUMBER;
     Check_Type(attr_type, T_FIXNUM);
-    oci_lc(OCIAttrGet(base->hp.ptr, base->type, &v.value, NULL, FIX2INT(attr_type), oci8_errhp));
+    chker2(OCIAttrGet(base->hp.ptr, base->type, &v.value, NULL, FIX2INT(attr_type), oci8_errhp), base);
     return INT2FIX(v.value);
 }
 
@@ -230,7 +233,7 @@ static VALUE attr_get_sb2(VALUE self, VALUE attr_type)
 
     v.dummy = MAGIC_NUMBER;
     Check_Type(attr_type, T_FIXNUM);
-    oci_lc(OCIAttrGet(base->hp.ptr, base->type, &v.value, NULL, FIX2INT(attr_type), oci8_errhp));
+    chker2(OCIAttrGet(base->hp.ptr, base->type, &v.value, NULL, FIX2INT(attr_type), oci8_errhp), base);
     return INT2FIX(v.value);
 }
 
@@ -252,7 +255,7 @@ static VALUE attr_get_sb4(VALUE self, VALUE attr_type)
 
     v.dummy = MAGIC_NUMBER;
     Check_Type(attr_type, T_FIXNUM);
-    oci_lc(OCIAttrGet(base->hp.ptr, base->type, &v.value, NULL, FIX2INT(attr_type), oci8_errhp));
+    chker2(OCIAttrGet(base->hp.ptr, base->type, &v.value, NULL, FIX2INT(attr_type), oci8_errhp), base);
     return INT2NUM(v.value);
 }
 
@@ -274,7 +277,7 @@ static VALUE attr_get_sb8(VALUE self, VALUE attr_type)
 
     v.dummy = MAGIC_NUMBER;
     Check_Type(attr_type, T_FIXNUM);
-    oci_lc(OCIAttrGet(base->hp.ptr, base->type, &v.value, NULL, FIX2INT(attr_type), oci8_errhp));
+    chker2(OCIAttrGet(base->hp.ptr, base->type, &v.value, NULL, FIX2INT(attr_type), oci8_errhp), base);
     return LL2NUM(v.value);
 }
 
@@ -296,7 +299,7 @@ static VALUE attr_get_boolean(VALUE self, VALUE attr_type)
 
     v.dummy = MAGIC_NUMBER;
     Check_Type(attr_type, T_FIXNUM);
-    oci_lc(OCIAttrGet(base->hp.ptr, base->type, &v.value, NULL, FIX2INT(attr_type), oci8_errhp));
+    chker2(OCIAttrGet(base->hp.ptr, base->type, &v.value, NULL, FIX2INT(attr_type), oci8_errhp), base);
     return v.value ? Qtrue : Qfalse;
 }
 
@@ -324,7 +327,7 @@ static VALUE attr_get_string(VALUE self, VALUE attr_type)
 
     v.dummy = MAGIC_NUMBER;
     Check_Type(attr_type, T_FIXNUM);
-    oci_lc(OCIAttrGet(base->hp.ptr, base->type, &v.value, &size, FIX2INT(attr_type), oci8_errhp));
+    chker2(OCIAttrGet(base->hp.ptr, base->type, &v.value, &size, FIX2INT(attr_type), oci8_errhp), base);
     return rb_external_str_new_with_enc(v.value, size, oci8_encoding);
 }
 
@@ -351,7 +354,7 @@ static VALUE attr_get_binary(VALUE self, VALUE attr_type)
 
     v.dummy = 0;
     Check_Type(attr_type, T_FIXNUM);
-    oci_lc(OCIAttrGet(base->hp.ptr, base->type, &v.value, &size, FIX2INT(attr_type), oci8_errhp));
+    chker2(OCIAttrGet(base->hp.ptr, base->type, &v.value, &size, FIX2INT(attr_type), oci8_errhp), base);
     return rb_tainted_str_new(v.value, size);
 }
 
@@ -378,10 +381,46 @@ static VALUE attr_get_integer(VALUE self, VALUE attr_type)
 
     v.dummy = 0;
     Check_Type(attr_type, T_FIXNUM);
-    oci_lc(OCIAttrGet(base->hp.ptr, base->type, &v.value, &size, FIX2INT(attr_type), oci8_errhp));
+    chker2(OCIAttrGet(base->hp.ptr, base->type, &v.value, &size, FIX2INT(attr_type), oci8_errhp), base);
     return oci8_make_integer(v.value, oci8_errhp);
 }
 
+/*
+ * call-seq:
+ *   attr_get_oradate(attr_type) -> an OraDate
+ *
+ * <b>(new in 2.1.0)</b>
+ *
+ * Gets the value of an attribute as `ub1 *' datatype.
+ * The return value is converted to OraDate.
+ *
+ * <b>Caution:</b> If the specified attr_type's datatype is not a
+ * pointer type, it causes a segmentation fault.
+ */
+static VALUE attr_get_oradate(VALUE self, VALUE attr_type)
+{
+    oci8_base_t *base = DATA_PTR(self);
+    union {
+        ub1 *value;
+        ub8 dummy; /* padding for incorrect attrtype to protect the stack */
+    } v;
+    ub4 size = 0;
+    static VALUE cOraDate = Qnil;
+
+    v.dummy = 0;
+    Check_Type(attr_type, T_FIXNUM);
+    chker2(OCIAttrGet(base->hp.ptr, base->type, &v.value, &size, FIX2INT(attr_type), oci8_errhp), base);
+    if (NIL_P(cOraDate))
+        cOraDate = rb_eval_string("OraDate");
+    return rb_funcall(cOraDate, oci8_id_new, 6,
+                      INT2FIX((v.value[0] - 100) * 100 + (v.value[1] - 100)),
+                      INT2FIX(v.value[2]),
+                      INT2FIX(v.value[3]),
+                      INT2FIX(v.value[4] - 1),
+                      INT2FIX(v.value[5] - 1),
+                      INT2FIX(v.value[6] - 1));
+}
+
 /*
  * call-seq:
  *   attr_set_ub1(attr_type, attr_value)
@@ -402,7 +441,7 @@ static VALUE attr_set_ub1(VALUE self, VALUE attr_type, VALUE val)
     Check_Type(attr_type, T_FIXNUM);
     value = (ub1)check_data_range(val, 0, UCHAR_MAX, "ub1");
     /* set attribute */
-    oci_lc(OCIAttrSet(base->hp.ptr, base->type, &value, sizeof(value), FIX2INT(attr_type), oci8_errhp));
+    chker2(OCIAttrSet(base->hp.ptr, base->type, &value, sizeof(value), FIX2INT(attr_type), oci8_errhp), base);
     return self;
 }
 
@@ -426,7 +465,7 @@ static VALUE attr_set_ub2(VALUE self, VALUE attr_type, VALUE val)
     Check_Type(attr_type, T_FIXNUM);
     value = (ub2)check_data_range(val, 0, USHRT_MAX, "ub2");
     /* set attribute */
-    oci_lc(OCIAttrSet(base->hp.ptr, base->type, &value, sizeof(value), FIX2INT(attr_type), oci8_errhp));
+    chker2(OCIAttrSet(base->hp.ptr, base->type, &value, sizeof(value), FIX2INT(attr_type), oci8_errhp), base);
     return self;
 }
 
@@ -450,7 +489,7 @@ static VALUE attr_set_ub4(VALUE self, VALUE attr_type, VALUE val)
     Check_Type(attr_type, T_FIXNUM);
     value = NUM2UINT(val);
     /* set attribute */
-    oci_lc(OCIAttrSet(base->hp.ptr, base->type, &value, sizeof(value), FIX2INT(attr_type), oci8_errhp));
+    chker2(OCIAttrSet(base->hp.ptr, base->type, &value, sizeof(value), FIX2INT(attr_type), oci8_errhp), base);
     return self;
 }
 
@@ -474,7 +513,7 @@ static VALUE attr_set_ub8(VALUE self, VALUE attr_type, VALUE val)
     Check_Type(attr_type, T_FIXNUM);
     value = NUM2ULL(val);
     /* set attribute */
-    oci_lc(OCIAttrSet(base->hp.ptr, base->type, &value, sizeof(value), FIX2INT(attr_type), oci8_errhp));
+    chker2(OCIAttrSet(base->hp.ptr, base->type, &value, sizeof(value), FIX2INT(attr_type), oci8_errhp), base);
     return self;
 }
 
@@ -498,7 +537,7 @@ static VALUE attr_set_sb1(VALUE self, VALUE attr_type, VALUE val)
     Check_Type(attr_type, T_FIXNUM);
     value = (sb1)check_data_range(val, CHAR_MIN, CHAR_MAX, "sb1");
     /* set attribute */
-    oci_lc(OCIAttrSet(base->hp.ptr, base->type, &value, sizeof(value), FIX2INT(attr_type), oci8_errhp));
+    chker2(OCIAttrSet(base->hp.ptr, base->type, &value, sizeof(value), FIX2INT(attr_type), oci8_errhp), base);
     return self;
 }
 
@@ -522,7 +561,7 @@ static VALUE attr_set_sb2(VALUE self, VALUE attr_type, VALUE val)
     Check_Type(attr_type, T_FIXNUM);
     value = (sb2)check_data_range(val, SHRT_MIN, SHRT_MAX, "sb2");
     /* set attribute */
-    oci_lc(OCIAttrSet(base->hp.ptr, base->type, &value, sizeof(value), FIX2INT(attr_type), oci8_errhp));
+    chker2(OCIAttrSet(base->hp.ptr, base->type, &value, sizeof(value), FIX2INT(attr_type), oci8_errhp), base);
     return self;
 }
 
@@ -546,7 +585,7 @@ static VALUE attr_set_sb4(VALUE self, VALUE attr_type, VALUE val)
     Check_Type(attr_type, T_FIXNUM);
     value = NUM2INT(val);
     /* set attribute */
-    oci_lc(OCIAttrSet(base->hp.ptr, base->type, &value, sizeof(value), FIX2INT(attr_type), oci8_errhp));
+    chker2(OCIAttrSet(base->hp.ptr, base->type, &value, sizeof(value), FIX2INT(attr_type), oci8_errhp), base);
     return self;
 }
 
@@ -570,7 +609,7 @@ static VALUE attr_set_sb8(VALUE self, VALUE attr_type, VALUE val)
     Check_Type(attr_type, T_FIXNUM);
     value = NUM2LL(val);
     /* set attribute */
-    oci_lc(OCIAttrSet(base->hp.ptr, base->type, &value, sizeof(value), FIX2INT(attr_type), oci8_errhp));
+    chker2(OCIAttrSet(base->hp.ptr, base->type, &value, sizeof(value), FIX2INT(attr_type), oci8_errhp), base);
     return self;
 }
 
@@ -594,7 +633,7 @@ static VALUE attr_set_boolean(VALUE self, VALUE attr_type, VALUE val)
     Check_Type(attr_type, T_FIXNUM);
     value = RTEST(val) ? TRUE : FALSE;
     /* set attribute */
-    oci_lc(OCIAttrSet(base->hp.ptr, base->type, &value, sizeof(value), FIX2INT(attr_type), oci8_errhp));
+    chker2(OCIAttrSet(base->hp.ptr, base->type, &value, sizeof(value), FIX2INT(attr_type), oci8_errhp), base);
     return self;
 }
 
@@ -616,7 +655,7 @@ static VALUE attr_set_string(VALUE self, VALUE attr_type, VALUE val)
     Check_Type(attr_type, T_FIXNUM);
     OCI8SafeStringValue(val);
     /* set attribute */
-    oci_lc(OCIAttrSet(base->hp.ptr, base->type, RSTRING_PTR(val), RSTRING_LEN(val), FIX2INT(attr_type), oci8_errhp));
+    chker2(OCIAttrSet(base->hp.ptr, base->type, RSTRING_PTR(val), RSTRING_LEN(val), FIX2INT(attr_type), oci8_errhp), base);
     return self;
 }
 
@@ -636,7 +675,7 @@ static VALUE attr_set_binary(VALUE self, VALUE attr_type, VALUE val)
     Check_Type(attr_type, T_FIXNUM);
     SafeStringValue(val);
     /* set attribute */
-    oci_lc(OCIAttrSet(base->hp.ptr, base->type, RSTRING_PTR(val), RSTRING_LEN(val), FIX2INT(attr_type), oci8_errhp));
+    chker2(OCIAttrSet(base->hp.ptr, base->type, RSTRING_PTR(val), RSTRING_LEN(val), FIX2INT(attr_type), oci8_errhp), base);
     return self;
 }
 
@@ -659,7 +698,7 @@ static VALUE attr_set_integer(VALUE self, VALUE attr_type, VALUE val)
     Check_Type(attr_type, T_FIXNUM);
     oci8_set_integer(&value, val, oci8_errhp);
     /* set attribute */
-    oci_lc(OCIAttrSet(base->hp.ptr, base->type, &value, sizeof(value), FIX2INT(attr_type), oci8_errhp));
+    chker2(OCIAttrSet(base->hp.ptr, base->type, &value, sizeof(value), FIX2INT(attr_type), oci8_errhp), base);
     return self;
 }
 
@@ -672,13 +711,14 @@ void Init_oci8_handle(void)
      *
      * OCIHandle is the abstract base class of OCI handles and
      * OCI descriptors; opaque data types of Oracle Call Interface.
+     * Don't use constants and methods defined in the class.
      */
     oci8_cOCIHandle = rb_define_class("OCIHandle", rb_cObject);
     rb_define_alloc_func(oci8_cOCIHandle, oci8_s_allocate);
     rb_define_method_nodoc(oci8_cOCIHandle, "initialize", oci8_handle_initialize, 0);
     rb_define_private_method(oci8_cOCIHandle, "free", oci8_handle_free, 0);
-    obj = Data_Wrap_Struct(rb_cObject, 0, 0, &oci8_base_class);
-    rb_ivar_set(oci8_cOCIHandle, oci8_id_oci8_class, obj);
+    obj = Data_Wrap_Struct(rb_cObject, 0, 0, &oci8_base_vtable);
+    rb_ivar_set(oci8_cOCIHandle, oci8_id_oci8_vtable, obj);
 
     /* methods to get attributes */
     rb_define_private_method(oci8_cOCIHandle, "attr_get_ub1", attr_get_ub1, 1);
@@ -693,6 +733,7 @@ void Init_oci8_handle(void)
     rb_define_private_method(oci8_cOCIHandle, "attr_get_string", attr_get_string, 1);
     rb_define_private_method(oci8_cOCIHandle, "attr_get_binary", attr_get_binary, 1);
     rb_define_private_method(oci8_cOCIHandle, "attr_get_integer", attr_get_integer, 1);
+    rb_define_private_method(oci8_cOCIHandle, "attr_get_oradate", attr_get_oradate, 1);
 
     /* methods to set attributes */
     rb_define_private_method(oci8_cOCIHandle, "attr_set_ub1", attr_set_ub1, 2);