ruby-oci8 1.0.7 → 2.0.0

data/ext/oci8/oci8.h

@@ -1,14 +1,13 @@
+/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
   oci8.h - part of ruby-oci8
 
-  Copyright (C) 2002-2006 KUBO Takehiro <kubo@jiubao.org>
+  Copyright (C) 2002-2009 KUBO Takehiro <kubo@jiubao.org>
 */
 #ifndef _RUBY_OCI_H_
 #define _RUBY_OCI_H_ 1
 
 #include "ruby.h"
-#include "rubyio.h"
-#include "intern.h"
 
 #ifndef rb_pid_t
 #ifdef WIN32
@@ -20,31 +19,49 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <assert.h>
+
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 #include <oci.h>
 #ifdef __cplusplus
 }
 #endif
+#ifdef HAVE_XMLOTN_H
+#include "xmlotn.h"
+#endif
+
+#define ORAVERNUM(major, minor, update, patch, port_update) \
+    (((major) << 24) | ((minor) << 20) | ((update) << 12) | ((patch) << 8) | (port_update))
+
+#define ORAVER_8_0 ORAVERNUM(8, 0, 0, 0, 0)
+#define ORAVER_8_1 ORAVERNUM(8, 1, 0, 0, 0)
+#define ORAVER_9_0 ORAVERNUM(9, 0, 0, 0, 0)
+#define ORAVER_9_2 ORAVERNUM(9, 2, 0, 0, 0)
+#define ORAVER_10_1 ORAVERNUM(10, 1, 0, 0, 0)
+#define ORAVER_10_2 ORAVERNUM(10, 2, 0, 0, 0)
+#define ORAVER_11_1 ORAVERNUM(11, 1, 0, 0, 0)
+
 #include "extconf.h"
+#ifdef HAVE_TYPE_RB_ENCODING
+#include <ruby/encoding.h>
+#endif
 
-#ifdef StringValue
-/* ruby 1.8 or later */
-#define RBOCI_NORETURN(x) NORETURN(x)
-#else
-/* ruby 1.6 */
-#define RBOCI_NORETURN(x) x NORETURN
-#define rb_cstr_to_dbl(p, ignore) strtod((p), 0)
+#if ACTUAL_ORACLE_CLIENT_VERSION < ORAVER_10_2
+typedef struct OCIAdmin OCIAdmin;
 #endif
 
+/* new macros in ruby 1.8.6.
+ * define compatible macros for ruby 1.8.5 or lower.
+ */
 #ifndef RSTRING_PTR
 #define RSTRING_PTR(obj) RSTRING(obj)->ptr
 #endif
 #ifndef RSTRING_LEN
 #define RSTRING_LEN(obj) RSTRING(obj)->len
 #endif
-
 #ifndef RARRAY_PTR
 #define RARRAY_PTR(obj) RARRAY(obj)->ptr
 #endif
