ruby-oci8 2.0.6 → 2.1.0

data/ext/oci8/oraconf.rb

@@ -1,35 +1,7 @@
 require 'mkmf'
 
-unless defined? macro_defined?
-  # ruby 1.6 doesn't have 'macro_defined?'.
-  def macro_defined?(macro, src, opt="")
-    try_cpp(src + <<"SRC", opt)
-#ifndef #{macro}
-# error
-#endif
-SRC
-  end
-end
-
-module Logging
-  unless Logging.respond_to?(:open)
-    # emulate Logging::open of ruby 1.6.8 or later.
-
-    if $log.nil? # ruby 1.6.2 doesn't have $log.
-      $log = open('mkmf.log', 'w')
-    end
-    def Logging::open
-      begin
-        $stderr.reopen($log)
-        $stdout.reopen($log)
-        yield
-      ensure
-        $stderr.reopen($orgerr)
-        $stdout.reopen($orgout)
-      end
-    end
-  end
-end # module Logging
+# compatibility for ruby-1.9
+RbConfig = Config unless defined? RbConfig
 
 module MiniRegistry
   class MiniRegistryError < StandardError
@@ -148,7 +120,7 @@ class MiniSOReader
         read_mach_o_unversal(f)
       else
         # AIX and Tru64
-        raise format("unknown file header: %02x %02x", file_header[0], file_header[1])
+        raise format("unknown file header: %02x %02x", file_header[0].to_i, file_header[1].to_i)
       end
     ensure
       f.close
@@ -193,6 +165,8 @@ class MiniSOReader
       @cpu = :i386
     when 15
       @cpu = :parisc
+    when 18
+      @cpu = :sparc32plus
     when 20
       @cpu = :ppc
     when 21
@@ -378,10 +352,10 @@ EOS
 
   private
 
-  def self.make_proc_to_check_cpu(expect)
+  def self.make_proc_to_check_cpu(*expect)
     Proc.new do |file|
       so = MiniSOReader.new(file)
-      if so.cpu == expect
+      if expect.include? so.cpu
         true
       else
         puts "  skip: #{file} is for #{so.cpu} cpu."
@@ -432,7 +406,7 @@ EOS
       if is_32bit
         @@ld_envs = %w[LD_LIBRARY_PATH_32 LD_LIBRARY_PATH]
         if is_big_endian
-          check_proc = make_proc_to_check_cpu(:sparc)
+          check_proc = make_proc_to_check_cpu(:sparc, :sparc32plus)
         else
           check_proc = make_proc_to_check_cpu(:i386)
         end
@@ -572,12 +546,14 @@ EOS
       puts "yes"
       return path, files[0]
     end
+    nil
   end
 
   def init
     check_cc()
     @cc_is_gcc = check_cc_is_gcc()
     @lp64 = check_lp64()
+    check_system_header()
     check_ruby_header()
   end
 
@@ -619,33 +595,36 @@ EOS
     end
   end # check_lp64
 
+  def check_system_header
+    if not have_header('sys/types.h')
+      raise <<EOS
+A standard C header file 'sys/types.h' doesn't exist.
+Did you install glibc-devel(redhat) or libc6-dev(debian/ubuntu)?
+EOS
+    end
+  end
+
   def check_ruby_header
     print "checking for ruby header... "
     STDOUT.flush
-    rubyhdrdir = Config::CONFIG["rubyhdrdir"] || Config::CONFIG['archdir']
+    rubyhdrdir = RbConfig::CONFIG["rubyhdrdir"] || RbConfig::CONFIG['archdir']
     unless File.exist?(rubyhdrdir + '/ruby.h')
       puts "ng"
-      if RUBY_PLATFORM =~ /darwin/ and File.exist?("#{Config::CONFIG['archdir']}/../universal-darwin8.0/ruby.h")
+      if RUBY_PLATFORM =~ /darwin/ and File.exist?("#{RbConfig::CONFIG['archdir']}/../universal-darwin8.0/ruby.h")
         raise <<EOS
-#{Config::CONFIG['archdir']}/ruby.h doesn't exist.
+#{RbConfig::CONFIG['archdir']}/ruby.h doesn't exist.
 Run the following commands to fix the problem.
 
