ruby-oci8 1.0.7 → 2.0.0

data/ext/oci8/oraconf.rb

@@ -48,69 +48,48 @@ module MiniRegistry
     # copy the minimum code and reorganize it.
     ERROR_SUCCESS = 0
     ERROR_FILE_NOT_FOUND = 2
-    ERROR_NO_MORE_ITEMS = 259
 
     HKEY_LOCAL_MACHINE = 0x80000002
-    KEY_ENUMERATE_SUB_KEYS = 0x0008
-    KEY_QUERY_VALUE = 0x0001
     RegOpenKeyExA = Win32API.new('advapi32', 'RegOpenKeyExA', 'LPLLP', 'L')
-    RegEnumKeyExA = Win32API.new('advapi32', 'RegEnumKeyExA', 'LLPPPPPP', 'L')
     RegQueryValueExA = Win32API.new('advapi32','RegQueryValueExA','LPPPPP','L')
     RegCloseKey = Win32API.new('advapi32', 'RegCloseKey', 'L', 'L')
 
-    def self.get_str_value(hKey, name)
-      lpcbData = [0].pack('L')
-      code = RegQueryValueExA.call(hKey, name, nil, nil, nil, lpcbData)
-      if code == ERROR_FILE_NOT_FOUND
-        return nil
-      elsif code != ERROR_SUCCESS
-        raise MiniRegistryError.new("Win32::RegQueryValueExA",code)
-      end
-      len = lpcbData.unpack('L')[0]
-      lpType = [0].pack('L')
-      lpData = "\0"*len
-      lpcbData = [len].pack('L')
-      code = RegQueryValueExA.call(hKey, name, nil, lpType, lpData, lpcbData)
-      if code != ERROR_SUCCESS
-        raise MiniRegistryError.new("Win32::RegQueryValueExA",code)
-      end
-      lpData.unpack('Z*')[0]
-    end
-
-    def self.enum_homes
-      phkResult = [0].pack('L')
-      code = RegOpenKeyExA.call(HKEY_LOCAL_MACHINE, 'SOFTWARE\ORACLE', 0, 0x20019, phkResult)
+    def get_reg_value(root, subkey, name)
+      result = [0].pack('L')
+      code = RegOpenKeyExA.call(root, subkey, 0, 0x20019, result)
       if code != ERROR_SUCCESS
         raise MiniRegistryError.new("Win32::RegOpenKeyExA", code)
       end
-      hKey = phkResult.unpack('L')[0]
-      idx = 0
-      maxkeylen = 256
-      loop do
-        lpName = "\0" * maxkeylen
-        lpcName = [maxkeylen].pack('L')
-        code = RegEnumKeyExA.call(hKey, idx, lpName, lpcName, nil, nil, nil, nil);
-        break if code == ERROR_NO_MORE_ITEMS
-        if code != ERROR_SUCCESS
-          RegCloseKey.call(hKey)
-          raise MiniRegistryError.new("Win32::RegEnumKeyEx", code)
+      hkey = result.unpack('L')[0]
+      begin
+        lpcbData = [0].pack('L')
+        code = RegQueryValueExA.call(hkey, name, nil, nil, nil, lpcbData)
+        if code == ERROR_FILE_NOT_FOUND
+          return nil
+        elsif code != ERROR_SUCCESS
+          raise MiniRegistryError.new("Win32::RegQueryValueExA",code)
         end
-        code = RegOpenKeyExA.call(hKey, lpName, 0, KEY_QUERY_VALUE, phkResult)
+        len = lpcbData.unpack('L')[0]
+        lpType = "\0\0\0\0"
+        lpData = "\0"*len
+        lpcbData = [len].pack('L')
+        code = RegQueryValueExA.call(hkey, name, nil, lpType, lpData, lpcbData)
         if code != ERROR_SUCCESS
-          RegCloseKey.call(hKey)
-          raise MiniRegistryError.new("Win32::RegEnumKeyEx", code)
+          raise MiniRegistryError.new("Win32::RegQueryValueExA",code)
         end
-        hSubkey = phkResult.unpack('L')[0]
-
-        name = get_str_value(hSubkey, 'ORACLE_HOME_NAME')
-        path = get_str_value(hSubkey, 'ORACLE_HOME')
-        yield name, path
-        RegCloseKey.call(hSubkey)
-        idx += 1
+        lpData.unpack('Z*')[0]
+      ensure
+        RegCloseKey.call(hkey)
       end
-      RegCloseKey.call(hKey)
     end
-
+    def get_local_registry(subkey, name)
+      get_reg_value(HKEY_LOCAL_MACHINE, subkey, name)
+    end
+  else
+    # UNIX
+    def get_local_registry(subkey, name)
+      nil
+    end
   end
 end # module MiniRegistry
 
@@ -314,6 +293,8 @@ class MiniSOReader
 end
 
 class OraConf
+  include MiniRegistry
+
   attr_reader :cc_is_gcc
   attr_reader :version
   attr_reader :cflags
@@ -353,10 +334,8 @@ EOS
       end
       print <<EOS
 ---------------------------------------------------
-Error Message:
-  #{$!.to_s.gsub(/\n/, "\n  ")}
-Backtrace:
-  #{$!.backtrace.join("\n  ")}
+error messages:
+#{$!.to_s}
 ---------------------------------------------------
 See:
  * http://ruby-oci8.rubyforge.org/#{lang}/HowToInstall.html
@@ -385,16 +364,15 @@ EOS
     # get library load path names
     oci_basename = 'libclntsh'
     oci_glob_postfix = '.[0-9]*'
