ruby-oci8 2.1.7 → 2.1.8

data/ext/oci8/metadata.c

@@ -2,7 +2,7 @@
 /*
  * metadata.c
  *
- * Copyright (C) 2006-2009 KUBO Takehiro <kubo@jiubao.org>
+ * Copyright (C) 2006-2015 Kubo Takehiro <kubo@jiubao.org>
  *
  * implement private methods of classes in OCI8::Metadata module.
  *
@@ -11,11 +11,13 @@
 #include "oci8.h"
 
 static VALUE mOCI8Metadata;
-VALUE cOCI8MetadataBase;
+static VALUE cOCI8MetadataBase;
 static VALUE ptype_to_class;
 static VALUE class_to_ptype;
 static ID id_at_obj_link;
 
+#define TO_METADATA(obj) ((oci8_metadata_t *)oci8_check_typeddata((obj), &oci8_metadata_base_data_type, 1))
+
 typedef struct {
     oci8_base_t base;
     VALUE svc;
@@ -35,17 +37,32 @@ static void oci8_metadata_free(oci8_base_t *base)
     base->type = 0; /* to prevent OCIDescriptorFree */
 }
 
+const oci8_handle_data_type_t oci8_metadata_base_data_type = {
+    {
+        "OCI8::Metadata::Base",
+        {
+            (RUBY_DATA_FUNC)oci8_metadata_mark,
+            oci8_handle_cleanup,
+            oci8_handle_size,
+        },
+        &oci8_handle_data_type.rb_data_type, NULL,
+#ifdef RUBY_TYPED_WB_PROTECTED
+        RUBY_TYPED_WB_PROTECTED,
+#endif
+    },
+    oci8_metadata_free,
+    sizeof(oci8_metadata_t),
+};
+
 VALUE oci8_metadata_create(OCIParam *parmhp, VALUE svc, VALUE parent)
 {
     oci8_metadata_t *md;
-    oci8_base_t *p;
+    oci8_base_t *p = oci8_check_typeddata(parent, &oci8_handle_data_type, 1);
     ub1 ptype;
     ub4 size;
     VALUE klass;
     VALUE obj;
 
-    p = oci8_get_handle(parent, oci8_cOCIHandle);
-
     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))
@@ -54,10 +71,10 @@ VALUE oci8_metadata_create(OCIParam *parmhp, VALUE svc, VALUE parent)
     if (!RTEST(rb_obj_is_kind_of(obj, cOCI8MetadataBase))) {
         rb_raise(rb_eRuntimeError, "invalid class in PTYPE_TO_CLASS");
     }
-    md = DATA_PTR(obj);
+    md = TO_METADATA(obj);
     md->base.type = OCI_DTYPE_PARAM;
     md->base.hp.prm = parmhp;
-    md->svc = svc;
+    RB_OBJ_WRITE(obj, &md->svc, svc);
 
     if (p->type == OCI_HTYPE_STMT) {
         md->is_implicit = 1;
@@ -65,6 +82,7 @@ VALUE oci8_metadata_create(OCIParam *parmhp, VALUE svc, VALUE parent)
         md->is_implicit = 0;
     }
     oci8_link_to_parent(&md->base, p);
+    RB_OBJ_WRITTEN(obj, Qundef, p->self);
     return obj;
 }
 