-  cd #{Config::CONFIG['archdir']}
+  cd #{RbConfig::CONFIG['archdir']}
   sudo ln -s ../universal-darwin8.0/* ./
 EOS
       else
         raise <<EOS
-#{Config::CONFIG['archdir']}/ruby.h doesn't exist.
+#{RbConfig::CONFIG['archdir']}/ruby.h doesn't exist.
 Install the ruby development library.
 EOS
       end
     end
-    if RUBY_PLATFORM =~ /linux/ and not File.exist?("/usr/include/sys/types.h")
-      raise <<EOS
-Do you install glibc-devel(redhat) or libc6-dev(debian)?
-You need /usr/include/sys/types.h to compile ruby-oci8.
-EOS
-    end
     puts "ok"
     $stdout.flush
   end # check_ruby_header
@@ -662,12 +641,12 @@ EOS
 
   if RUBY_PLATFORM =~ /mswin32|cygwin|mingw32|bccwin32/ # when Windows
 
-    def get_libs(base_dir = oci_base_dir)
+    def get_libs(lib_dir)
       case RUBY_PLATFORM
       when /cygwin/
         open("OCI.def", "w") do |f|
           f.puts("EXPORTS")
-          open("|nm #{base_dir}/LIB/MSVC/OCI.LIB") do |r|
+          open("|nm #{lib_dir}/MSVC/OCI.LIB") do |r|
             while line = r.gets
               f.puts($') if line =~ / T _/
             end
@@ -682,21 +661,34 @@ EOS
       when /bccwin32/
         # replace '/' to '\\' because bcc linker misunderstands
         # 'C:/foo/bar/OCI.LIB' as unknown option.
-        lib = "#{base_dir}/LIB/BORLAND/OCI.LIB"
+        lib = "#{lib_dir}/BORLAND/OCI.LIB"
         return lib.tr('/', '\\') if File.exist?(lib)
         raise <<EOS
 #{lib} does not exist.
 
 Your Oracle may not support Borland C++.
 If you want to run this module, run the following command at your own risk.
-  cd #{base_dir.tr('/', '\\')}\\LIB
+  cd #{lib_dir.tr('/', '\\')}
   mkdir Borland
   cd Borland
   coff2omf ..\\MSVC\\OCI.LIB OCI.LIB
 EOS
         exit 1
       else
-        "\"#{base_dir}/LIB/MSVC/OCI.LIB\""
+        "\"#{lib_dir}/MSVC/OCI.LIB\""
+      end
+    end
+
+  else
+    # Unix
+    def get_libs(lib_dir)
+      case RUBY_PLATFORM
+      when /solaris/
+        " -L#{lib_dir} -R#{lib_dir} -lclntsh"
+      when /linux/
+        " -L#{lib_dir} -Wl,-rpath,#{lib_dir} -lclntsh"
+      else
+        " -L#{lib_dir} -lclntsh"
       end
     end
 
@@ -710,7 +702,7 @@ class OraConfFC < OraConf
 
     @oracle_home = get_home()
     if RUBY_PLATFORM =~ /freebsd/ && @oracle_home == '/usr/local/oracle8-client'
-      @version = '817'
+      raise "Oralce 8i is not supported."
     else
       @version = get_version()
     end
@@ -725,34 +717,14 @@ class OraConfFC < OraConf
       use_lib32 = false
     end
 
-    # default
-    if @version.to_i >= 900
-      if use_lib32
-        lib_dir = "#{@oracle_home}/lib32"
-      else
-        lib_dir = "#{@oracle_home}/lib"
-      end
-      case RUBY_PLATFORM
-      when /solaris/
-        @libs = " -L#{lib_dir} -R#{lib_dir} -lclntsh"
-      when /linux/
-        @libs = " -L#{lib_dir} -Wl,-rpath,#{lib_dir} -lclntsh"
-      else
-        @libs = " -L#{lib_dir} -lclntsh"
-      end
-      return if try_link_oci()
-    end
-
-    # get from demo_rdbms.mk
-    if use_lib32
-      if File.exist?("#{@oracle_home}/rdbms/demo/demo_rdbms32.mk")
-        @libs = get_libs('32', '')
-      else
-        @libs = get_libs('', '32')
-      end
+    if RUBY_PLATFORM =~ /mswin32|cygwin|mingw32|bccwin32/
+      lib_dir = "#{@oracle_home}/oci/lib"
+    elsif use_lib32
+      lib_dir = "#{@oracle_home}/lib32"
     else
-      @libs = get_libs()
+      lib_dir = "#{@oracle_home}/lib"
     end
+    @libs = get_libs(lib_dir)
     return if try_link_oci()
 
     raise 'cannot compile OCI'
@@ -870,23 +842,14 @@ EOS
       oracle_home.gsub(/\\/, '/')
     end
 
-    def oci_base_dir
-      case @version
-      when /80./
-        "#{@oracle_home}/OCI80"
-      else
-        "#{@oracle_home}/OCI"
-      end
-    end
-
     def get_cflags
-      unless File.exist?("#{oci_base_dir}/INCLUDE/OCI.H")
-        raise "'#{oci_base_dir}/INCLUDE/OCI.H' does not exists. Please install 'Oracle Call Interface'."
+      unless File.exist?("#{@oracle_home}/OCI/INCLUDE/OCI.H")
+        raise "'#{@oracle_home}/OCI/INCLUDE/OCI.H' does not exists. Please install 'Oracle Call Interface'."
       end
       if RUBY_PLATFORM =~ /cygwin/
-        " \"-I#{oci_base_dir}/INCLUDE\" -D_int64=\"long long\""
+        " \"-I#{@oracle_home}/OCI/INCLUDE\" -D_int64=\"long long\""
       else
-        " \"-I#{oci_base_dir}/INCLUDE\""
+        " \"-I#{@oracle_home}/OCI/INCLUDE\""
       end
     end
 
@@ -957,70 +920,6 @@ EOS
       end
     end # get_cflags
 
-    def get_libs(postfix1 = '', postfix2 = "")
-      print("Running make for $ORACLE_HOME/rdbms/demo/demo_rdbms#{postfix1}.mk (build#{postfix2}) ...")
-      STDOUT.flush
-
-      make_opt = "CC='echo MARKER' EXE=/dev/null ECHODO=echo ECHO=echo GENCLNTSH='echo genclntsh'"
-      if @cc_is_gcc && /solaris/ =~ RUBY_PLATFORM
-        # suggested by Brian Candler.
-        make_opt += " KPIC_OPTION= NOKPIC_CCFLAGS#{postfix2}="
-      end
-
-      command = "|make -f #{@oracle_home}/rdbms/demo/demo_rdbms#{postfix1}.mk build#{postfix2} #{make_opt}"
-      marker = /^\s*MARKER/
-      echo = /^\s*echo/
-      libs = nil
-      Logging::open do
-        puts command
-        open(command, "r") do |f|
-          while line = f.gets
-            puts line
-            line.chomp!
-            line = $' while line =~ echo
-            if line =~ marker
-              # found a line where a compiler runs.
-              libs = $'
-              libs.gsub!(/-o\s+\/dev\/null/, "")
-              libs.gsub!(/-o\s+build/, "")
-            end
-          end
-        end
-      end
-      raise 'Cannot get proper libs.' if libs.nil?
-      print("OK\n")
-
-      case RUBY_PLATFORM
-      when /hpux/
-        if @cc_is_gcc
-          # strip +DA2.0W, +DS2.0, -Wl,+s, -Wl,+n
-          libs.gsub!(/\+DA\S+(\s)*/, "")
-          libs.gsub!(/\+DS\S+(\s)*/, "")
-          libs.gsub!(/-Wl,\+[sn](\s)*/, "")
-        end
-        libs.gsub!(/ -Wl,/, " ")
-      when /aix/
-        if @cc_is_gcc
-          # strip -bI:/xxx
-          libs.gsub!(/(-bI:\S+)/, '')
-        end
-      end
-
-      # check whether object files are included.
-      if /\S+\.o\b/ =~ libs
-
-        # monkey patching!
-        Object.module_eval do
-          alias :link_command_pre_oci8 :link_command
-          def link_command(*args)
-            args[1] = "" if args[1] == $libs
-            link_command_pre_oci8(*args)
-          end
-        end
-
-      end
-      libs
-    end # get_libs
   end
 end
 