-    nls_data_basename = ['libociei', 'libociicus']
+    ocidata_basename = ['libociei', 'libociicus']
     @@ld_envs = %w[LD_LIBRARY_PATH]
     so_ext = 'so'
-    nls_data_ext = nil
     check_proc = nil
     case RUBY_PLATFORM
     when /mswin32|cygwin|mingw32|bccwin32/
       oci_basename = 'oci'
       oci_glob_postfix = ''
-      nls_data_basename = ['oraociei11', 'oraociicus11', 'oraociei10', 'oraociicus10']
+      ocidata_basename = ['oraociei11', 'oraociicus11', 'oraociei10', 'oraociicus10']
       @@ld_envs = %w[PATH]
       so_ext = 'dll'
     when /i.86-linux/
@@ -437,7 +415,6 @@ EOS
       oci_glob_postfix = ''
       @@ld_envs = %w[LIBPATH]
       so_ext = 'a'
-      nls_data_ext = 'so'
     when /hppa.*-hpux/
       if [0].pack('l!').length == 4
         @@ld_envs = %w[SHLIB_PATH]
@@ -448,7 +425,7 @@ EOS
       so_ext = 'dylib'
       check_proc = Proc.new do |file|
         is_32bit = [0].pack('l!').size == 4
-        is_big_endian = "\x01\x02".unpack('s')[0] == 0x0102
+        is_big_endian = "\x01\x02".unpack('s') == 0x0102
         if is_32bit
           if is_big_endian
             this_cpu = :ppc    # 32-bit big-endian
@@ -467,12 +444,7 @@ EOS
           if so.cpu.include? this_cpu
             true
           else
-            if so.cpu.size > 1
-              arch_types = so.cpu[0..-2].join(', ') + ' and ' + so.cpu[-1].to_s
-            else
-              arch_types = so.cpu[0]
-            end
-            puts "  skip: #{file} is for #{arch_types} cpu."
+            puts "  skip: #{file} is for #{so.cpu} cpu."
             false
           end
         else
@@ -533,9 +505,8 @@ EOS
     end
 
     if ld_path
-      nls_data_ext ||= so_ext # nls_data_ext is same with so_ext by default.
-      nls_data_basename.each do |basename|
-        if File.exist?(File.join(ld_path, "#{basename}.#{nls_data_ext}"))
+      ocidata_basename.each do |basename|
+        if File.exist?(File.join(ld_path, "#{basename}.#{so_ext}"))
           puts "  #{file} looks like an instant client."
           return ld_path
         end
@@ -618,7 +589,6 @@ You need /usr/include/sys/types.h to compile ruby-oci8.
 EOS
     end
     puts "ok"
-    $stdout.flush
   end # check_ruby_header
 
   def try_link_oci
@@ -781,10 +751,26 @@ class OraConfFC < OraConf
       if oracle_home.nil?
         struct = Struct.new("OracleHome", :name, :path)
         oracle_homes = []
-        MiniRegistry.enum_homes do |name, path|
-          path.chomp!("\\") if path
-          oracle_homes << struct.new(name, path) if is_valid_home?(path)
+        begin
+          last_home = get_local_registry("SOFTWARE\\ORACLE\\ALL_HOMES", 'LAST_HOME')
+          0.upto last_home.to_i do |id|
+             oracle_homes << "HOME#{id}"
+          end
+        rescue MiniRegistryError
+        end
+        oracle_homes << "KEY_XE"
+        oracle_homes << "KEY_XEClient"
+        oracle_homes.collect! do |home|
+          begin
+            name = get_local_registry("SOFTWARE\\ORACLE\\#{home}", 'ORACLE_HOME_NAME')
+            path = get_local_registry("SOFTWARE\\ORACLE\\#{home}", 'ORACLE_HOME')
+            path.chomp!("\\")
+            struct.new(name, path) if is_valid_home?(path)
+          rescue MiniRegistryError
+            nil
+          end
         end
+        oracle_homes.compact!
         if oracle_homes.empty?
           raise <<EOS
 Set the environment variable ORACLE_HOME if Oracle Full Client.
@@ -866,33 +852,10 @@ EOS
     def get_home
       oracle_home = ENV['ORACLE_HOME']
       if oracle_home.nil?
-        msg = <<EOS
+        raise <<EOS
 Set the environment variable ORACLE_HOME if Oracle Full Client.
 Append the path of Oracle client libraries to #{OraConf.ld_envs[0]} if Oracle Instant Client.
 EOS
-
-        # check sudo environment
-        sudo_command = ENV['SUDO_COMMAND']
-        if /\w*make\b/ =~ sudo_command
-          msg += <<EOS
-
-The 'sudo' command unset some environment variables for security reasons.
-Use it only when running 'make install' as follows
-     make
-     sudo make install
-EOS
-        end
-        if /\w+\/gem\b/ =~ sudo_command
-          msg += <<EOS
-
-The 'sudo' command unset some environment variables for security reasons.
-Pass required varialbes as follows
-     sudo env #{OraConf.ld_envs[0]}=$#{OraConf.ld_envs[0]} #{sudo_command}
-  or 
-     sudo env ORACLE_HOME=$ORACLE_HOME #{sudo_command}
-EOS
-        end
-        raise msg
       end
       oracle_home
     end
@@ -977,18 +940,21 @@ EOS
         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
+      # remove object files from libs.
+      objs = []
+      libs.gsub!(/\S+\.o\b/) do |obj|
+        objs << obj
+        ""
+      end
+      # change object files to an archive file to work around.
+      if objs.length > 0
+        Logging::open do
+          puts "change object files to an archive file."
+          command = Config::CONFIG["AR"] + " cru oracle_objs.a " + objs.join(" ")
+          puts command
+          system(command)
+          libs = "oracle_objs.a " + libs
         end