@@ -52,16 +69,49 @@ extern "C" {
 #define RARRAY_LEN(obj) RARRAY(obj)->len
 #endif
 
-#ifndef RB_GC_GUARD
-#define RB_GC_GUARD(v) (*(volatile VALUE *)&(v))
+/* new macros in ruby 1.9.
+ * define compatible macros for ruby 1.8 or lower.
+ */
+#ifndef RCLASS_SUPER
+#define RCLASS_SUPER(c) RCLASS(c)->super
+#endif
+#ifndef RFLOAT_VALUE
+#define RFLOAT_VALUE(obj) RFLOAT(obj)->value
 #endif
 
-#ifndef HAVE_TYPE_ORATEXT
-typedef unsigned char oratext;
+/* new functions in ruby 1.9.
+ * define compatible macros for ruby 1.8 or lower.
+ */
+#if !defined(HAVE_RB_ERRINFO) && defined(HAVE_RUBY_ERRINFO)
+#define rb_errinfo() ruby_errinfo
+#endif
+#ifndef RUBY_VM
+typedef VALUE rb_blocking_function_t(void *);
 #endif
 
-#define IS_OCI_ERROR(v) (((v) != OCI_SUCCESS) && ((v) != OCI_SUCCESS_WITH_INFO))
+#ifndef HAVE_TYPE_RB_ENCODING
+#define rb_enc_associate(str, enc) do {} while(0)
+#define rb_external_str_new_with_enc(ptr, len, enc) rb_tainted_str_new((ptr), (len))
+#define rb_locale_str_new_cstr(ptr)  rb_str_new2(ptr)
+#define rb_str_conv_enc(str, from, to) (str)
+#define rb_usascii_str_new(ptr, len) rb_str_new((ptr), (len))
+#define rb_usascii_str_new_cstr(ptr) rb_str_new2(ptr)
+#endif
 
+/* macros depends on the compiler.
+ *  LIKELY(x)      hint for the compiler that 'x' is 1(TRUE) in many cases.
+ *  UNLIKELY(x)    hint for the compiler that 'x' is 0(FALSE) in many cases.
+ *  ALWAYS_INLINE  forcely inline the function.
+ */
+#if defined(__GNUC__) && ((__GNUC__ > 2) || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96))
+/* gcc version >= 2.96 */
+#define LIKELY(x)   (__builtin_expect((x), 1))
+#define UNLIKELY(x) (__builtin_expect((x), 0))
+#else
+/* other compilers */
+#define LIKELY(x)   (x)
+#define UNLIKELY(x) (x)
+#endif
 #if defined(__GNUC__) && ((__GNUC__ > 3) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1))
 /* gcc version >= 3.1 */
 #define ALWAYS_INLINE inline __attribute__((always_inline))
@@ -71,294 +121,340 @@ typedef unsigned char oratext;
 #define ALWAYS_INLINE __forceinline
 #endif
 
-#ifdef ALWAYS_INLINE
-/*
- * I don't like cast because it can suppress warnings but may hide bugs.
- * These macros make warnings when the source type is invalid.
+/* macros to access thread-local storage.
+ *
+ *  int oci8_tls_key_init(oci8_tls_key_t *key);
+ *    initialie a key to access thread-local storege
+ *    This returns 0 on success or error number.
+ *
+ *  void *oci8_tls_get(oci8_tls_key_t key);
+ *    get a value associated with the key.
+ *
+ *  void oci8_tls_set(oci8_tls_key_t key, void *value);
+ *    set a value to the key.
+ *
+ */
+#ifdef RUBY_VM
+/* ruby 1.9 */
+#if defined(_WIN32)
+#include <windows.h>
+#define oci8_tls_key_t           DWORD
+#define oci8_tls_key_init(key_p) \
+    ((*(key_p) = TlsAlloc()), \
+    (*(key_p) == 0xFFFFFFFF) ? GetLastError() : 0)
+#define oci8_tls_get(key)        TlsGetValue(key)
+#define oci8_tls_set(key, val)   TlsSetValue((key), (val))
+#elif defined(HAVE_PTHREAD_H)
+#include <pthread.h>
+#define oci8_tls_key_t           pthread_key_t
+#define oci8_tls_key_init(key_p) pthread_key_create((key_p), NULL)
+#define oci8_tls_get(key)        pthread_getspecific(key)
+#define oci8_tls_set(key, val)   pthread_setspecific((key), (val))
+#else
+#error unsupported thread API
+#endif
+#endif /* RUBY_VM */
+
+/* utility macros
  */
+#define IS_OCI_ERROR(v) (((v) != OCI_SUCCESS) && ((v) != OCI_SUCCESS_WITH_INFO))
+#ifdef ALWAYS_INLINE
 #define TO_ORATEXT to_oratext
 #define TO_CHARPTR to_charptr
 static ALWAYS_INLINE OraText *to_oratext(char *c)
 {
-  return (OraText*)c;
+    return (OraText*)c;
 }
 static ALWAYS_INLINE char *to_charptr(OraText *c)
 {
-  return (char*)c;
+    return (char*)c;
 }
 #else
-/* if not gcc, use normal cast. */
 #define TO_ORATEXT(c) ((OraText*)(c))
 #define TO_CHARPTR(c) ((char*)(c))
 #endif
 #define RSTRING_ORATEXT(obj) TO_ORATEXT(RSTRING_PTR(obj))
+#define rb_str_new2_ora(str) rb_str_new2(TO_CHARPTR(str))
 
-enum oci8_bind_type {
-  BIND_STRING,
-  BIND_FIXNUM,
-  BIND_INTEGER_VIA_ORA_NUMBER,
-  BIND_TIME_VIA_ORA_DATE,
-  BIND_FLOAT,
-  BIND_BINARY_DOUBLE,
-  BIND_ORA_DATE,
-  BIND_ORA_NUMBER,
-  BIND_HANDLE
-};
+/*
+ * prevent rdoc from gathering the specified method.
+ */
+#define rb_define_method_nodoc rb_define_method
+#define rb_define_singleton_method_nodoc rb_define_singleton_method
 
-/* OraDate - Internal format of DATE */
-struct ora_date {
-  unsigned char century;
-  unsigned char year;
-  unsigned char month;
-  unsigned char day;
-  unsigned char hour;
-  unsigned char minute;
-  unsigned char second;
-};
-typedef struct ora_date ora_date_t;
+/* data structure for SQLT_LVC and SQLT_LVB. */
+typedef struct {
+    sb4 size;
+    char buf[1];
+} oci8_vstr_t;
 
-/* Member of ora_vnumber_t and ora_bind_handle_t - Internal format of NUMBER */
-struct ora_number {
-  unsigned char exponent;
-  unsigned char mantissa[20];
-};
-typedef struct ora_number ora_number_t;
+typedef struct oci8_base_class oci8_base_class_t;
+typedef struct oci8_bind_class oci8_bind_class_t;
 
-/* OraNumber - Internal format of VARNUM */
-struct ora_vnumber {
-  unsigned char size;
-  struct ora_number num;
+typedef struct oci8_base oci8_base_t;
+typedef struct oci8_bind oci8_bind_t;
+
+struct oci8_base_class {
+    void (*mark)(oci8_base_t *base);
+    void (*free)(oci8_base_t *base);
+    size_t size;
 };
-typedef struct ora_vnumber ora_vnumber_t;
-
-/* OCIEnv, OCISvcCtx, OCIServer, OCISession, OCIStmt, OCIDescribe, OCIParam */
-struct oci8_handle {
-  ub4 type;
-  dvoid *hp;
-  OCIError *errhp;
-  VALUE self;
-  struct oci8_handle *parent;
-  size_t size;
-  struct oci8_handle **children;
-  /* End of common part */
-  union {
-    struct {
-      char is_implicit;
-    } param;
-#ifndef OCI8_USE_CALLBACK_LOB_READ
-    struct {
-      int char_width;
-    } lob_locator;
-#endif
-    struct {
-      rb_pid_t pid;
-    } svcctx;
-  } u;
+
+struct oci8_bind_class {
+    oci8_base_class_t base;
+    VALUE (*get)(oci8_bind_t *obind, void *data, void *null_struct);
+    void (*set)(oci8_bind_t *obind, void *data, void **null_structp, VALUE val);
+    void (*init)(oci8_bind_t *obind, VALUE svc, VALUE val, VALUE length);
+    void (*init_elem)(oci8_bind_t *obind, VALUE svc);
+    ub1 (*in)(oci8_bind_t *obind, ub4 idx, ub1 piece, void **valuepp, ub4 **alenpp, void **indpp);
+    void (*out)(oci8_bind_t *obind, ub4 idx, ub1 piece, void **valuepp, ub4 **alenpp, void **indpp);
+    void (*pre_fetch_hook)(oci8_bind_t *obind, VALUE svc);
+    ub2 dty;
+    ub1 csfrm;
 };
-typedef struct oci8_handle oci8_handle_t;
-
-/* OCIBind, OCIDefine */
-struct oci8_bind_handle {
-  ub4 type;
-  dvoid *hp;
-  OCIError *errhp;
-  VALUE self;
-  struct oci8_handle *parent;
-  size_t size;
-  struct oci8_handle **children;
-  /* End of common part */
-  enum oci8_bind_type bind_type;
-  sb2 ind;
-  ub2 rlen;
-  sb4 value_sz; /* sizeof value */
-  union {
-    struct {
-      sb4 len;
-      char buf[1];
-    } str;
-    long lng;
-    double dbl;
-    ora_date_t od;
-    ora_number_t on;
-    struct {
-      void *hp;
-      VALUE v;
-      VALUE klass;
-    } handle;
-  } value;
+
+struct oci8_base {
+    ub4 type;
+    union {
+        dvoid *ptr;
+        OCISvcCtx *svc;
+        OCIStmt *stmt;
+        OCIDefine *dfn;
+        OCIBind *bnd;
+        OCIParam *prm;
+        OCILobLocator *lob;
+        OCIType *tdo;
+        OCIDescribe *dschp;
+    } hp;
+    VALUE self;
+    const oci8_base_class_t *klass;
+    oci8_base_t *parent;
+    oci8_base_t *next;
+    oci8_base_t *prev;
+    oci8_base_t *children;
 };
-typedef struct oci8_bind_handle oci8_bind_handle_t;
 
-#define Get_Handle(obj, hp) do { \
-  Data_Get_Struct(obj, oci8_handle_t, hp); \
-} while (0);
+struct oci8_bind {
+    oci8_base_t base;
+    void *valuep;
+    sb4 value_sz; /* size to define or bind. */
+    sb4 alloc_sz; /* size of a element. */
+    ub4 maxar_sz; /* maximum array size. */
+    ub4 curar_sz; /* current array size. */
+    VALUE tdo;
+    union {
+        void **null_structs;
+        sb2 *inds;
+    } u;
+};
 
-#define Check_Handle(obj, name, hp) do {\
-  if (!rb_obj_is_instance_of(obj, c##name)) { \
-    rb_raise(rb_eTypeError, "invalid argument %s (expect " #name ")", rb_class2name(CLASS_OF(obj))); \
-  } \
-  Data_Get_Struct(obj, oci8_handle_t, hp); \
+enum logon_type_t {T_NOT_LOGIN = 0, T_IMPLICIT, T_EXPLICIT};
+
+typedef struct  {
+    oci8_base_t base;
+    volatile VALUE executing_thread;
+    enum logon_type_t logon_type;
+    OCISession *authhp;
+    OCIServer *srvhp;
+    rb_pid_t pid;
+    char is_autocommit;
+#ifdef RUBY_VM
+    char non_blocking;
+#endif
+    VALUE long_read_len;
+} oci8_svcctx_t;
+
+typedef struct {
+    dvoid *hp; /* OCIBind* or OCIDefine* */
+    dvoid *valuep;
+    sb4 value_sz;
+    ub2 dty;
+    sb2 *indp;
+    ub2 *alenp;
+} oci8_exec_sql_var_t;
+
+#define Check_Handle(obj, klass, hp) do { \
+    if (!rb_obj_is_kind_of(obj, klass)) { \
+        rb_raise(rb_eTypeError, "invalid argument %s (expect %s)", rb_class2name(CLASS_OF(obj)), rb_class2name(klass)); \
+    } \
+    Data_Get_Struct(obj, oci8_base_t, hp); \
 } while (0)
 
-struct oci8_string {
-  OraText *ptr;
-  ub4 len;
-};
-typedef struct oci8_string oci8_string_t;
-
-#define Get_String(obj, s) do { \
-  if (!NIL_P(obj)) { \
-    Check_Type(obj, T_STRING); \
-    s.ptr = RSTRING_ORATEXT(obj); \
-    s.len = RSTRING_LEN(obj); \
-  } else { \
-    s.ptr = NULL; \
-    s.len = 0; \
+#define Check_Object(obj, klass) do {\
+  if (!rb_obj_is_kind_of(obj, klass)) { \
+    rb_raise(rb_eTypeError, "invalid argument %s (expect %s)", rb_class2name(CLASS_OF(obj)), rb_class2name(klass)); \
   } \
 } while (0)
 
-#define Get_Int_With_Default(argc, pos, vval, cval, def) do { \
-  if (argc >= pos) { \
-    Check_Type(vval, T_FIXNUM); \
-    cval = FIX2INT(vval); \
-  } else { \
-    cval = def; \
-  } \
-} while (0)
+#define oci8_raise(err, status, stmt) oci8_do_raise(err, status, stmt, __FILE__, __LINE__)
+#define oci8_env_raise(err, status) oci8_do_env_raise(err, status, __FILE__, __LINE__)
+#define oci8_raise_init_error() oci8_do_raise_init_error(__FILE__, __LINE__)
 
-#define ATTR_FOR_HNDL 1
-#define ATTR_FOR_DESC 2
-#define ATTR_FOR_BOTH (ATTR_FOR_HNDL | ATTR_FOR_DESC)
-struct oci8_attr {
-  const char *name;
-  ub4 attr;
-  char attr_type;
-  VALUE (*get)(oci8_handle_t *hp, ub4 attr);
-  void (*set)(oci8_handle_t *hp, ub4 attr, VALUE value);
-};
-typedef struct oci8_attr oci8_attr_t;
-
-/* Handle */
-extern VALUE cOCIHandle;
-extern VALUE cOCIEnv;
-extern VALUE cOCISvcCtx;
-extern VALUE cOCIServer;
-extern VALUE cOCISession;
-extern VALUE cOCIStmt;
-extern VALUE cOCIDefine;
-extern VALUE cOCIBind;
-extern VALUE cOCIDescribe;
-
-/* Descriptor */
-extern VALUE cOCIDescriptor;
-extern VALUE cOCILobLocator;
-extern VALUE cOCIFileLocator;
-extern VALUE cOCIParam;
-extern VALUE cOCIRowid;
-
-/* Exception */
-extern VALUE eOCIException;
-extern VALUE eOCINoData;
-extern VALUE eOCIError;
-extern VALUE eOCIInvalidHandle;
-extern VALUE eOCINeedData;
-extern VALUE eOCIStillExecuting;
-extern VALUE eOCIContinue;
-extern VALUE eOCISuccessWithInfo;
-
-/* oracle specific type */
-extern VALUE cOraDate;
-extern VALUE cOraNumber;
-
-/* const.c */
-void  Init_oci8_const(void);
-extern ID oci8_id_code;
-extern ID oci8_id_define_array;
-extern ID oci8_id_bind_hash;
-extern ID oci8_id_message;
-extern ID oci8_id_new;
-extern ID oci8_id_parse_error_offset;
-extern ID oci8_id_server;
-extern ID oci8_id_session;
-extern ID oci8_id_sql;
-
-/* handle.c */
-void  Init_oci8_handle(void);
-VALUE oci8_handle_free(VALUE self);
-void oci8_handle_cleanup(oci8_handle_t *);
-VALUE oci8_s_new(VALUE self);
-oci8_handle_t *oci8_make_handle(ub4 type, dvoid *hp, OCIError *errhp, oci8_handle_t *chp, sb4 value_sz);
-void oci8_link(oci8_handle_t *parent, oci8_handle_t *child);
-void oci8_unlink(oci8_handle_t *self);
+/* raise on error */
+#define oci_lc(rv) do { \
+    sword __rv = (rv); \
+    if (__rv != OCI_SUCCESS) { \
+        oci8_raise(oci8_errhp, __rv, NULL); \
+    } \
+} while(0)
+
+#if SIZEOF_LONG > 4
+#define UB4_TO_NUM INT2FIX
+#else
+#define UB4_TO_NUM UINT2NUM
+#endif
 
 /* env.c */
+extern OCIEnv *oci8_envhp;
+#ifdef RUBY_VM
+/* oci8_errhp is a thread local object in ruby 1.9. */
+#define oci8_errhp oci8_get_errhp()
+
+extern oci8_tls_key_t oci8_tls_key; /* native thread key */
+OCIError *oci8_make_errhp(void);
+
+static inline OCIError *oci8_get_errhp()
+{
+    OCIError *errhp = (OCIError *)oci8_tls_get(oci8_tls_key);
+    return LIKELY(errhp != NULL) ? errhp : oci8_make_errhp();
+}
+
+#else
+/* oci8_errhp is global in ruby 1.8. */
+extern OCIError *oci8_errhp;
+#endif
 void Init_oci8_env(void);
 
-/* error.c */
-void Init_oci8_error(void);
-#define oci8_raise(errhp, status, stmthp) oci8_do_raise((errhp), (status), (stmthp), __FILE__, __LINE__)
-#define oci8_env_raise(envhp, status) oci8_do_env_raise((envhp), (status), __FILE__, __LINE__)
-RBOCI_NORETURN(void oci8_do_raise(OCIError *, sword status, OCIStmt *, const char *file, int line));
-RBOCI_NORETURN(void oci8_do_env_raise(OCIEnv *, sword status, const char *file, int line));
-
-/* svcctx.c */
-void Init_oci8_svcctx(void);
-
-/* server.c */
-void Init_oci8_server(void);
-VALUE oci8_server_version(VALUE self);
-#ifdef HAVE_OCISERVERRELEASE
-VALUE oci8_server_release(VALUE self);
+/* oci8lib.c */
+extern ID oci8_id_new;
+extern ID oci8_id_get;
+extern ID oci8_id_set;
+extern ID oci8_id_keys;
+extern int oci8_in_finalizer;
+extern VALUE oci8_cOCIHandle;
+void oci8_base_free(oci8_base_t *base);
+VALUE oci8_define_class(const char *name, oci8_base_class_t *klass);
+VALUE oci8_define_class_under(VALUE outer, const char *name, oci8_base_class_t *klass);
+VALUE oci8_define_bind_class(const char *name, const oci8_bind_class_t *oci8_bind_class);
+void oci8_link_to_parent(oci8_base_t *base, oci8_base_t *parent);
+void oci8_unlink_from_parent(oci8_base_t *base);
+sword oci8_blocking_region(oci8_svcctx_t *svcctx, rb_blocking_function_t func, void *data);
+sword oci8_exec_sql(oci8_svcctx_t *svcctx, const char *sql_text, ub4 num_define_vars, oci8_exec_sql_var_t *define_vars, ub4 num_bind_vars, oci8_exec_sql_var_t *bind_vars, int raise_on_error);
+#if defined RUNTIME_API_CHECK
+void *oci8_find_symbol(const char *symbol_name);
 #endif
-VALUE oci8_break(VALUE self);
-VALUE oci8_reset(VALUE self);
 
-/* session.c */
-void Init_oci8_session(void);
+/* error.c */
+extern VALUE eOCIException;
+extern VALUE eOCIBreak;
+void Init_oci8_error(void);
+NORETURN(void oci8_do_raise(OCIError *, sword status, OCIStmt *, const char *file, int line));
+NORETURN(void oci8_do_env_raise(OCIEnv *, sword status, const char *file, int line));
+NORETURN(void oci8_do_raise_init_error(const char *file, int line));
+sb4 oci8_get_error_code(OCIError *errhp);
+
+/* oci8.c */
+VALUE Init_oci8(void);
+oci8_svcctx_t *oci8_get_svcctx(VALUE obj);
+OCISvcCtx *oci8_get_oci_svcctx(VALUE obj);
+OCISession *oci8_get_oci_session(VALUE obj);
+void oci8_check_pid_consistency(oci8_svcctx_t *svcctx);
+#define TO_SVCCTX oci8_get_oci_svcctx
+#define TO_SESSION oci8_get_oci_session
 
 /* stmt.c */
-void Init_oci8_stmt(void);
+extern VALUE cOCIStmt;
+void Init_oci8_stmt(VALUE cOCI8);
 
 /* bind.c */
-void Init_oci8_bind(void);
-void oci8_set_value(oci8_bind_handle_t *, VALUE);
-VALUE oci8_get_value(oci8_bind_handle_t *);
-
-/* define.c */
-void Init_oci8_define(void);
-
-/* describe.c */
-void Init_oci8_describe(void);
-
-/* descriptor.c */
-void Init_oci8_descriptor(void);
-VALUE oci8_param_get(VALUE self, VALUE pos);
-
-/* param.c */
-void Init_oci8_param(void);
+typedef struct {
+    void *hp;
+    VALUE obj;
+} oci8_hp_obj_t;
+void oci8_bind_free(oci8_base_t *base);
+void oci8_bind_hp_obj_mark(oci8_base_t *base);
+void Init_oci8_bind(VALUE cOCI8BindTypeBase);
+oci8_bind_t *oci8_get_bind(VALUE obj);
+
+/* metadata.c */
+extern VALUE cOCI8MetadataBase;
+void Init_oci8_metadata(VALUE cOCI8);
+VALUE oci8_metadata_create(OCIParam *parmhp, VALUE svc, VALUE parent);
 
 /* lob.c */
-void Init_oci8_lob(void);
+void Init_oci8_lob(VALUE cOCI8);
+VALUE oci8_make_clob(oci8_svcctx_t *svcctx, OCILobLocator *s);
+VALUE oci8_make_nclob(oci8_svcctx_t *svcctx, OCILobLocator *s);
+VALUE oci8_make_blob(oci8_svcctx_t *svcctx, OCILobLocator *s);
+VALUE oci8_make_bfile(oci8_svcctx_t *svcctx, OCILobLocator *s);
 
 /* oradate.c */
 void Init_ora_date(void);
-void oci8_set_ora_date(ora_date_t *, int year, int month, int day, int hour, int minute, int second);
-void oci8_get_ora_date(ora_date_t *, int *year, int *month, int *day, int *hour, int *minute, int *second);
-
-/* oranumber.c */
-#define ORA_NUMBER_BUF_SIZE (128 /* max scale */ + 38 /* max precision */ + 1 /* sign */ + 1 /* comma */ + 1 /* nul */)
-void Init_ora_number(void);
-void ora_number_to_str(unsigned char *buf, size_t *lenp, ora_number_t *on, unsigned char size);
 
 /* ocinumber.c */
-int set_oci_vnumber(ora_vnumber_t *result, VALUE num, OCIError *errhp);
+void Init_oci_number(VALUE mOCI);
+OCINumber *oci8_get_ocinumber(VALUE num);
+VALUE oci8_make_ocinumber(OCINumber *s);
+VALUE oci8_make_integer(OCINumber *s);
+VALUE oci8_make_float(OCINumber *s);
+OCINumber *oci8_set_ocinumber(OCINumber *result, VALUE self);
+OCINumber *oci8_set_integer(OCINumber *result, VALUE self);
+
+/* ocidatetim.c */
+void Init_oci_datetime(void);
+VALUE oci8_make_ocidate(OCIDate *od);
+OCIDate *oci8_set_ocidate(OCIDate *od, VALUE val);
+VALUE oci8_make_ocidatetime(OCIDateTime *dttm);
+OCIDateTime *oci8_set_ocidatetime(OCIDateTime *dttm, VALUE val);
+VALUE oci8_make_interval_ym(OCIInterval *s);
+VALUE oci8_make_interval_ds(OCIInterval *s);
+
+/* object.c */
+void Init_oci_object(VALUE mOCI);
+
+/* xmldb.c */
+#ifndef XMLCTX_DEFINED
+#define XMLCTX_DEFINED
+struct xmlctx;
+typedef struct xmlctx xmlctx;
+#endif
+#ifndef XML_TYPES
+typedef struct xmlnode xmlnode;
+#endif
+void Init_oci_xmldb(void);
+VALUE oci8_make_rexml(struct xmlctx *xctx, xmlnode *node);
 
 /* attr.c */
-void Init_oci8_attr(void);
-VALUE oci8_attr_get(VALUE self, VALUE vtype);
-VALUE oci8_attr_set(VALUE self, VALUE vtype, VALUE vvalue);
-extern oci8_attr_t oci8_attr_list[];
-extern size_t oci8_attr_size;
+VALUE oci8_get_sb1_attr(oci8_base_t *base, ub4 attrtype);
+VALUE oci8_get_ub2_attr(oci8_base_t *base, ub4 attrtype);
+VALUE oci8_get_sb2_attr(oci8_base_t *base, ub4 attrtype);
+VALUE oci8_get_ub4_attr(oci8_base_t *base, ub4 attrtype);
+VALUE oci8_get_string_attr(oci8_base_t *base, ub4 attrtype);
+VALUE oci8_get_rowid_attr(oci8_base_t *base, ub4 attrtype);
+
+/* encoding.c */
+void Init_oci8_encoding(VALUE cOCI8);
+VALUE oci8_charset_id2name(VALUE svc, VALUE charset_id);
+
+/* win32.c */
+void Init_oci8_win32(VALUE cOCI8);
+
+#ifdef HAVE_TYPE_RB_ENCODING
+extern rb_encoding *oci8_encoding;
+
+#define OCI8StringValue(v) do { \
+    StringValue(v); \
+    (v) = rb_str_export_to_enc(v, oci8_encoding); \
+} while (0)
+#define OCI8SafeStringValue(v) do { \
+    SafeStringValue(v); \
+    (v) = rb_str_export_to_enc(v, oci8_encoding); \
+} while (0)
+#else
+#define OCI8StringValue(v)     StringValue(v)
+#define OCI8SafeStringValue(v) SafeStringValue(v)
+#endif
+
+#include "apiwrap.h"
 
-#define _D_ fprintf(stderr, "%s:%d - %s\n", __FILE__, __LINE__, __FUNCTION__)
 #endif