@@ -1072,7 +971,7 @@ EOS
       end
       @cflags = " \"-I#{inc_dir}\""
       @cflags += " -D_int64=\"long long\"" if RUBY_PLATFORM =~ /cygwin/
-      @libs = get_libs("#{ic_dir}/sdk")
+      @libs = get_libs("#{ic_dir}/sdk/lib")
       ld_path = nil
     else
       @cflags = " -I#{inc_dir}"
@@ -1116,7 +1015,7 @@ EOS
         end
         raise 'failed'
       end
-      @libs = " -L#{lib_dir} -lclntsh "
+      @libs = get_libs(lib_dir)
     end
     unless File.exist?("#{inc_dir}/oci.h")
           raise <<EOS
@@ -1133,6 +1032,18 @@ EOS
       else
         # 10.1.0 doesn't have OCI_MAJOR_VERSION and OCI_MINOR_VERSION in oci.h.
         @version = "1010"
+        if RUBY_PLATFORM =~ /darwin/ and 1.size == 8 and `sw_vers -productVersion`.chomp == "10.7"
+          $stderr.print <<EOS
+WARN! WARN! WARN! WARN! WARN! WARN! WARN! WARN! WARN! WARN! WARN! WARN!
+
+64-bit Oracle instant client doesn't work on OS X Lion.
+See: https://forums.oracle.com/forums/thread.jspa?threadID=2187558
+
+The compilation is continued because the issue may be fixed in future.
+
+WARN! WARN! WARN! WARN! WARN! WARN! WARN! WARN! WARN! WARN! WARN! WARN!
+EOS
+        end
       end
       return
     end
@@ -1181,7 +1092,7 @@ or
     export RC_ARCHS
 
 If it does not fix the problem, delete all '-arch #{missing_arch}'
-in '#{Config::CONFIG['archdir']}/rbconfig.rb'.
+in '#{RbConfig::CONFIG['archdir']}/rbconfig.rb'.
 EOS
           end
         end

data/ext/oci8/oradate.c