-
       end
       libs
     end # get_libs

data/ext/oci8/oradate.c

@@ -1,16 +1,37 @@
+/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
-  oradate.c - part of ruby-oci8
-
-  Copyright (C) 2002 KUBO Takehiro <kubo@jiubao.org>
-
-=begin
-== OraDate
-date and time between 4712 B.C. and 9999 A.D.
-=end
-*/
+ *  oradate.c
+ *
+ * $Author: kubo $
+ * $Date: 2009-01-04 01:58:01 +0900 (Sun, 04 Jan 2009) $
+ *
+ * Copyright (C) 2002-2008 KUBO Takehiro <kubo@jiubao.org>
+ *
+ * date and time between 4712 B.C. and 9999 A.D.
+ */
 #include "oci8.h"
 #include <time.h>
 
+static VALUE cOraDate;
+
+/*
+ * Document-class: OraDate
+ *
+ * ruby class compatible with Oracle <tt>DATE</tt> data type.
+ * Date and time between 4712 B.C. and 9999 A.D.
+ *
+ */
+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;
+
 #define Set_year(od, y) (od)->century = y / 100 + 100, (od)->year = y % 100 + 100
 #define Set_month(od, m) (od)->month = m
 #define Set_day(od, d)   (od)->day = d
@@ -26,401 +47,570 @@ date and time between 4712 B.C. and 9999 A.D.
 #define Get_second(od) ((od)->second - 1)
 
 #define Check_year(year) \
-  if (year < -4712 || 9999 < year) \
-    rb_raise(rb_eRangeError, "Out of range for year %d (expect -4712 .. 9999)", year)
+    if (year < -4712 || 9999 < year) \
+        rb_raise(rb_eRangeError, "Out of range for year %d (expect -4712 .. 9999)", year)
 #define Check_month(month) \
-  if (month < 1 || 12 < month) \
-    rb_raise(rb_eRangeError, "Out of range for month %d (expect 1 .. 12)", month)
+    if (month < 1 || 12 < month) \
+        rb_raise(rb_eRangeError, "Out of range for month %d (expect 1 .. 12)", month)
 #define Check_day(day) \
-  if (day < 1 || 31 < day) \
-    rb_raise(rb_eRangeError, "Out of range for day %d (expect 1 .. 31)", day)
+    if (day < 1 || 31 < day) \
+        rb_raise(rb_eRangeError, "Out of range for day %d (expect 1 .. 31)", day)
 #define Check_hour(hour) \
-  if (hour < 0 || 23 < hour) \
-    rb_raise(rb_eRangeError, "Out of range for hour %d (expect 0 .. 24)", hour)
+    if (hour < 0 || 23 < hour) \
+        rb_raise(rb_eRangeError, "Out of range for hour %d (expect 0 .. 24)", hour)
 #define Check_minute(min) \
-  if (min < 0 || 59 < min) \
-    rb_raise(rb_eRangeError, "Out of range for minute %d (expect 0 .. 59)", min)
+    if (min < 0 || 59 < min) \
+        rb_raise(rb_eRangeError, "Out of range for minute %d (expect 0 .. 59)", min)
 #define Check_second(sec) \
-  if (sec < 0 || 59 < sec) \
-    rb_raise(rb_eRangeError, "Out of range for second %d (expect 0 .. 59)", sec)
-
+    if (sec < 0 || 59 < sec) \
+        rb_raise(rb_eRangeError, "Out of range for second %d (expect 0 .. 59)", sec)
 
-static VALUE ora_date_s_allocate(VALUE klass)
+static void oci8_set_ora_date(ora_date_t *od, int year, int month, int day, int hour, int minute, int second)
 {
-  ora_date_t *od;
-  return Data_Make_Struct(klass, ora_date_t, NULL, xfree, od);
+    Set_year(od, year);
+    Set_month(od, month);
+    Set_day(od, day);
+    Set_hour(od, hour);
+    Set_minute(od, minute);
+    Set_second(od, second);
 }
 
-#ifndef HAVE_RB_DEFINE_ALLOC_FUNC
-/* ruby 1.6 */
-static VALUE ora_date_s_new(int argc, VALUE *argv, VALUE klass)
+static VALUE ora_date_s_allocate(VALUE klass)
 {
-  VALUE obj = ora_date_s_allocate(klass);
-  rb_obj_call_init(obj, argc, argv);
-  return obj;
+    ora_date_t *od;
+    return Data_Make_Struct(klass, ora_date_t, NULL, xfree, od);
 }