@@ -87,7 +105,7 @@ static VALUE metadata_s_register_ptype(VALUE klass, VALUE ptype)
  */
 static VALUE metadata_get_param(VALUE self, VALUE idx)
 {
-    oci8_metadata_t *md = DATA_PTR(self);
+    oci8_metadata_t *md = TO_METADATA(self);
     oci8_svcctx_t *svcctx = oci8_get_svcctx(md->svc);
     OCIParam *value;
     ub4 size = sizeof(value);
@@ -107,7 +125,7 @@ static VALUE metadata_get_param(VALUE self, VALUE idx)
 
 static VALUE metadata_get_param_at(VALUE self, VALUE idx)
 {
-    oci8_metadata_t *md = DATA_PTR(self);
+    oci8_metadata_t *md = TO_METADATA(self);
     OCIParam *value;
 
     chker2(OCIParamGet(md->base.hp.ptr, md->base.type, oci8_errhp, (dvoid *)&value, FIX2INT(idx)),
@@ -117,19 +135,19 @@ static VALUE metadata_get_param_at(VALUE self, VALUE idx)
 
 static VALUE metadata_get_con(VALUE self)
 {
-    oci8_metadata_t *md = DATA_PTR(self);
+    oci8_metadata_t *md = TO_METADATA(self);
     return md->svc;
 }
 
 static VALUE metadata_is_implicit_p(VALUE self)
 {
-    oci8_metadata_t *md = DATA_PTR(self);
+    oci8_metadata_t *md = TO_METADATA(self);
     return md->is_implicit ? Qtrue : Qfalse;
 }
 
 static VALUE oci8_do_describe(VALUE self, void *objptr, ub4 objlen, ub1 objtype, VALUE klass, VALUE check_public)
 {
-    oci8_svcctx_t *svcctx = DATA_PTR(self);
+    oci8_svcctx_t *svcctx = oci8_get_svcctx(self);
     OCIParam *parmhp;
     VALUE type;
     VALUE obj;
@@ -165,12 +183,12 @@ static VALUE oci8_do_describe(VALUE self, void *objptr, ub4 objlen, ub1 objtype,
  * call-seq:
  *   __describe(name, klass, check_public)
  *
- * @param [String] name  object name
- * @param [subclass of OCI8::Metadata::Base] klass
- * @param [Boolean] check_public  +true+ to look up the object as a public synonym when
- *                                the object does not exist in the current schema and
- *                                the name includes no dots.
- * @return [subclass of OCI8::Metadata::Base]
+ *  @param [String] name  object name
+ *  @param [subclass of OCI8::Metadata::Base] klass
+ *  @param [Boolean] check_public  +true+ to look up the object as a public synonym when
+ *                                 the object does not exist in the current schema and
+ *                                 the name includes no dots.
+ *  @return [subclass of OCI8::Metadata::Base]
  *
  * @private
  */
@@ -200,7 +218,7 @@ static VALUE oci8_describe(VALUE self, VALUE name, VALUE klass, VALUE check_publ
 
 static VALUE metadata_get_type_metadata(VALUE self, VALUE klass)
 {
-    oci8_metadata_t *md = DATA_PTR(self);
+    oci8_metadata_t *md = TO_METADATA(self);
     oci8_svcctx_t *svcctx = oci8_get_svcctx(md->svc);
     OCIRef *ref = NULL;
 
@@ -212,7 +230,7 @@ static VALUE metadata_get_type_metadata(VALUE self, VALUE klass)
 
 static VALUE metadata_get_tdo_id(VALUE self)
 {
-    oci8_metadata_t *md = DATA_PTR(self);
+    oci8_metadata_t *md = TO_METADATA(self);
     oci8_svcctx_t *svcctx = oci8_get_svcctx(md->svc);
     OCIRef *tdo_ref = NULL;
     void *tdo;
@@ -232,16 +250,15 @@ static VALUE metadata_get_tdo_id(VALUE self)
 #endif
 }
 
-oci8_base_vtable_t oci8_metadata_vtable = {
-    oci8_metadata_mark,
-    oci8_metadata_free,
-    sizeof(oci8_metadata_t),
-};
+static VALUE oci8_metadata_alloc(VALUE klass)
+{
+    return oci8_allocate_typeddata(klass, &oci8_metadata_base_data_type);
+}
 
 void Init_oci8_metadata(VALUE cOCI8)
 {
     mOCI8Metadata = rb_define_module_under(cOCI8, "Metadata");
-    cOCI8MetadataBase = oci8_define_class_under(mOCI8Metadata, "Base", &oci8_metadata_vtable);
+    cOCI8MetadataBase = oci8_define_class_under(mOCI8Metadata, "Base", &oci8_metadata_base_data_type, oci8_metadata_alloc);
     ptype_to_class = rb_hash_new();
     class_to_ptype = rb_hash_new();
     rb_global_variable(&ptype_to_class);

data/ext/oci8/object.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- * Copyright (C) 2002-2013 Kubo Takehiro <kubo@jiubao.org>
+ * Copyright (C) 2002-2014 Kubo Takehiro <kubo@jiubao.org>
  */
 
 /*
@@ -23,6 +23,9 @@ static VALUE cOCI8BindNamedType;
 static ID id_to_value;
 static ID id_set_attributes;
 
+#define TO_TDO(obj) ((oci8_base_t *)oci8_check_typeddata((obj), &oci8_tdo_data_type, 1))
+#define CHECK_TDO(obj) ((void)oci8_check_typeddata((obj), &oci8_tdo_data_type, 1))
+
 typedef struct {
     oci8_base_t base;
     VALUE tdo;
@@ -66,16 +69,30 @@ static void oci8_tdo_free(oci8_base_t *base)
     }
 }
 
+static const oci8_handle_data_type_t oci8_tdo_data_type = {
+    {
+        "OCI8::TDO",
+        {
+            (RUBY_DATA_FUNC)oci8_tdo_mark,
+            oci8_handle_cleanup,
+            oci8_handle_size,
+        },
+        &oci8_handle_data_type.rb_data_type, NULL,
+#ifdef RUBY_TYPED_WB_PROTECTED
+        RUBY_TYPED_WB_PROTECTED,
+#endif
+    },
+    oci8_tdo_free,
+    sizeof(oci8_base_t)
+};
+
 static VALUE oci8_tdo_setup(VALUE self, VALUE svc, VALUE md_obj)
 {
-    oci8_base_t *tdo = DATA_PTR(self);
+    oci8_base_t *tdo = TO_TDO(self);
     oci8_svcctx_t *svcctx = oci8_get_svcctx(svc);
-    oci8_base_t *md;
+    oci8_base_t *md = oci8_check_typeddata(md_obj, &oci8_metadata_base_data_type, 1);
     OCIRef *tdo_ref = NULL;
 
-    Check_Object(md_obj, cOCI8MetadataBase);
-    md = DATA_PTR(md_obj);
-
     if (tdo->hp.tdo != NULL) {
         OCIObjectUnpin(oci8_envhp, oci8_errhp, tdo->hp.tdo);
         tdo->hp.tdo = NULL;
@@ -87,14 +104,14 @@ static VALUE oci8_tdo_setup(VALUE self, VALUE svc, VALUE md_obj)
     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);
+    RB_OBJ_WRITTEN(self, Qundef, svc);
     return self;
 }
 
-static oci8_base_vtable_t oci8_tdo_vtable = {
-    oci8_tdo_mark,
-    oci8_tdo_free,
-    sizeof(oci8_base_t)
-};
+static VALUE oci8_tdo_alloc(VALUE klass)
+{
+    return oci8_allocate_typeddata(klass, &oci8_tdo_data_type);
+}
 
 static void oci8_named_type_mark(oci8_base_t *base)
 {
@@ -181,28 +198,32 @@ static VALUE get_attribute(VALUE self, VALUE datatype, VALUE typeinfo, void *dat
     case ATTR_BINARY_FLOAT:
         return rb_float_new((double)*(float*)data);
     case ATTR_NAMED_TYPE:
-        Check_Object(typeinfo, cOCI8TDO);
+        CHECK_TDO(typeinfo);
         /* Be carefull. Don't use *tmp_obj* out of this function. */
         tmp_obj = rb_class_new_instance(0, NULL, cOCI8NamedType);
         obj = DATA_PTR(tmp_obj);
-        obj->tdo = typeinfo;
+        RB_OBJ_WRITE(tmp_obj, &obj->tdo, typeinfo);
         obj->instancep = (char**)&data;
         obj->null_structp = (char**)&ind;
         oci8_link_to_parent(&obj->base, DATA_PTR(self));
+        RB_OBJ_WRITTEN(tmp_obj, Qundef, self);
         rv = rb_funcall(tmp_obj, id_to_value, 0);
         oci8_unlink_from_parent(&obj->base);
+        RB_OBJ_WRITTEN(tmp_obj, self, Qundef);
         return rv;
     case ATTR_NAMED_COLLECTION:
-        Check_Object(typeinfo, cOCI8TDO);
+        CHECK_TDO(typeinfo);
         /* Be carefull. Don't use *tmp_obj* out of this function. */
         tmp_obj = rb_class_new_instance(0, NULL, cOCI8NamedCollection);
         obj = DATA_PTR(tmp_obj);
-        obj->tdo = typeinfo;
+        RB_OBJ_WRITE(tmp_obj, &obj->tdo, typeinfo);
         obj->instancep = (char**)data;
         obj->null_structp = (char**)&ind;
         oci8_link_to_parent(&obj->base, DATA_PTR(self));
+        RB_OBJ_WRITTEN(tmp_obj, Qundef, self);
         rv = rb_funcall(tmp_obj, id_to_value, 0);
         oci8_unlink_from_parent(&obj->base);
+        RB_OBJ_WRITTEN(tmp_obj, self, Qundef);
         return rv;
     case ATTR_CLOB:
         return oci8_make_clob(oci8_get_svcctx(typeinfo), *(OCILobLocator**)data);
@@ -359,16 +380,14 @@ static VALUE oci8_named_coll_set_coll_element(VALUE self, VALUE datatype, VALUE
         cb_data.indp = &cb_data.ind;
         break;
     case ATTR_NAMED_TYPE:
-        Check_Object(typeinfo, cOCI8TDO);
-        tdo = DATA_PTR(typeinfo);
+        tdo = TO_TDO(typeinfo);
         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);
+        tdo = TO_TDO(typeinfo);
         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),
@@ -411,10 +430,10 @@ static VALUE set_coll_element_func(set_coll_element_cb_data_t *cb_data)
     for (idx = 0; idx < RARRAY_LEN(val); idx++) {
         switch (FIX2INT(datatype)) {
         case ATTR_NAMED_TYPE:
-            set_attribute(self, datatype, typeinfo, cb_data->data.ptr, cb_data->indp, RARRAY_PTR(val)[idx]);
+            set_attribute(self, datatype, typeinfo, cb_data->data.ptr, cb_data->indp, RARRAY_AREF(val, idx));
             break;
         default:
-            set_attribute(self, datatype, typeinfo, (void*)&cb_data->data, cb_data->indp, RARRAY_PTR(val)[idx]);
+            set_attribute(self, datatype, typeinfo, (void*)&cb_data->data, cb_data->indp, RARRAY_AREF(val, idx));
             break;
         }
         switch (FIX2INT(datatype)) {
@@ -504,28 +523,32 @@ static void set_attribute(VALUE self, VALUE datatype, VALUE typeinfo, void *data
         *(float*)data = (float)NUM2DBL(val);
         break;
     case ATTR_NAMED_TYPE:
-        Check_Object(typeinfo, cOCI8TDO);
+        CHECK_TDO(typeinfo);
         /* Be carefull. Don't use *tmp_obj* out of this function. */
         tmp_obj = rb_class_new_instance(0, NULL, cOCI8NamedType);
         obj = DATA_PTR(tmp_obj);
-        obj->tdo = typeinfo;
+        RB_OBJ_WRITE(tmp_obj, &obj->tdo, typeinfo);
         obj->instancep = (char**)&data;
         obj->null_structp = (char**)&ind;
         oci8_link_to_parent(&obj->base, DATA_PTR(self));
+        RB_OBJ_WRITTEN(tmp_obj, Qundef, self);
         rb_funcall(tmp_obj, id_set_attributes, 1, val);
         oci8_unlink_from_parent(&obj->base);
+        RB_OBJ_WRITTEN(tmp_obj, self, Qundef);
         break;
     case ATTR_NAMED_COLLECTION:
-        Check_Object(typeinfo, cOCI8TDO);
+        CHECK_TDO(typeinfo);
         /* Be carefull. Don't use *tmp_obj* out of this function. */
         tmp_obj = rb_class_new_instance(0, NULL, cOCI8NamedCollection);
         obj = DATA_PTR(tmp_obj);
-        obj->tdo = typeinfo;
+        RB_OBJ_WRITE(tmp_obj, &obj->tdo, typeinfo);
         obj->instancep = (char**)data;
         obj->null_structp = (char**)&ind;
         oci8_link_to_parent(&obj->base, DATA_PTR(self));
+        RB_OBJ_WRITTEN(tmp_obj, Qundef, self);
         rb_funcall(tmp_obj, id_set_attributes, 1, val);
         oci8_unlink_from_parent(&obj->base);
+        RB_OBJ_WRITTEN(tmp_obj, self, Qundef);
         break;
     case ATTR_CLOB:
         oci8_assign_clob(oci8_get_svcctx(typeinfo), val, (OCILobLocator **)data);
@@ -545,12 +568,50 @@ static void set_attribute(VALUE self, VALUE datatype, VALUE typeinfo, void *data
     *ind = 0;
 }
 
-static oci8_base_vtable_t oci8_named_type_vtable = {
-    oci8_named_type_mark,
+static const oci8_handle_data_type_t oci8_named_type_data_type = {
+    {
+        "OCI8::NamedType",
+        {
+            (RUBY_DATA_FUNC)oci8_named_type_mark,
+            oci8_handle_cleanup,
+            oci8_handle_size,
+        },
+        &oci8_handle_data_type.rb_data_type, NULL,
+#ifdef RUBY_TYPED_WB_PROTECTED
+        RUBY_TYPED_WB_PROTECTED,
+#endif
+    },
+    oci8_named_type_free,
+    sizeof(oci8_named_type_t)
+};
+
+static const oci8_handle_data_type_t oci8_named_collection_data_type = {
+    {
+        "OCI8::NamedCollection",
+        {
+            (RUBY_DATA_FUNC)oci8_named_type_mark,
+            oci8_handle_cleanup,
+            oci8_handle_size,
+        },
+        &oci8_handle_data_type.rb_data_type, NULL,
+#ifdef RUBY_TYPED_WB_PROTECTED
+        RUBY_TYPED_WB_PROTECTED,
+#endif
+    },
     oci8_named_type_free,
     sizeof(oci8_named_type_t)
 };
 
+static VALUE oci8_named_type_alloc(VALUE klass)
+{
+    return oci8_allocate_typeddata(klass, &oci8_named_type_data_type);
+}
+
+static VALUE oci8_named_collection_alloc(VALUE klass)
+{
+    return oci8_allocate_typeddata(klass, &oci8_named_collection_data_type);
+}
+
 static void bind_named_type_mark(oci8_base_t *base)
 {
     oci8_bind_t *obind = (oci8_bind_t *)base;
@@ -602,8 +663,8 @@ static void bind_named_type_init(oci8_bind_t *obind, VALUE svc, VALUE val, VALUE
     obind->value_sz = sizeof(void*);
     obind->alloc_sz = sizeof(oci8_hp_obj_t);
 
-    Check_Object(tdo_obj, cOCI8TDO);
-    obind->tdo = tdo_obj;
+    CHECK_TDO(tdo_obj);
+    RB_OBJ_WRITE(obind->base.self, &obind->tdo, tdo_obj);
 }
 
 static void bind_named_type_init_elem(oci8_bind_t *obind, VALUE svc)
@@ -627,11 +688,13 @@ static void bind_named_type_init_elem(oci8_bind_t *obind, VALUE svc)
     svcctx = oci8_get_svcctx(svc);
     do {
         oho[idx].obj = rb_class_new_instance(0, NULL, klass);
+        RB_OBJ_WRITTEN(obind->base.self, Qundef, oho[idx].obj);
         obj = DATA_PTR(oho[idx].obj);
-        obj->tdo = obind->tdo;
+        RB_OBJ_WRITE(oho[idx].obj, &obj->tdo, obind->tdo);
         obj->instancep = (char**)&oho[idx].hp;
         obj->null_structp = (char**)&obind->u.null_structs[idx];
         oci8_link_to_parent(&obj->base, &obind->base);
+        RB_OBJ_WRITTEN(oho[idx].obj, Qundef, obind->base.self);
 
         chker2(OCIObjectNew(oci8_envhp, oci8_errhp, svcctx->base.hp.svc, tc, tdo->hp.tdo, NULL, OCI_DURATION_SESSION, TRUE, (dvoid**)obj->instancep),
                &svcctx->base);
@@ -658,9 +721,20 @@ static void bind_name_type_post_bind_hook(oci8_bind_t *obind)
     }
 }
 
-static const oci8_bind_vtable_t bind_named_type_vtable = {
+static const oci8_bind_data_type_t bind_named_type_data_type = {
     {
-        bind_named_type_mark,
+        {
+            "OCI8::BindType::NamedType",
+            {
+                (RUBY_DATA_FUNC)bind_named_type_mark,
+                oci8_handle_cleanup,
+                oci8_handle_size,
+            },
+            &oci8_bind_data_type.rb_data_type, NULL,
+#ifdef RUBY_TYPED_WB_PROTECTED
+            RUBY_TYPED_WB_PROTECTED,
+#endif
+        },
         bind_named_type_free,
         sizeof(oci8_bind_t)
     },
@@ -673,13 +747,18 @@ static const oci8_bind_vtable_t bind_named_type_vtable = {
     bind_name_type_post_bind_hook,
 };
 
+static VALUE bind_named_type_alloc(VALUE klass)
+{
+    return oci8_allocate_typeddata(klass, &bind_named_type_data_type.base);
+}
+
 void Init_oci_object(VALUE cOCI8)
 {
     id_to_value = rb_intern("to_value");
     id_set_attributes = rb_intern("attributes=");
 
     /* OCI8::TDO */
-    cOCI8TDO = oci8_define_class_under(cOCI8, "TDO", &oci8_tdo_vtable);
+    cOCI8TDO = oci8_define_class_under(cOCI8, "TDO", &oci8_tdo_data_type, oci8_tdo_alloc);
     rb_define_private_method(cOCI8TDO, "setup", oci8_tdo_setup, 2);
     /* @private */
     rb_define_const(cOCI8TDO, "ATTR_STRING", INT2FIX(ATTR_STRING));
@@ -732,7 +811,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_vtable);
+    cOCI8NamedType = oci8_define_class_under(cOCI8, "NamedType", &oci8_named_type_data_type, oci8_named_type_alloc);
     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);
@@ -741,12 +820,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_vtable);
+    cOCI8NamedCollection = oci8_define_class_under(cOCI8, "NamedCollection", &oci8_named_collection_data_type, oci8_named_collection_alloc);
     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_vtable);
+    cOCI8BindNamedType = oci8_define_bind_class("NamedType", &bind_named_type_data_type, bind_named_type_alloc);
 }