@@ -2,9 +2,6 @@
 /*
  *  oradate.c
  *
- * $Author: kubo $
- * $Date: 2010-09-05 22:07:21 +0900 (Sun, 05 Sep 2010) $
- *
  * Copyright (C) 2002-2008 KUBO Takehiro <kubo@jiubao.org>
  *
  * date and time between 4712 B.C. and 9999 A.D.
@@ -557,7 +554,7 @@ static void bind_oradate_init_elem(oci8_bind_t *obind, VALUE svc)
     } while (++idx < obind->maxar_sz);
 }
 
-static const oci8_bind_class_t bind_oradate_class = {
+static const oci8_bind_vtable_t bind_oradate_vtable = {
     {
         NULL,
         oci8_bind_free,
@@ -568,8 +565,6 @@ static const oci8_bind_class_t bind_oradate_class = {
     bind_oradate_init,
     bind_oradate_init_elem,
     NULL,
-    NULL,
-    NULL,
     SQLT_DAT,
 };
 
@@ -612,5 +607,5 @@ void Init_ora_date(void)
     rb_define_method(cOraDate, "_dump", ora_date_dump, -1);
     rb_define_singleton_method(cOraDate, "_load", ora_date_s_load, 1);
 
-    oci8_define_bind_class("OraDate", &bind_oradate_class);
+    oci8_define_bind_class("OraDate", &bind_oradate_vtable);
 }

data/ext/oci8/stmt.c

@@ -53,7 +53,7 @@ static void oci8_stmt_free(oci8_base_t *base)
     stmt->defns = Qnil;
 }
 
-static oci8_base_class_t oci8_stmt_class = {
+static oci8_base_vtable_t oci8_stmt_vtable = {
     oci8_stmt_mark,
     oci8_stmt_free,
     sizeof(oci8_stmt_t),
@@ -87,7 +87,7 @@ static VALUE oci8_stmt_initialize(int argc, VALUE *argv, VALUE self)
     if (argc > 1) {
         rv = OCIStmtPrepare(stmt->base.hp.stmt, oci8_errhp, RSTRING_ORATEXT(sql), RSTRING_LEN(sql), OCI_NTV_SYNTAX, OCI_DEFAULT);
         if (IS_OCI_ERROR(rv)) {
-            oci8_raise(oci8_errhp, rv, stmt->base.hp.stmt);
+            chker3(rv, &stmt->base, stmt->base.hp.stmt);
         }
     }
     oci8_link_to_parent((oci8_base_t*)stmt, (oci8_base_t*)DATA_PTR(svc));
@@ -99,24 +99,18 @@ static VALUE oci8_define_by_pos(VALUE self, VALUE vposition, VALUE vbindobj)
     oci8_stmt_t *stmt = TO_STMT(self);
     ub4 position;
     oci8_bind_t *obind;
-    const oci8_bind_class_t *bind_class;
+    const oci8_bind_vtable_t *vptr;
     sword status;
-    ub4 mode;
 
     position = NUM2INT(vposition); /* 1 */
     obind = oci8_get_bind(vbindobj); /* 2 */
     if (obind->base.hp.dfn != NULL) {
         oci8_base_free(&obind->base); /* TODO: OK? */
     }
-    bind_class = (const oci8_bind_class_t *)obind->base.klass;
-    if (bind_class->out == NULL) {
-        mode = OCI_DEFAULT;
-    } else {
-        mode = OCI_DYNAMIC_FETCH;
-    }
-    status = OCIDefineByPos(stmt->base.hp.stmt, &obind->base.hp.dfn, oci8_errhp, position, obind->valuep, obind->value_sz, bind_class->dty, NIL_P(obind->tdo) ? obind->u.inds : NULL, NULL, 0, mode);
+    vptr = (const oci8_bind_vtable_t *)obind->base.vptr;
+    status = OCIDefineByPos(stmt->base.hp.stmt, &obind->base.hp.dfn, oci8_errhp, position, obind->valuep, obind->value_sz, vptr->dty, NIL_P(obind->tdo) ? obind->u.inds : NULL, NULL, 0, OCI_DEFAULT);
     if (status != OCI_SUCCESS) {
-        oci8_raise(oci8_errhp, status, stmt->base.hp.ptr);
+        chker3(status, &stmt->base, stmt->base.hp.ptr);
     }
     obind->base.type = OCI_HTYPE_DEFINE;
     /* link to the parent as soon as possible to preserve deallocation order. */
@@ -124,12 +118,10 @@ static VALUE oci8_define_by_pos(VALUE self, VALUE vposition, VALUE vbindobj)
     oci8_link_to_parent((oci8_base_t*)obind, (oci8_base_t*)stmt);
 
     if (NIL_P(obind->tdo) && obind->maxar_sz > 0) {
-        oci_lc(OCIDefineArrayOfStruct(obind->base.hp.dfn, oci8_errhp, obind->alloc_sz, sizeof(sb2), 0, 0));
+        chker2(OCIDefineArrayOfStruct(obind->base.hp.dfn, oci8_errhp, obind->alloc_sz, sizeof(sb2), 0, 0), &stmt->base);
     }