-#endif
 
 /*
-=begin
---- OraDate.new([year [, month [, day [, hour [, min [,sec]]]]]])
-=end
-*/
+ * call-seq:
+ *   OraDate.new(year = 1, month = 1, day = 1, hour = 0, min = 0, sec = 0) -> oradate
+ *
+ * Returns an <code>OraDate</code> object initialized to the specified date and time.
+ */
 static VALUE ora_date_initialize(int argc, VALUE *argv, VALUE self)
 {
-  VALUE vyear, vmonth, vday, vhour, vmin, vsec;
-  ora_date_t *od;
-  int year, month, day, hour, min, sec;
-
-  rb_scan_args(argc, argv, "06", &vyear, &vmonth, &vday, &vhour, &vmin, &vsec);
-  /* set year */
-  if (argc > 0) {
-    year = NUM2INT(vyear);
-    Check_year(year);
-  } else {
-    year = 1;
-  }
-  /* set month */
-  if (argc > 1) {
-    month = NUM2INT(vmonth);
-    Check_month(month);
-  } else {
-    month = 1;
-  }
-  /* set day */
-  if (argc > 2) {
-    day = NUM2INT(vday);
-    Check_day(day);
-  } else {
-    day = 1;
-  }
-  /* set hour */
-  if (argc > 3) {
-    hour = NUM2INT(vhour);
-    Check_hour(hour);
-  } else {
-    hour = 0;
-  }
-  /* set minute */
-  if (argc > 4) {
-    min = NUM2INT(vmin);
-    Check_minute(min);
-  } else {
-    min = 0;
-  }
-  /* set second */
-  if (argc > 5) {
-    sec = NUM2INT(vsec);
-    Check_second(sec);
-  } else {
-    sec = 0;
-  }
-
-  Data_Get_Struct(self, ora_date_t, od);
-  oci8_set_ora_date(od, year, month, day, hour, min, sec);
-  return Qnil;
+    VALUE vyear, vmonth, vday, vhour, vmin, vsec;
+    ora_date_t *od = DATA_PTR(self);
+    int year, month, day, hour, min, sec;
+
+    rb_scan_args(argc, argv, "06", &vyear, &vmonth, &vday, &vhour, &vmin, &vsec);
+    /* set year */
+    if (argc > 0) {
+        year = NUM2INT(vyear);
+        Check_year(year);
+    } else {
+        year = 1;
+    }
+    /* set month */
+    if (argc > 1) {
+        month = NUM2INT(vmonth);
+        Check_month(month);
+    } else {
+        month = 1;
+    }
+    /* set day */
+    if (argc > 2) {
+        day = NUM2INT(vday);
+        Check_day(day);
+    } else {
+        day = 1;
+    }
+    /* set hour */
+    if (argc > 3) {
+        hour = NUM2INT(vhour);
+        Check_hour(hour);
+    } else {
+        hour = 0;
+    }
+    /* set minute */
+    if (argc > 4) {
+        min = NUM2INT(vmin);
+        Check_minute(min);
+    } else {
+        min = 0;
+    }
+    /* set second */
+    if (argc > 5) {
+        sec = NUM2INT(vsec);
+        Check_second(sec);
+    } else {
+        sec = 0;
+    }
+
+    oci8_set_ora_date(od, year, month, day, hour, min, sec);
+    return Qnil;
 }
 
+/* :nodoc: */
 static VALUE ora_date_initialize_copy(VALUE lhs, VALUE rhs)
 {
-  ora_date_t *l, *r;
+    ora_date_t *l, *r;
 
-#ifdef HAVE_RB_DEFINE_ALLOC_FUNC
-  /* ruby 1.8 */
-  rb_obj_init_copy(lhs, rhs);
-#endif
-  Data_Get_Struct(lhs, ora_date_t, l);
-  Data_Get_Struct(rhs, ora_date_t, r);
-  memcpy(l, r, sizeof(ora_date_t));
-  return lhs;
-}  
-
-#ifndef HAVE_RB_DEFINE_ALLOC_FUNC
-/* ruby 1.6 */
-static VALUE ora_date_clone(VALUE self)
-{
-  VALUE obj = ora_date_s_allocate(CLASS_OF(self));
-  return ora_date_initialize_copy(obj, self);
+    rb_obj_init_copy(lhs, rhs);
+    Data_Get_Struct(lhs, ora_date_t, l);
+    Data_Get_Struct(rhs, ora_date_t, r);
+    memcpy(l, r, sizeof(ora_date_t));
+    return lhs;
 }