-    if (RTEST(obind->tdo)) {
-        oci8_base_t *tdo = DATA_PTR(obind->tdo);
-        oci_lc(OCIDefineObject(obind->base.hp.dfn, oci8_errhp, tdo->hp.tdo,
-                               obind->valuep, 0, obind->u.null_structs, 0));
+    if (vptr->post_bind_hook != NULL) {
+        vptr->post_bind_hook(obind);
     }
     if (position - 1 < RARRAY_LEN(stmt->defns)) {
         VALUE old_value = RARRAY_PTR(stmt->defns)[position - 1];
@@ -137,9 +129,6 @@ static VALUE oci8_define_by_pos(VALUE self, VALUE vposition, VALUE vbindobj)
             oci8_base_free((oci8_base_t*)oci8_get_bind(old_value));
         }
     }
-    if (bind_class->csfrm != 0) {
-        oci_lc(OCIAttrSet(obind->base.hp.ptr, OCI_HTYPE_DEFINE, (void*)&bind_class->csfrm, 0, OCI_ATTR_CHARSET_FORM, oci8_errhp));
-    }
     rb_ary_store(stmt->defns, position - 1, obind->base.self);
     return obind->base.self;
 }
@@ -151,12 +140,10 @@ static VALUE oci8_bind(VALUE self, VALUE vplaceholder, VALUE vbindobj)
     ub4 placeholder_len = 0;
     ub4 position = 0;
     oci8_bind_t *obind;
-    const oci8_bind_class_t *bind_class;
+    const oci8_bind_vtable_t *vptr;
     sword status;
     VALUE old_value;
     void *indp;