-#endif
 
 /*
-=begin
---- OraDate.now()
-=end
-*/
-static VALUE ora_date_s_now(int argc, VALUE *argv)
+ * call-seq:
+ *   OraDate.now() -> oradate
+ *
+ * Returns an <code>OraDate</code> object initialized to the
+ * current local time.
+ */
+static VALUE ora_date_s_now(int argc, VALUE *argv, VALUE klass)
 {
-  ora_date_t *od;
-  VALUE obj;
-  int year, month, day, hour, min, sec;
-  time_t tm;
-  struct tm *tp;
-
-  tm = time(0);
-  tp = localtime(&tm);
-  year = tp->tm_year + 1900;
-  month = tp->tm_mon + 1;
-  day = tp->tm_mday;
-  hour = tp->tm_hour;
-  min = tp->tm_min;
-  sec = tp->tm_sec;
-
-  obj = Data_Make_Struct(cOraDate, ora_date_t, NULL, xfree, od);
-  oci8_set_ora_date(od, year, month, day, hour, min, sec);
-  return obj;
+    VALUE obj = ora_date_s_allocate(klass);
+    ora_date_t *od = DATA_PTR(obj);
+    time_t tm = time(0);
+    int year, month, day, hour, min, sec;
+#ifdef HAVE_LOCALTIME_R
+    struct tm t;
+    localtime_r(&tm, &t);
+#define tp (&t)
+#else
+    struct tm *tp;
+    tp = localtime(&tm);
+#endif
+    year = tp->tm_year + 1900;
+    month = tp->tm_mon + 1;
+    day = tp->tm_mday;
+    hour = tp->tm_hour;
+    min = tp->tm_min;
+    sec = tp->tm_sec;
+
+    oci8_set_ora_date(od, year, month, day, hour, min, sec);
+    return obj;
 }
 
 /*
-=begin
---- OraDate#to_s()
-=end
-*/
+ * call-seq:
+ *   oradate.to_s -> string
+ *
+ * Returns a string representing <i>oradate</i>.
+ * The string format is 'yyyy/mm/dd hh:mi:ss'.
+ */
 static VALUE ora_date_to_s(VALUE self)
 {
-  ora_date_t *od;
-  char buf[30];
-  
-  Data_Get_Struct(self, ora_date_t, od);
-  sprintf(buf, "%04d/%02d/%02d %02d:%02d:%02d", Get_year(od), Get_month(od),
-	  Get_day(od), Get_hour(od), Get_minute(od), Get_second(od));
-  return rb_str_new2(buf);
+    ora_date_t *od;
+    char buf[30];
+
+    Data_Get_Struct(self, ora_date_t, od);
+    sprintf(buf, "%04d/%02d/%02d %02d:%02d:%02d", Get_year(od), Get_month(od),
+            Get_day(od), Get_hour(od), Get_minute(od), Get_second(od));
+    return rb_usascii_str_new_cstr(buf);
 }
 
 /*
-=begin
---- OraDate#to_a()
-=end
-*/
+ * call-seq:
+ *   oradate.to_a -> array
+ *
+ * Returns a 6-element <i>array</i> of values for <i>oradate</i>:
+ * {<code>[year, month, day, hour, minute, second]</code>}.
+ */
 static VALUE ora_date_to_a(VALUE self)
 {
-  ora_date_t *od;
-  VALUE ary[6];
-  
-  Data_Get_Struct(self, ora_date_t, od);
-  ary[0] = INT2FIX(Get_year(od));
-  ary[1] = INT2FIX(Get_month(od));
-  ary[2] = INT2FIX(Get_day(od));
-  ary[3] = INT2FIX(Get_hour(od));
-  ary[4] = INT2FIX(Get_minute(od));
-  ary[5] = INT2FIX(Get_second(od));
-  return rb_ary_new4(6, ary);
+    ora_date_t *od;
+    VALUE ary[6];
+
+    Data_Get_Struct(self, ora_date_t, od);
+    ary[0] = INT2FIX(Get_year(od));
+    ary[1] = INT2FIX(Get_month(od));
+    ary[2] = INT2FIX(Get_day(od));
+    ary[3] = INT2FIX(Get_hour(od));
+    ary[4] = INT2FIX(Get_minute(od));
+    ary[5] = INT2FIX(Get_second(od));
+    return rb_ary_new4(6, ary);
 }
 
-#define DEFINE_GETTER_FUNC(where) \
-static VALUE ora_date_##where(VALUE self) \
-{ \
-  ora_date_t *od; \
- \
-  Data_Get_Struct(self, ora_date_t, od); \
-  return INT2FIX(Get_##where(od)); \
+/*
+ * call-seq:
+ *   oradate.year -> fixnum
+ *
+ * Returns the year (-4712..9999) for <i>oradate</i>.
+ */
+static VALUE ora_date_year(VALUE self)
+{
+    ora_date_t *od;
+
+    Data_Get_Struct(self, ora_date_t, od);
+    return INT2FIX(Get_year(od));
 }
 
-#define DEFINE_SETTER_FUNC(where) \
-static VALUE ora_date_set_##where(VALUE self, VALUE val) \
-{ \
-  ora_date_t *od; \
-  int v; \
- \
-  v = NUM2INT(val); \
-  Check_##where(v); \
-  Data_Get_Struct(self, ora_date_t, od); \
-  Set_##where(od, v); \
-  return self; \
+/*
+ * call-seq:
+ *   oradate.year = fixnum
+ *
+ * Sets the year (-4712..9999) for <i>oradate</i>.
+ */
+static VALUE ora_date_set_year(VALUE self, VALUE val)
+{
+    ora_date_t *od;
+    int v;
+
+    v = NUM2INT(val);
+    Check_year(v);
+    Data_Get_Struct(self, ora_date_t, od);
+    Set_year(od, v);
+    return self;
 }
 
 /*
-=begin
---- OraDate#year
-=end
-*/
-DEFINE_GETTER_FUNC(year)
-DEFINE_SETTER_FUNC(year)
+ * call-seq:
+ *   oradate.month -> fixnum
+ *
+ * Returns the month of the year (1..12) for <i>oradate</i>.
+ */
+static VALUE ora_date_month(VALUE self)
+{
+    ora_date_t *od;
+
+    Data_Get_Struct(self, ora_date_t, od);
+    return INT2FIX(Get_month(od));
+}
 
 /*
-=begin
---- OraDate#month
-=end
-*/
-DEFINE_GETTER_FUNC(month)
-DEFINE_SETTER_FUNC(month)
+ * call-seq:
+ *   oradate.month = fixnum
+ *
+ * Sets the month of the year (1..12) for <i>oradate</i>.
+ */
+static VALUE ora_date_set_month(VALUE self, VALUE val)
+{
+    ora_date_t *od;
+    int v;
+
+    v = NUM2INT(val);
+    Check_month(v);
+    Data_Get_Struct(self, ora_date_t, od);
+    Set_month(od, v);
+    return self;
+}
 
 /*
-=begin
---- OraDate#day
-=end
-*/
-DEFINE_GETTER_FUNC(day)
-DEFINE_SETTER_FUNC(day)
+ * call-seq:
+ *   oradate.day -> fixnum
+ *
+ * Returns the day of the month (1..31) for <i>oradate</i>.
+ */
+static VALUE ora_date_day(VALUE self)
+{
+    ora_date_t *od;
+
+    Data_Get_Struct(self, ora_date_t, od);
+    return INT2FIX(Get_day(od));
+}
 
 /*
-=begin
---- OraDate#hour
-=end
-*/
-DEFINE_GETTER_FUNC(hour)
-DEFINE_SETTER_FUNC(hour)
+ * call-seq:
+ *   oradate.day = fixnum
+ *
+ * Sets the day of the month (1..31) for <i>oradate</i>.
+ */
+static VALUE ora_date_set_day(VALUE self, VALUE val)
+{
+    ora_date_t *od;
+    int v;
+
+    v = NUM2INT(val);
+    Check_day(v);
+    Data_Get_Struct(self, ora_date_t, od);
+    Set_day(od, v);
+    return self;
+}
 
 /*
-=begin
---- OraDate#minute
-=end
-*/
-DEFINE_GETTER_FUNC(minute)
-DEFINE_SETTER_FUNC(minute)
+ * call-seq:
+ *   oradate.hour -> fixnum
+ *
+ * Returns the hour of the day (0..23) for <i>oradate</i>.
+ */
+static VALUE ora_date_hour(VALUE self)
+{
+    ora_date_t *od;
+
+    Data_Get_Struct(self, ora_date_t, od);
+    return INT2FIX(Get_hour(od));
+}
 
 /*
-=begin
---- OraDate#second
-=end
-*/
-DEFINE_GETTER_FUNC(second)
-DEFINE_SETTER_FUNC(second)
+ * call-seq:
+ *   oradate.hour = fixnum
+ *
+ * Sets the hour of the day (0..23) for <i>oradate</i>.
+ */
+static VALUE ora_date_set_hour(VALUE self, VALUE val)
+{
+    ora_date_t *od;
+    int v;
+
+    v = NUM2INT(val);
+    Check_hour(v);
+    Data_Get_Struct(self, ora_date_t, od);
+    Set_hour(od, v);
+    return self;
+}
 
 /*
-=begin
---- OraDate#trunc()
-=end
-*/
-static VALUE ora_date_trunc(VALUE self)
+ * call-seq:
+ *   oradate.minute -> fixnum
+ *
+ * Returns the minute of the hour (0..59) for <i>oradate</i>.
+ */
+static VALUE ora_date_minute(VALUE self)
 {
-  ora_date_t *od;
+    ora_date_t *od;
 
-  Data_Get_Struct(self, ora_date_t, od);
-  od->hour = 1;
-  od->minute = 1;
-  od->second = 1;
-  return self;
+    Data_Get_Struct(self, ora_date_t, od);
+    return INT2FIX(Get_minute(od));
 }
 
-static VALUE ora_date_hash(VALUE self)
+/*
+ * call-seq:
+ *   oradate.minute = fixnum
+ *
+ * Sets the minute of the hour (0..59) for <i>oradate</i>.
+ */
+static VALUE ora_date_set_minute(VALUE self, VALUE val)
+{
+    ora_date_t *od;
+    int v;
+
+    v = NUM2INT(val);
+    Check_minute(v);
+    Data_Get_Struct(self, ora_date_t, od);
+    Set_minute(od, v);
+    return self;
+}
+
+/*
+ * call-seq:
+ *   oradate.second -> fixnum
+ *
+ * Returns the second of the minute (0..59) for <i>oradate</i>.
+ */
+static VALUE ora_date_second(VALUE self)
 {
-  ora_date_t *od;
-  unsigned int v;
-
-  Data_Get_Struct(self, ora_date_t, od);
-  v = (od->century <<  8)
-    + (od->year    << 15)
-    + (od->month   << 22)
-    + (od->day     << 26)
-    + (od->hour    << 12)
-    + (od->minute  <<  6)
-    + (od->second  <<  0);
-  return INT2FIX(v);
+    ora_date_t *od;
+
+    Data_Get_Struct(self, ora_date_t, od);
+    return INT2FIX(Get_second(od));
+}
+
+/*
+ * call-seq:
+ *   oradate.second = fixnum
+ *
+ * Sets the second of the minute (0..59) for <i>oradate</i>.
+ */
+static VALUE ora_date_set_second(VALUE self, VALUE val)
+{
+    ora_date_t *od;
+    int v;
+
+    v = NUM2INT(val);
+    Check_second(v);
+    Data_Get_Struct(self, ora_date_t, od);
+    Set_second(od, v);
+    return self;
+}
+
+/*
+ * call-seq:
+ *   oradate.trunc
+ *
+ * Truncates hour, minute and second to zero for <i>oradate</i>.
+ *
+ *   oradate = OraDate.now   # 2008/07/17 11:07:30
+ *   oradate.trunc           # 2008/07/17 00:00:00
+ */
+static VALUE ora_date_trunc(VALUE self)
+{
+    ora_date_t *od;
+
+    Data_Get_Struct(self, ora_date_t, od);
+    od->hour = 1;
+    od->minute = 1;
+    od->second = 1;
+    return self;
 }
 
 /*
-=begin
---- OraDate#<=>(other)
-=end
-*/
+ * call-seq:
+ *   oradate1 <=> oradate2 -> -1, 0, +1
+ *
+ * Comparison---Compares <i>oradate1</i> with <i>oradate2</i>.
+ * Other comparison operators are available because
+ * <code>Comparable</code> module is included.
+ */
 static VALUE ora_date_cmp(VALUE self, VALUE val)
 {
-  ora_date_t *od1, *od2;
-  Data_Get_Struct(self, ora_date_t, od1);
-  Data_Get_Struct(val, ora_date_t, od2);
-  if (od1->century < od2->century) return INT2FIX(-1);
-  if (od1->century > od2->century) return INT2FIX(1);
-  if (od1->year < od2->year) return INT2FIX(-1);
-  if (od1->year > od2->year) return INT2FIX(1);
-  if (od1->month < od2->month) return INT2FIX(-1);
-  if (od1->month > od2->month) return INT2FIX(1);
-  if (od1->day < od2->day) return INT2FIX(-1);
-  if (od1->day > od2->day) return INT2FIX(1);
-  if (od1->hour < od2->hour) return INT2FIX(-1);
-  if (od1->hour > od2->hour) return INT2FIX(1);
-  if (od1->minute < od2->minute) return INT2FIX(-1);
-  if (od1->minute > od2->minute) return INT2FIX(1);
-  if (od1->second < od2->second) return INT2FIX(-1);
-  if (od1->second > od2->second) return INT2FIX(1);
-  return INT2FIX(0);
+    ora_date_t *od1, *od2;
+    Data_Get_Struct(self, ora_date_t, od1);
+    Check_Object(val, cOraDate);
+    Data_Get_Struct(val, ora_date_t, od2);
+    if (od1->century < od2->century) return INT2FIX(-1);
+    if (od1->century > od2->century) return INT2FIX(1);
+    if (od1->year < od2->year) return INT2FIX(-1);
+    if (od1->year > od2->year) return INT2FIX(1);
+    if (od1->month < od2->month) return INT2FIX(-1);
+    if (od1->month > od2->month) return INT2FIX(1);
+    if (od1->day < od2->day) return INT2FIX(-1);
+    if (od1->day > od2->day) return INT2FIX(1);
+    if (od1->hour < od2->hour) return INT2FIX(-1);
+    if (od1->hour > od2->hour) return INT2FIX(1);
+    if (od1->minute < od2->minute) return INT2FIX(-1);
+    if (od1->minute > od2->minute) return INT2FIX(1);
+    if (od1->second < od2->second) return INT2FIX(-1);
+    if (od1->second > od2->second) return INT2FIX(1);
+    return INT2FIX(0);
 }
 
+/* :nodoc: */
+static VALUE ora_date_hash(VALUE self)
+{
+    ora_date_t *od;
+    unsigned int v;
+
+    Data_Get_Struct(self, ora_date_t, od);
+    v = (od->century <<  8)
+        + (od->year    << 15)
+        + (od->month   << 22)
+        + (od->day     << 26)
+        + (od->hour    << 12)
+        + (od->minute  <<  6)
+        + (od->second  <<  0);
+    return INT2FIX(v);
+}
+
+/*
+ * call-seq:
+ *   oradate._dump -> string
+ *
+ * Dumps <i>oradate</i> for marshaling.
+ */
 static VALUE ora_date_dump(int argc, VALUE *argv, VALUE self)
 {
-  ora_date_t *od;
-  Data_Get_Struct(self, ora_date_t, od);
-  return rb_str_new((const char*)od, sizeof(ora_date_t));
-}  
+    ora_date_t *od;
+    Data_Get_Struct(self, ora_date_t, od);
+    return rb_str_new((const char*)od, sizeof(ora_date_t)); /* ASCII-8BIT */
+}
 
+/*
+ * call-seq:
+ *   OraDate._load(string) -> oradate
+ *
+ * Unmarshals a dumped <code>OraDate</code> object.
+ */
 static VALUE ora_date_s_load(VALUE klass, VALUE str)
 {
-  ora_date_t *od;
-  VALUE obj;
-
-  Check_Type(str, T_STRING);
-  if (RSTRING_LEN(str) != sizeof(ora_date_t)) {
-    rb_raise(rb_eTypeError, "marshaled OraDate format differ");
-  }
-  obj = Data_Make_Struct(cOraDate, ora_date_t, NULL, xfree, od);
-  memcpy(od, RSTRING_PTR(str), sizeof(ora_date_t));
-  return obj;
-}  
+    ora_date_t *od;
+    VALUE obj;
+
+    Check_Type(str, T_STRING);
+    if (RSTRING_LEN(str) != sizeof(ora_date_t)) {
+        rb_raise(rb_eTypeError, "marshaled OraDate format differ");
+    }
+    obj = Data_Make_Struct(cOraDate, ora_date_t, NULL, xfree, od);
+    memcpy(od, RSTRING_PTR(str), sizeof(ora_date_t));
+    return obj;
+}
 
-void Init_ora_date(void)
+/*
+ * Document-class: OCI8::BindType::OraDate
+ *
+ * This is a helper class to bind OraDate as Oracle's <tt>DATE</tt> datatype.
+ *
+ */
+static VALUE bind_oradate_get(oci8_bind_t *obind, void *data, void *null_struct)
 {
-#ifdef HAVE_RB_DEFINE_ALLOC_FUNC
-  /* ruby 1.8 */
-  rb_define_alloc_func(cOraDate, RUBY_METHOD_FUNC(ora_date_s_allocate));
-  rb_define_method(cOraDate, "initialize", ora_date_initialize, -1);
-  rb_define_method(cOraDate, "initialize_copy", ora_date_initialize_copy, 1);
-#else
-  /* ruby 1.6 */
-  rb_define_singleton_method(cOraDate, "new", ora_date_s_new, -1);
-  rb_define_method(cOraDate, "initialize", ora_date_initialize, -1);
-  rb_define_method(cOraDate, "clone", ora_date_clone, 0);
-  rb_define_method(cOraDate, "dup", ora_date_clone, 0);
-#endif
+    ora_date_t *od;
 
-  rb_define_singleton_method(cOraDate, "now", ora_date_s_now, 0);
-  rb_define_method(cOraDate, "to_s", ora_date_to_s, 0);
-  rb_define_method(cOraDate, "to_a", ora_date_to_a, 0);
+    VALUE obj = Data_Make_Struct(cOraDate, ora_date_t, NULL, xfree, od);
+    memcpy(od, data, sizeof(ora_date_t));
+    return obj;
+}
 
-  rb_define_method(cOraDate, "year", ora_date_year, 0);
-  rb_define_method(cOraDate, "year=", ora_date_set_year, 1);
+static void bind_oradate_set(oci8_bind_t *obind, void *data, void **null_structp, VALUE val)
+{
+    ora_date_t *od;
 
-  rb_define_method(cOraDate, "month", ora_date_month, 0);
-  rb_define_method(cOraDate, "month=", ora_date_set_month, 1);
+    Check_Object(val, cOraDate);
+    Data_Get_Struct(val, ora_date_t, od);
+    memcpy(data, od, sizeof(ora_date_t));
+}
 
-  rb_define_method(cOraDate, "day", ora_date_day, 0);
-  rb_define_method(cOraDate, "day=", ora_date_set_day, 1);
+static void bind_oradate_init(oci8_bind_t *obind, VALUE svc, VALUE val, VALUE length)
+{
+    obind->value_sz = sizeof(ora_date_t);
+    obind->alloc_sz = sizeof(ora_date_t);
+}
 
-  rb_define_method(cOraDate, "hour", ora_date_hour, 0);
-  rb_define_method(cOraDate, "hour=", ora_date_set_hour, 1);
+static void bind_oradate_init_elem(oci8_bind_t *obind, VALUE svc)
+{
+    static const ora_date_t julian_day_0 = {100-47, 100-12, 1, 1, 1, 1, 1};
+    ub4 idx = 0;
+    do {
+        memcpy((ora_date_t*)obind->valuep + idx, &julian_day_0, sizeof(ora_date_t));
+    } while (++idx < obind->maxar_sz);
+}
 
-  rb_define_method(cOraDate, "minute", ora_date_minute, 0);
-  rb_define_method(cOraDate, "minute=", ora_date_set_minute, 1);
+static const oci8_bind_class_t bind_oradate_class = {
+    {
+        NULL,
+        oci8_bind_free,
+        sizeof(oci8_bind_t)
+    },
+    bind_oradate_get,
+    bind_oradate_set,
+    bind_oradate_init,
+    bind_oradate_init_elem,
+    NULL,
+    NULL,
+    NULL,
+    SQLT_DAT,
+};
 
-  rb_define_method(cOraDate, "second", ora_date_second, 0);
-  rb_define_method(cOraDate, "second=", ora_date_set_second, 1);
+void Init_ora_date(void)
+{
+    cOraDate = rb_define_class("OraDate", rb_cObject);
 
-  rb_define_method(cOraDate, "trunc", ora_date_trunc, 0);
+    rb_define_alloc_func(cOraDate, ora_date_s_allocate);
+    rb_define_method(cOraDate, "initialize", ora_date_initialize, -1);
+    rb_define_method(cOraDate, "initialize_copy", ora_date_initialize_copy, 1);
+    rb_define_singleton_method(cOraDate, "now", ora_date_s_now, 0);
+    rb_define_method(cOraDate, "to_s", ora_date_to_s, 0);
+    rb_define_method(cOraDate, "to_a", ora_date_to_a, 0);
 
-  rb_define_method(cOraDate, "<=>", ora_date_cmp, 1);
-  rb_include_module(cOraDate, rb_mComparable);
+    rb_define_method(cOraDate, "year", ora_date_year, 0);
+    rb_define_method(cOraDate, "year=", ora_date_set_year, 1);
 
-  rb_define_method(cOraDate, "hash", ora_date_hash, 0);
+    rb_define_method(cOraDate, "month", ora_date_month, 0);
+    rb_define_method(cOraDate, "month=", ora_date_set_month, 1);
 
-  rb_define_method(cOraDate, "_dump", ora_date_dump, -1);
-  rb_define_singleton_method(cOraDate, "_load", ora_date_s_load, 1);
-}
+    rb_define_method(cOraDate, "day", ora_date_day, 0);
+    rb_define_method(cOraDate, "day=", ora_date_set_day, 1);
 
-void oci8_set_ora_date(ora_date_t *od, int year, int month, int day, int hour, int minute, int second)
-{
-  Set_year(od, year);
-  Set_month(od, month);
-  Set_day(od, day);
-  Set_hour(od, hour);
-  Set_minute(od, minute);
-  Set_second(od, second);
-}
+    rb_define_method(cOraDate, "hour", ora_date_hour, 0);
+    rb_define_method(cOraDate, "hour=", ora_date_set_hour, 1);
 
-void oci8_get_ora_date(ora_date_t *od, int *year, int *month, int *day, int *hour, int *minute, int *second)
-{
-  *year = Get_year(od);
-  *month = Get_month(od);
-  *day = Get_day(od);
-  *hour = Get_hour(od);
-  *minute = Get_minute(od);
-  *second = Get_second(od);
+    rb_define_method(cOraDate, "minute", ora_date_minute, 0);
+    rb_define_method(cOraDate, "minute=", ora_date_set_minute, 1);
+
+    rb_define_method(cOraDate, "second", ora_date_second, 0);
+    rb_define_method(cOraDate, "second=", ora_date_set_second, 1);
+
+    rb_define_method(cOraDate, "trunc", ora_date_trunc, 0);
+
+    rb_define_method(cOraDate, "<=>", ora_date_cmp, 1);
+    rb_include_module(cOraDate, rb_mComparable);
+
+    rb_define_method(cOraDate, "hash", ora_date_hash, 0);
+
+    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);
 }