-    ub4 *curelep;
-    ub4 mode;
 
     if (NIL_P(vplaceholder)) { /* 1 */
         placeholder_ptr = NULL;
@@ -179,26 +166,16 @@ static VALUE oci8_bind(VALUE self, VALUE vplaceholder, VALUE vbindobj)
     if (obind->base.hp.bnd != NULL) {
         oci8_base_free(&obind->base); /* TODO: OK? */
     }
-    bind_class = (const oci8_bind_class_t *)obind->base.klass;
-    if (bind_class->in != NULL || bind_class->out != NULL) {
-        mode = OCI_DATA_AT_EXEC;
-    } else {
-        mode = OCI_DEFAULT;
-    }
+    vptr = (const oci8_bind_vtable_t *)obind->base.vptr;
 
     indp = NIL_P(obind->tdo) ? obind->u.inds : NULL;
-    if (obind->maxar_sz == 0) {
-        curelep = NULL;
-    } else {
-        curelep = &obind->curar_sz;
-    }
     if (placeholder_ptr == (char*)-1) {
-        status = OCIBindByPos(stmt->base.hp.stmt, &obind->base.hp.bnd, oci8_errhp, position, obind->valuep, obind->value_sz, bind_class->dty, indp, NULL, 0, 0, 0, mode);
+        status = OCIBindByPos(stmt->base.hp.stmt, &obind->base.hp.bnd, oci8_errhp, position, obind->valuep, obind->value_sz, vptr->dty, indp, NULL, 0, 0, 0, OCI_DEFAULT);
     } else {
-        status = OCIBindByName(stmt->base.hp.stmt, &obind->base.hp.bnd, oci8_errhp, TO_ORATEXT(placeholder_ptr), placeholder_len, obind->valuep, obind->value_sz, bind_class->dty, indp, NULL, 0, 0, 0, mode);
+        status = OCIBindByName(stmt->base.hp.stmt, &obind->base.hp.bnd, oci8_errhp, TO_ORATEXT(placeholder_ptr), placeholder_len, obind->valuep, obind->value_sz, vptr->dty, indp, NULL, 0, 0, 0, OCI_DEFAULT);
     }
     if (status != OCI_SUCCESS) {
-        oci8_raise(oci8_errhp, status, stmt->base.hp.stmt);
+        chker3(status, &stmt->base, stmt->base.hp.stmt);
     }
     obind->base.type = OCI_HTYPE_BIND;
     /* link to the parent as soon as possible to preserve deallocation order. */
@@ -206,15 +183,11 @@ static VALUE oci8_bind(VALUE self, VALUE vplaceholder, VALUE vbindobj)
     oci8_link_to_parent((oci8_base_t*)obind, (oci8_base_t*)stmt);
 
     if (NIL_P(obind->tdo) && obind->maxar_sz > 0) {
-        oci_lc(OCIBindArrayOfStruct(obind->base.hp.bnd, oci8_errhp, obind->alloc_sz, sizeof(sb2), 0, 0));
+        chker2(OCIBindArrayOfStruct(obind->base.hp.bnd, oci8_errhp, obind->alloc_sz, sizeof(sb2), 0, 0),
+               &stmt->base);
     }
-    if (!NIL_P(obind->tdo)) {
-        oci8_base_t *tdo = DATA_PTR(obind->tdo);
-        oci_lc(OCIBindObject(obind->base.hp.bnd, oci8_errhp, tdo->hp.tdo,
-                             obind->valuep, 0, obind->u.null_structs, 0));
-    }
-    if (bind_class->csfrm != 0) {
-        oci_lc(OCIAttrSet(obind->base.hp.ptr, OCI_HTYPE_BIND, (void*)&bind_class->csfrm, 0, OCI_ATTR_CHARSET_FORM, oci8_errhp));
+    if (vptr->post_bind_hook != NULL) {
+        vptr->post_bind_hook(obind);
     }
     old_value = rb_hash_aref(stmt->binds, vplaceholder);
     if (!NIL_P(old_value)) {
@@ -247,9 +220,8 @@ static VALUE oci8_stmt_execute(VALUE self, VALUE iteration_count)
     oci8_svcctx_t *svcctx = oci8_get_svcctx(stmt->svc);
     ub4 iters;
     ub4 mode;
-    sword rv;
 
-    if (oci8_get_ub2_attr(&stmt->base, OCI_ATTR_STMT_TYPE) == INT2FIX(OCI_STMT_SELECT)) {
+    if (oci8_get_ub2_attr(&stmt->base, OCI_ATTR_STMT_TYPE, stmt->base.hp.stmt) == INT2FIX(OCI_STMT_SELECT)) {
         iters = 0;
         mode = OCI_DEFAULT;
     } else {
@@ -259,58 +231,8 @@ static VALUE oci8_stmt_execute(VALUE self, VALUE iteration_count)
             iters = 1;
         mode = svcctx->is_autocommit ? OCI_COMMIT_ON_SUCCESS : OCI_DEFAULT;
     }
-    rv = oci8_call_stmt_execute(svcctx, stmt, iters, mode);
-#ifdef USE_DYNAMIC_FETCH
-    while (rv == OCI_NEED_DATA) {
-        oci8_bind_t *obind;
-        const oci8_bind_class_t *bind_class;
-        /* get piece info. */
-        dvoid *hp;
-        ub4 type;
-        ub1 in_out;
-        ub4 iter;
-        ub4 idx;
-        ub1 piece;
-        /* set piece info. */
-        void *valuep;
-        ub4 *alenp;
-        void *indp;
-
-        oci_lc(OCIStmtGetPieceInfo(stmt->base.hp.ptr, oci8_errhp, &hp, &type, &in_out, &iter, &idx, &piece));
-        obind = (oci8_bind_t*)stmt->base.children;
-        do {
-            if (obind->base.hp.ptr == hp) {
-                if (type != OCI_HTYPE_BIND)
-                    rb_bug("ruby-oci8: expect OCI_HTYPE_BIND but %d", type);
-                bind_class = (const oci8_bind_class_t *)obind->base.klass;
-                switch (in_out) {
-                case OCI_PARAM_IN:
-                    if (bind_class->in == NULL)
-                        rb_bug("....");
-                    piece = bind_class->in(obind, idx, piece, &valuep, &alenp, &indp);
-                    break;
-                case OCI_PARAM_OUT:
-                    if (bind_class->out == NULL)
-                        rb_bug("....");
-                    bind_class->out(obind, idx, piece, &valuep, &alenp, &indp);
-                    break;
-                default:
-                    rb_bug("ruby-oci8: expect OCI_PARAM_IN or OCI_PARAM_OUT but %d", in_out);
-                }
-                oci_lc(OCIStmtSetPieceInfo(obind->base.hp.ptr, OCI_HTYPE_BIND, oci8_errhp, valuep, alenp, 0, indp, NULL));
-                break;
-            }
-            obind = (oci8_bind_t*)obind->base.next;
-        } while (obind != (oci8_bind_t*)stmt->base.children);
-        if (obind == (oci8_bind_t*)stmt) {
-            rb_bug("ruby-oci8: No bind handle is found.");
-        }
-        rv = oci8_call_stmt_execute(svcctx, stmt, iters, mode);
-    }
-#endif /* USE_DYNAMIC_FETCH */
-    if (IS_OCI_ERROR(rv)) {
-        oci8_raise(oci8_errhp, rv, stmt->base.hp.stmt);
-    }
+    chker3(oci8_call_stmt_execute(svcctx, stmt, iters, mode),
+           &stmt->base, stmt->base.hp.stmt);
     return self;
 }
 
@@ -346,93 +268,25 @@ static VALUE oci8_stmt_do_fetch(oci8_stmt_t *stmt, oci8_svcctx_t *svcctx)
     sword rv;
     long idx;
     oci8_bind_t *obind;
-    const oci8_bind_class_t *bind_class;
+    const oci8_bind_vtable_t *vptr;
 
     if (stmt->base.children != NULL) {
         obind = (oci8_bind_t *)stmt->base.children;
         do {
             if (obind->base.type == OCI_HTYPE_DEFINE) {
-                bind_class = (const oci8_bind_class_t *)obind->base.klass;
-                if (bind_class->pre_fetch_hook != NULL) {
-                    bind_class->pre_fetch_hook(obind, stmt->svc);
+                vptr = (const oci8_bind_vtable_t *)obind->base.vptr;
+                if (vptr->pre_fetch_hook != NULL) {
+                    vptr->pre_fetch_hook(obind, stmt->svc);
                 }
             }
             obind = (oci8_bind_t *)obind->base.next;
         } while (obind != (oci8_bind_t*)stmt->base.children);
     }
     rv = OCIStmtFetch_nb(svcctx, stmt->base.hp.stmt, oci8_errhp, 1, OCI_FETCH_NEXT, OCI_DEFAULT);
-#ifdef USE_DYNAMIC_FETCH
-    while (rv == OCI_NEED_DATA) {
-        /* get piece info. */
-        dvoid *hp;
-        ub4 type;
-        ub1 in_out;
-        ub4 iter;
-        ub4 idx;
-        ub1 piece;
-        /* set piece info. */
-        void *valuep;
-        ub4 *alenp;
-        void *indp;
-
-        oci_lc(OCIStmtGetPieceInfo(stmt->base.hp.ptr, oci8_errhp, &hp, &type, &in_out, &iter, &idx, &piece));
-        obind = (oci8_bind_t *)stmt->base.children;
-        do {
-            if (obind->base.hp.ptr == hp) {
-                if (type != OCI_HTYPE_DEFINE)
-                    rb_bug("ruby-oci8: expect OCI_HTYPE_DEFINE but %d", type);
-                bind_class = (const oci8_bind_class_t *)obind->base.klass;
-                switch (in_out) {
-                case OCI_PARAM_OUT:
-                    if (bind_class->out == NULL)
-                        rb_bug("....");
-                    bind_class->out(obind, idx, piece, &valuep, &alenp, &indp);
-                    break;
-                default:
-                    rb_bug("ruby-oci8: expect OCI_PARAM_OUT but %d", in_out);
-                }
-                oci_lc(OCIStmtSetPieceInfo(obind->base.hp.ptr, OCI_HTYPE_DEFINE, oci8_errhp, valuep, alenp, 0, indp, NULL));
-                break;
-            }
-            obind = (oci8_bind_t *)obind->base.next;
-        } while (obind != (oci8_bind_t*)stmt->base.children);
-        if (obind == (oci8_bind_t*)stmt) {
-            rb_bug("ruby-oci8: No define handle is found.");
-        }
-        rv = OCIStmtFetch_nb(svcctx, stmt->base.hp.stmt, oci8_errhp, 1, OCI_FETCH_NEXT, OCI_DEFAULT);
-    }
-#endif /* USE_DYNAMIC_FETCH */
     if (rv == OCI_NO_DATA) {
         return Qnil;
     }
-    if (IS_OCI_ERROR(rv)) {
-        oci8_raise(oci8_errhp, rv, stmt->base.hp.stmt);
-    }
-#ifdef USE_DYNAMIC_FETCH
-    obind = (oci8_bind_t *)stmt->base.children;
-    do {
-        /* set piece info. */
-        void *valuep;
-        ub4 *alenp;
-        void *indp;
-        ub1 piece = OCI_LAST_PIECE;
-
-        if (obind->base.type == OCI_HTYPE_DEFINE) {
-            bind_class = (const oci8_bind_class_t *)obind->base.klass;
-            if (bind_class->out != NULL) {
-                if (obind->maxar_sz == 0) {
-                    bind_class->out(obind, 0, piece, &valuep, &alenp, &indp);
-                } else {
-                    ub4 idx;
-                    for (idx = 0; idx < obind->curar_sz; idx++) {
-                        bind_class->out(obind, idx, piece, &valuep, &alenp, &indp);
-                    }
-                }
-            }
-        }
-        obind = (oci8_bind_t *)obind->base.next;
-    } while (obind != (oci8_bind_t*)stmt->base.children);
-#endif /* USE_DYNAMIC_FETCH */
+    chker3(rv, &svcctx->base, stmt->base.hp.stmt);
     ary = rb_ary_new2(RARRAY_LEN(stmt->defns));
     for (idx = 0; idx < RARRAY_LEN(stmt->defns); idx++) {
         rb_ary_store(ary, idx, oci8_bind_get_data(RARRAY_PTR(stmt->defns)[idx]));
@@ -479,7 +333,7 @@ static VALUE oci8_stmt_get_param(VALUE self, VALUE pos)
     Check_Type(pos, T_FIXNUM); /* 1 */
     rv = OCIParamGet(stmt->base.hp.stmt, OCI_HTYPE_STMT, oci8_errhp, (dvoid *)&parmhp, FIX2INT(pos));
     if (rv != OCI_SUCCESS) {
-        oci8_raise(oci8_errhp, rv, NULL);
+        chker3(rv, &stmt->base, stmt->base.hp.stmt);
     }
     return oci8_metadata_create(parmhp, stmt->svc, self);
 }
@@ -504,7 +358,8 @@ static VALUE oci8_stmt_get_param(VALUE self, VALUE pos)
  */
 static VALUE oci8_stmt_get_stmt_type(VALUE self)
 {
-    VALUE stmt_type = oci8_get_ub2_attr(oci8_get_handle(self, cOCIStmt), OCI_ATTR_STMT_TYPE);
+    oci8_base_t *base = oci8_get_handle(self, cOCIStmt);
+    VALUE stmt_type = oci8_get_ub2_attr(base, OCI_ATTR_STMT_TYPE, base->hp.stmt);
     switch (FIX2INT(stmt_type)) {
     case OCI_STMT_SELECT:
         return oci8_sym_select_stmt;
@@ -534,7 +389,8 @@ static VALUE oci8_stmt_get_stmt_type(VALUE self)
  */
 static VALUE oci8_stmt_get_row_count(VALUE self)
 {
-    return oci8_get_ub4_attr(oci8_get_handle(self, cOCIStmt), OCI_ATTR_ROW_COUNT);
+    oci8_base_t *base = oci8_get_handle(self, cOCIStmt);
+    return oci8_get_ub4_attr(base, OCI_ATTR_ROW_COUNT, base->hp.stmt);
 }
 
 /*
@@ -553,12 +409,14 @@ static VALUE oci8_stmt_get_row_count(VALUE self)
  */
 static VALUE oci8_stmt_get_rowid(VALUE self)
 {
-    return oci8_get_rowid_attr(oci8_get_handle(self, cOCIStmt), OCI_ATTR_ROWID);
+    oci8_base_t *base = oci8_get_handle(self, cOCIStmt);
+    return oci8_get_rowid_attr(base, OCI_ATTR_ROWID, base->hp.stmt);
 }
 
 static VALUE oci8_stmt_get_param_count(VALUE self)
 {
-    return oci8_get_ub4_attr(oci8_get_handle(self, cOCIStmt), OCI_ATTR_PARAM_COUNT);
+    oci8_base_t *base = oci8_get_handle(self, cOCIStmt);
+    return oci8_get_ub4_attr(base, OCI_ATTR_PARAM_COUNT, base->hp.stmt);
 }
 
 /*
@@ -702,7 +560,8 @@ static VALUE oci8_stmt_set_prefetch_rows(VALUE self, VALUE rows)
     oci8_stmt_t *stmt = TO_STMT(self);
     ub4 num = NUM2UINT(rows);
 
-    oci_lc(OCIAttrSet(stmt->base.hp.ptr, OCI_HTYPE_STMT, &num, 0, OCI_ATTR_PREFETCH_ROWS, oci8_errhp));
+    chker2(OCIAttrSet(stmt->base.hp.ptr, OCI_HTYPE_STMT, &num, 0, OCI_ATTR_PREFETCH_ROWS, oci8_errhp),
+           &stmt->base);
     return Qfalse;
 }
 
@@ -746,7 +605,7 @@ static void bind_stmt_init_elem(oci8_bind_t *obind, VALUE svc)
     } while (++idx < obind->maxar_sz);
 }
 
-static const oci8_bind_class_t bind_stmt_class = {
+static const oci8_bind_vtable_t bind_stmt_vtable = {
     {
         oci8_bind_hp_obj_mark,
         oci8_bind_free,
@@ -756,8 +615,6 @@ static const oci8_bind_class_t bind_stmt_class = {
     bind_stmt_set,
     bind_stmt_init,
     bind_stmt_init_elem,
-    NULL,
-    NULL,
     bind_stmt_init_elem,
     SQLT_RSET
 };
@@ -769,7 +626,7 @@ void Init_oci8_stmt(VALUE cOCI8)
     cOCI8 = rb_define_class("OCI8", cOCIHandle);
     cOCIStmt = rb_define_class_under(cOCI8, "Cursor", cOCIHandle);
 #endif
-    cOCIStmt = oci8_define_class_under(cOCI8, "Cursor", &oci8_stmt_class);
+    cOCIStmt = oci8_define_class_under(cOCI8, "Cursor", &oci8_stmt_vtable);
 
     oci8_sym_select_stmt = ID2SYM(rb_intern("select_stmt"));
     oci8_sym_update_stmt = ID2SYM(rb_intern("update_stmt"));
@@ -806,5 +663,5 @@ void Init_oci8_stmt(VALUE cOCI8)
     rb_define_private_method(cOCIStmt, "__defined?", oci8_stmt_defined_p, 1);
     rb_define_method(cOCIStmt, "prefetch_rows=", oci8_stmt_set_prefetch_rows, 1);
 
-    oci8_define_bind_class("Cursor", &bind_stmt_class);
+    oci8_define_bind_class("Cursor", &bind_stmt_vtable);
 }