ruby-oci8 1.0.3 → 1.0.4

data/ChangeLog

@@ -1,3 +1,60 @@
+2009-02-08  KUBO Takehiro  <kubo@jiubao.org>
+	* NEWS: add changes between 1.0.3 and 1.0.4.
+	* VERSION: change version to 1.0.4.
+	* dist-files: add newly added file names which must be included
+	    in gem or tar.gz packages.
+
+2009-02-01  KUBO Takehiro  <kubo@jiubao.org>
+	* lib/dbd/OCI8.rb: add code for ruby-dbi 0.4 type conversion.
+	* test/test_dbi.rb: suppress deprecated warnings while running
+	    test_bind_dbi_data_type.
+	* test/test_dbi_clob.rb: fix a problem when running this
+	    file directly.
+
+2009-01-31  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/oraconf.rb: fix for Oracle 11.1.0.7.0 instant
+	    client rpm package. The directory tree is a bit different
+	    with that of 11.1.0.6.0 or earlier.
+	    (reported by Luis Parravicini.)
+
+2009-01-31  KUBO Takehiro  <kubo@jiubao.org>
+	* lib/DBD/OCI8/OCI8.rb: renamed to lib/dbd/OCI8.rb.
+	* lib/dbd/OCI8.rb: 1. renamed from lib/DBD/OCI8/OCI8.rb
+	    2. fix USED_DBD_VERSION from 0.2 to 0.4.
+	    3. add DBI::DBD::OCI8.driver_name
+	    (changes for ruby-dbi 0.4 contributed by James Cao.)
+
+2008-12-30  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/handle.c, ext/oci8/oci8.h, ext/oci8/svcctx.c: add
+	    OCISvcCtx.pid, which returns id of the process where the
+	    OCISvcCtx is created.
+	* lib/oci8.rb.in: add check code to ensure that the process id
+	    is not changed.
+
+2008-12-30  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/const.c, ext/oci8/handle.c: suppress compilation warnings.
+	    (contributed by Daniel Berger)
+
+2008-12-30  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/oraconf.rb: add code to check the cpu type of Mac OS X
+	    libclntsh.dylib.
+
+2008-12-14  KUBO Takehiro  <kubo@jiubao.org>
+	* lib/oci8.rb.in:
+	    1. fix to fetch a rowid column as s String.
+	    2. change the return type of OCI8::Cursor#rowid from OCIRowid
+	       to String. It is a local call on Oracle 9.0 or upper.
+	       But on Oracle 8.x client, it needs one network roundtrip
+	       to convert OCIRowid to String on server side.
+	    3. fix OCI8#describe_table to prevent OCIStillExecuting when
+	       non-blocking mode is enabled and it needs a time to
+	       retrieve table information.
+	* ext/oci8/extconf.rb, ext/oci8/oci8.c: add OCIRowid#to_s
+	    when OCIRowidToChar() is available.
+	* test/test_all.rb, test/test_rowid.rb: add a rowid test case.
+	* test/test_dbi_clob.rb: fix to pass tests when the test directory
+	    path is too long.
+
 2008-08-10  KUBO Takehiro  <kubo@jiubao.org>
 	* NEWS: add changes between 1.0.2 and 1.0.3.
 	* VERSION: change version to 1.0.3.
@@ -12,7 +69,7 @@
 2008-08-09  KUBO Takehiro  <kubo@jiubao.org>
 	* ext/oci8/lob.c: fix OCILobLocator#getLength for a lob over 1GB,
 	    which affect OCI8::LOB#size and OCI8::LOB#read. fix
-	    OCILobLocator#read and OCILobLocator#write to set offset over 2BG,
+	    OCILobLocator#read and OCILobLocator#write to set offset over 2GB,
 	    which affect OCI8::LOB#read and OCI8::LOB#write.
 	    (This probmem was reported by Jonathan Hadders.)
 

data/NEWS

@@ -1,3 +1,41 @@
+1.0.4:
+
+1. [dbi] support ruby-dbi 0.4
+   (Thanks to James Cao and Peter Zingg.)
+
+   Ruby-dbi 0.4 is supported by DBD::OCI8 after 6 months from the
+   release of 0.4.
+
+   If you are using ruby-dbi 0.1.1, you need to copy dbd/OCI8.rb
+   to DBD/OCI8/OCI8.rb. The file itself works fine with ruby-dbi
+   0.1.1, but the dbi cannot find the file by default.
+
+2. Rowid column data are fetched as a String by default.
+
+3. The return type of OCI8::Cursor#rowid is changed from OCIRowid
+   to String.
+
+   Note: It needs one network roundtrip to convert OCIRowid to
+   String on server side when using Oracle 8.x client.
+   On Oracle 9.0 or upper it is converted in the client side.
+
+4. An exception is raised if a connection is used in a process which is
+   different with a process to establish the connection.
+
+   If you encounter an exception "The connection cannot be reused in the
+   forked process," see the following link.
+
+     http://groups.google.com/group/phusion-passenger/browse_thread/thread/b00d4770bc1d00b8
+
+5. fix for 11.1.0.7.0 instant rpm package.
+   (reported by Luis Parravicini.)
+
+   The directory tree is a bit different with that of 11.1.0.6.0
+   or earlier.
+
+6. suppress compilation warnings.
+   (contributed by Daniel Berger)
+
 1.0.3:
 
 1. add workaround code for a losing character problem when reading CLOB.
@@ -22,7 +60,7 @@
    OraNumber#to_json is added for Rails.
 
 4. [dbi] fix a problem when using Oracle 8i and ruby-dbi.
-   (reported by Glauco MagnelliRemi Gagnon.)
+   (reported by Glauco Magnelli.)
 
 1.0.2:
 

data/VERSION

@@ -1 +1 @@
-1.0.3
+1.0.4

data/dist-files

@@ -39,7 +39,7 @@ ext/oci8/session.c
 ext/oci8/stmt.c
 ext/oci8/svcctx.c
 lib/oci8.rb.in
-lib/DBD/OCI8/OCI8.rb
+lib/dbd/OCI8.rb
 support/README
 support/runit/assert.rb
 support/runit/cui/testrunner.rb
@@ -68,3 +68,4 @@ test/test_oci8.rb
 test/test_oradate.rb
 test/test_oranumber.rb
 test/test_metadata.rb
+test/test_rowid.rb

data/ext/oci8/const.c

@@ -45,7 +45,7 @@ static oci8_names_t oci8_typecode[] = {
 static VALUE oci8_make_names(oci8_names_t *names, size_t size)
 {
   volatile VALUE ary;
-  int i;
+  unsigned int i;
 
   ary = rb_ary_new();
   for (i = 0;i < size;i++)
@@ -55,7 +55,7 @@ static VALUE oci8_make_names(oci8_names_t *names, size_t size)
 
 void  Init_oci8_const(void)
 {
-  int i;
+  unsigned int i;
 
   oci8_id_code = rb_intern("code");
   oci8_id_define_array = rb_intern("define_array");

data/ext/oci8/extconf.rb

@@ -77,6 +77,8 @@ have_func("OCILobCreateTemporary")
 have_func("OCILobGetChunkSize")
 have_func("OCILobLocatorAssign")
 
+have_func("OCIRowidToChar")
+
 $defs.push("-DHAVE_OCIRESET") unless /80./ =~ oraconf.version
 
 # Checking gcc or not

data/ext/oci8/handle.c

@@ -10,10 +10,20 @@ See ((<Class Hierarchy>)).
 =end
 */
 #include "oci8.h"
+#ifdef HAVE_UNISTD_H
+#include <unistd.h> /* getpid() */
+#endif
+
+#ifdef WIN32
+#ifndef getpid
+extern rb_pid_t rb_w32_getpid(void);
+#define getpid() rb_w32_getpid()
+#endif
+#endif
 
 static void oci8_handle_do_free(oci8_handle_t *h)
 {
-  int i;
+  unsigned int i;
   if (h->type == 0) {
     return;
   }
@@ -104,7 +114,7 @@ VALUE oci8_s_new(VALUE self)
 static void oci8_handle_mark(oci8_handle_t *h)
 {
   oci8_bind_handle_t *bh;
-  int i;
+  unsigned int i;
 
   switch (h->type) {
   case OCI_HTYPE_SVCCTX:
@@ -149,6 +159,7 @@ oci8_handle_t *oci8_make_handle(ub4 type, dvoid *hp, OCIError *errhp, oci8_handl
     break;
   case OCI_HTYPE_SVCCTX:
     obj = Data_Make_Struct(cOCISvcCtx, oci8_handle_t, oci8_handle_mark, oci8_handle_cleanup, h);
+    h->u.svcctx.pid = getpid();
     break;
   case OCI_HTYPE_STMT:
     obj = Data_Make_Struct(cOCIStmt, oci8_handle_t, oci8_handle_mark, oci8_handle_cleanup, h);
@@ -221,8 +232,8 @@ oci8_handle_t *oci8_make_handle(ub4 type, dvoid *hp, OCIError *errhp, oci8_handl
 
 void oci8_link(oci8_handle_t *parent, oci8_handle_t *child)
 {
-  int i;
-  int new_size;
+  unsigned int i;
+  int new_size, n;
 
   if (parent == NULL)
     return;
@@ -238,8 +249,8 @@ void oci8_link(oci8_handle_t *parent, oci8_handle_t *child)
   new_size = parent->size + CHILDREN_ARRAY_GROW_SIZE;
   parent->children = xrealloc(parent->children, sizeof(oci8_handle_t *) * new_size);
   parent->children[parent->size] = child;
-  for (i = parent->size + 1;i < new_size;i++) {
-    parent->children[i] = NULL;
+  for (n = parent->size + 1;n < new_size;n++) {
+    parent->children[n] = NULL;
   }
   parent->size = new_size;
   return;
@@ -248,7 +259,7 @@ void oci8_link(oci8_handle_t *parent, oci8_handle_t *child)
 void oci8_unlink(oci8_handle_t *self)
 {
   oci8_handle_t *parent = self->parent;
-  int i;
+  unsigned int i;
 
   if (self->parent == NULL)
     return;

data/ext/oci8/oci8.c

@@ -77,6 +77,8 @@ VALUE eOCISuccessWithInfo;
 VALUE cOraDate;
 VALUE cOraNumber;
 
+static void Init_OCIRowid(void);
+
 void
 Init_oci8lib()
 {
@@ -131,7 +133,46 @@ Init_oci8lib()
   Init_ora_date();
   Init_ora_number();
 
+  Init_OCIRowid();
+
 #ifdef DEBUG_CORE_FILE
   signal(SIGSEGV, SIG_DFL);
 #endif
 }
+
+#if defined(WIN32)
+typedef sword (*OCIRowidToChar_func_t)(OCIRowid *rowidDesc, OraText *outbfp, ub2 *outbflp, OCIError *errhp);
+static OCIRowidToChar_func_t OCIRowidToChar_func;
+#define OCIRowidToChar OCIRowidToChar_func
+#endif
+
+#if defined(WIN32) || defined(HAVE_OCIROWIDTOCHAR)
+static VALUE oci8_rowid_to_s(VALUE self)
+{
+  oci8_handle_t *h;
+  char buf[64];
+  ub2 buflen = sizeof(buf);
+  sword rv;
+
+  Get_Handle(self, h);
+  rv = OCIRowidToChar(h->hp, (text*)buf, &buflen, h->errhp);
+  if (rv != OCI_SUCCESS)
+    oci8_raise(h->errhp, rv, NULL);
+  return rb_str_new(buf, buflen);
+}
+#endif
+
+static void Init_OCIRowid(void)
+{
+#if defined(WIN32)
+  HANDLE hModule = GetModuleHandle("OCI.DLL");
+  if (hModule != NULL) {
+    OCIRowidToChar_func = (OCIRowidToChar_func_t)GetProcAddress(hModule, "OCIRowidToChar");
+  }
+  if (OCIRowidToChar_func != NULL) {
+    rb_define_method(cOCIRowid, "to_s", oci8_rowid_to_s, 0);
+  }
+#elif defined(HAVE_OCIROWIDTOCHAR)
+  rb_define_method(cOCIRowid, "to_s", oci8_rowid_to_s, 0);
+#endif
+}

data/ext/oci8/oci8.h

@@ -10,6 +10,14 @@
 #include "rubyio.h"
 #include "intern.h"
 
+#ifndef rb_pid_t
+#ifdef WIN32
+#define rb_pid_t int
+#else
+#define rb_pid_t pid_t
+#endif
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #ifdef __cplusplus
@@ -134,6 +142,9 @@ struct oci8_handle {
       int char_width;
     } lob_locator;
 #endif
+    struct {
+      rb_pid_t pid;
+    } svcctx;
   } u;
 };
 typedef struct oci8_handle oci8_handle_t;

data/ext/oci8/oraconf.rb

@@ -110,8 +110,23 @@ class MiniSOReader
       when "MZ"
         # Windows
         read_pe(f)
+      when "\x02\x10"
+        # HP-UX PA-RISC1.1
+        read_parisc(f)
+      when "\xfe\xed"
+        # Big-endian Mach-O File
+        read_mach_o_be(f)
+      when "\xce\xfa"
+        # 32-bit Little-endian Mach-O File
+        read_mach_o_le(f, 32)
+      when "\xcf\xfa"
+        # 64-bit Little-endian Mach-O File
+        read_mach_o_le(f, 64)
+      when "\xca\xfe"
+        # Universal binary
+        read_mach_o_unversal(f)
       else
-        # HP-UX(32-bit), AIX, Mac OS X and Tru64
+        # AIX and Tru64
         raise format("unknown file header: %02x %02x", file_header[0], file_header[1])
       end
     ensure
@@ -202,6 +217,79 @@ class MiniSOReader
       raise "Invalid coff machine: #{machine}"
     end
   end
+
+  # HP-UX PA-RISC(32 bit)
+  def read_parisc(f)
+    # 0-1 system_id  - CPU_PA_RISC1_1
+    @file_format = :pa_risc
+    # 2-3 a_magic    - SHL_MAGIC
+    raise 'invalid a_magic' if f.read(2).unpack('n')[0] != 0x10e
+    @bits = 32
+    @endian = :big
+    @cpu = :parisc
+  end
+
+  # Big-endian Mach-O File
+  def read_mach_o_be(f)
+    @file_format = :mach_o
+    @endian = :big
+    case f.read(2)
+    when "\xfa\xce" # feedface
+      @cpu = :ppc
+      @bits = 32
+    when "\xfa\xcf" # feedfacf
+      @cpu = :ppc64
+      @bits = 64
+    else
+      raise "unknown file format"
+    end
+  end
+
+  def read_mach_o_le(f, bits)
+    @file_format = :mach_o
+    @endian = :little
+    raise 'unknown file format' if f.read(2) != "\xed\xfe"
+    case bits
+    when 32
+      @cpu = :i386
+      @bits = 32
+    when 64
+      @cpu = :x86_64
+      @bits = 64
+    end
+  end
+
+  def read_mach_o_unversal(f)
+    raise 'unknown file format' if f.read(2) != "\xba\xbe" # cafebabe
+    @file_format = :universal
+    nfat_arch = f.read(4).unpack('N')[0]
+    @cpu = []
+    @endian = []
+    @bits = []
+    nfat_arch.times do
+      case cputype = f.read(4).unpack('N')[0]
+      when 7
+        @cpu    << :i386
+        @endian << :little
+        @bits   << 32
+      when 7 + 0x01000000
+        @cpu    << :x86_64
+        @endian << :little
+        @bits   << 64
+      when 18
+        @cpu    << :ppc
+        @endian << :big
+        @bits   << 32
+      when 18 + 0x01000000
+        @cpu    << :ppc64
+        @endian << :big
+        @bits   << 64
+      else
+        raise "Unknown mach-o cputype: #{cputype}"
+      end
+      f.seek(4 * 4, IO::SEEK_CUR)
+    end
+  end
 end
 
 class OraConf
@@ -335,6 +423,39 @@ EOS
     when /darwin/
       @@ld_envs = %w[DYLD_LIBRARY_PATH]
       so_ext = 'dylib'
+      check_proc = Proc.new do |file|
+        is_32bit = [0].pack('l!').size == 4
+        is_big_endian = "\x01\x02".unpack('s') == 0x0102
+        if is_32bit
+          if is_big_endian
+            this_cpu = :ppc    # 32-bit big-endian
+          else
+            this_cpu = :i386   # 32-bit little-endian
+          end
+        else
+          if is_big_endian
+            this_cpu = :ppc64  # 64-bit big-endian
+          else
+            this_cpu = :x86_64 # 64-bit little-endian
+          end
+        end
+        so = MiniSOReader.new(file)
+        if so.file_format == :universal
+          if so.cpu.include? this_cpu
+            true
+          else
+            puts "  skip: #{file} is for #{so.cpu} cpu."
+            false
+          end
+        else
+          if so.cpu == this_cpu
+            true
+          else
+            puts "  skip: #{file} is for #{so.cpu} cpu."
+            false
+          end
+        end
+      end
     end
 
     glob_name = "#{oci_basename}.#{so_ext}#{oci_glob_postfix}"
@@ -844,13 +965,21 @@ class OraConfIC < OraConf
   def initialize(ic_dir)
     init
 
-    if ic_dir =~ /^\/usr\/lib(?:64)?\/oracle\/(\d+\.\d+\.\d+\.\d+)\/client(64)?\/lib(?:64)?/
+    if ic_dir =~ /^\/usr\/lib(?:64)?\/oracle\/(\d+(?:\.\d+)*)\/client(64)?\/lib(?:64)?/
       # rpm package
-      #   official x86 rpms:
+      #   x86 rpms after 11.1.0.7.0:
+      #    library: /usr/lib/oracle/X.X/client/lib/
+      #    include: /usr/include/oracle/X.X/client/
+      #
+      #   x86_64 rpms after 11.1.0.7.0:
+      #    library: /usr/lib/oracle/X.X/client64/lib/
+      #    include: /usr/include/oracle/X.X/client64/
+      #
+      #   x86 rpms before 11.1.0.6.0:
       #    library: /usr/lib/oracle/X.X.X.X/client/lib/
       #    include: /usr/include/oracle/X.X.X.X/client/
       #
-      #   official x86_64 rpms:
+      #   x86_64 rpms before 11.1.0.6.0:
       #    library: /usr/lib/oracle/X.X.X.X/client64/lib/
       #    include: /usr/include/oracle/X.X.X.X/client64/
       #

data/ext/oci8/svcctx.c

@@ -180,6 +180,14 @@ static VALUE oci8_close_all_files(VALUE self)
   return self;
 }
 
+static VALUE oci8_pid(VALUE self)
+{
+  oci8_handle_t *h;
+
+  Get_Handle(self, h); /* 0 */
+  return INT2FIX(h->u.svcctx.pid);
+}
+
 void Init_oci8_svcctx(void)
 {
   rb_define_method(cOCISvcCtx, "logoff", oci8_svcctx_logoff, 0);
@@ -196,6 +204,7 @@ void Init_oci8_svcctx(void)
   rb_define_method(cOCISvcCtx, "reset", oci8_reset, 0);
 #endif
   rb_define_method(cOCISvcCtx, "close_all_files", oci8_close_all_files, 0);
+  rb_define_method(cOCISvcCtx, "pid", oci8_pid, 0);
 }
 
 /*

data/lib/{DBD/OCI8 → dbd}/OCI8.rb

@@ -42,7 +42,32 @@ module DBD # :nodoc:
 module OCI8
 
 VERSION          = "0.1"
-USED_DBD_VERSION = "0.2"
+USED_DBD_VERSION = "0.4"
+
+def self.driver_name
+  "OCI8"
+end
+
+# type converstion handler to bind values. (ruby-dbi 0.4)
+if DBI.const_defined?(:TypeUtil)
+  DBI::TypeUtil.register_conversion("OCI8") do |obj|
+    case obj
+    when ::TrueClass
+      ['1', false]
+    when ::FalseClass
+      ['0', false]
+    else
+      [obj, false]
+    end
+  end
+end
+
+# no type converstion is required for result set. (ruby-dbi 0.4)
+class NoTypeConversion
+  def self.parse(obj)
+    obj
+  end
+end
 
 module Util
 
@@ -134,6 +159,7 @@ module Util
       'nullable' => col.nullable?,
       'precision' => precision,
       'scale' => scale,
+      'dbi_type' => NoTypeConversion,
     }
   end
   private :column_metadata_to_column_info

data/lib/oci8.rb.in

@@ -351,7 +351,7 @@ class OCI8
   def describe_table(table_name)
     desc = @@env.alloc(OCIDescribe)
     desc.attrSet(OCI_ATTR_DESC_PUBLIC, -1)
-    desc.describeAny(@svc, table_name.to_s, OCI_PTYPE_UNK)
+    do_ocicall(@ctx) { desc.describeAny(@svc, table_name.to_s, OCI_PTYPE_UNK) }
     param = desc.attrGet(OCI_ATTR_PARAM)
 
     case param.attrGet(OCI_ATTR_PTYPE)
@@ -679,6 +679,9 @@ class OCI8
     end
 
     def initialize(env, svc, ctx, stmt = nil)
+      if Process.pid != svc.pid
+        raise "The connection cannot be reused in the forked process."
+      end
       @env = env
       @svc = svc
       @ctx = ctx
@@ -811,8 +814,25 @@ class OCI8
       @stmttype = nil
     end # close
 
+    # Get the rowid of the last inserted/updated/deleted row.
     def rowid
-      @stmt.attrGet(OCI_ATTR_ROWID)
+      # get the binary rowid
+      rid = @stmt.attrGet(OCI_ATTR_ROWID)
+      # convert it to a string rowid.
+      if rid.respond_to? :to_s
+        # (Oracle 9.0 or upper)
+        rid.to_s
+      else
+        # (Oracle 8.1 or lower)
+        stmt = @env.alloc(OCIStmt)
+        stmt.prepare('begin :1 := :2; end;')
+        b = stmt.bindByPos(1, OCI8::SQLT_CHR, 64)
+        stmt.bindByPos(2, OCI8::SQLT_RDD, rid)
+        do_ocicall(@ctx) { stmt.execute(@svc, 1, OCI_DEFAULT) }
+        str_rid = b.get()
+        stmt.free()
+        str_rid
+      end
     end
 
     def prefetch_rows=(rows)
@@ -899,6 +919,8 @@ class OCI8
         datatype = :nclob if p.attrGet(OCI_ATTR_CHARSET_FORM) == SQLCS_NCHAR
       when SQLT_BIN
         datasize *= 2 if OCI8::BindType::Mapping[datatype] == OCI8::BindType::String
+      when SQLT_RDD
+        datasize = 64
       end
 
       bind_or_define(:define, i, nil, datatype, datasize, precision, scale, true)
@@ -1210,7 +1232,7 @@ class OCI8
   # datatype        type     size prec scale
   # -------------------------------------------------
   # ROWID         SQLT_RDD      4    0    0
-  BindType::Mapping[OCI8::SQLT_RDD] = BindType::OCIRowid
+  BindType::Mapping[OCI8::SQLT_RDD] = BindType::String
 
   # datatype           type     size prec scale
   # -----------------------------------------------------

data/metaconfig

@@ -120,8 +120,8 @@ install_files['oci8lib.so'] = <<-EOS
 install_files['oci8.rb'] = <<-EOS
 #{get_zcontent('lib/oci8.rb')}EOS
 
-install_files['DBD/OCI8/OCI8.rb'] = <<-EOS
-#{get_zcontent('lib/DBD/OCI8/OCI8.rb')}EOS
+install_files['dbd/OCI8.rb'] = <<-EOS
+#{get_zcontent('lib/dbd/OCI8.rb')}EOS
 
 begin
   installer = Installer.new(install_files)

data/test/test_all.rb

@@ -18,6 +18,7 @@ require "#{srcdir}/test_break"
 require "#{srcdir}/test_oci8"
 require "#{srcdir}/test_connstr"
 require "#{srcdir}/test_metadata"
+require "#{srcdir}/test_rowid"
 
 # Ruby/DBI
 begin

data/test/test_dbi.rb

@@ -146,17 +146,27 @@ EOS
   end
 
   def test_bind_dbi_data_type
-    inval = DBI::Date.new(2004, 3, 20)
-    sth = @dbh.execute("BEGIN ? := ?; END;", DBI::Date, inval)
-    outval = sth.func(:bind_value, 1)
-    assert_instance_of(DBI::Date, outval)
-    assert_equal(inval.to_time, outval.to_time)
+    begin
+      if DBI::VERSION >= '0.4.0'
+        # suppress deprecated warnings while running this test.
+        saved_action = Deprecated.action
+        Deprecated.set_action(Proc.new {})
+      end
+
+      inval = DBI::Date.new(2004, 3, 20)
+      sth = @dbh.execute("BEGIN ? := ?; END;", DBI::Date, inval)
+      outval = sth.func(:bind_value, 1)
+      assert_instance_of(DBI::Date, outval)
+      assert_equal(inval.to_time, outval.to_time)
 
-    inval = DBI::Timestamp.new(2004, 3, 20, 18, 26, 33)
-    sth = @dbh.execute("BEGIN ? := ?; END;", DBI::Timestamp, inval)
-    outval = sth.func(:bind_value, 1)
-    assert_instance_of(DBI::Timestamp, outval)
-    assert_equal(inval.to_time, outval.to_time)
+      inval = DBI::Timestamp.new(2004, 3, 20, 18, 26, 33)
+      sth = @dbh.execute("BEGIN ? := ?; END;", DBI::Timestamp, inval)
+      outval = sth.func(:bind_value, 1)
+      assert_instance_of(DBI::Timestamp, outval)
+      assert_equal(inval.to_time, outval.to_time)
+    ensure
+      Deprecated.set_action(saved_action) if saved_action
+    end
   end
 
   def test_column_info

data/test/test_dbi_clob.rb

@@ -11,13 +11,14 @@ class TestDbiCLob < RUNIT::TestCase
   end
 
   def test_insert
-    @dbh.do("DELETE FROM test_clob WHERE filename = :1", $lobfile)
+    filename = File.basename($lobfile)
+    @dbh.do("DELETE FROM test_clob WHERE filename = :1", filename)
 
     # insert an empty clob and get the rowid.
-    rowid = @dbh.execute("INSERT INTO test_clob(filename, content) VALUES (:1, EMPTY_CLOB())", $lobfile) do |sth|
+    rowid = @dbh.execute("INSERT INTO test_clob(filename, content) VALUES (:1, EMPTY_CLOB())", filename) do |sth|
       sth.func(:rowid)
     end
-    lob = @dbh.select_one("SELECT content FROM test_clob WHERE filename = :1 FOR UPDATE", $lobfile)[0]
+    lob = @dbh.select_one("SELECT content FROM test_clob WHERE filename = :1 FOR UPDATE", filename)[0]
     begin
       open($lobfile) do |f|
         while f.gets()
@@ -30,8 +31,9 @@ class TestDbiCLob < RUNIT::TestCase
   end
 
   def test_read
+    filename = File.basename($lobfile)
     test_insert() # first insert data.
-    lob = @dbh.select_one("SELECT content FROM test_clob WHERE filename = :1 FOR UPDATE", $lobfile)[0]
+    lob = @dbh.select_one("SELECT content FROM test_clob WHERE filename = :1 FOR UPDATE", filename)[0]
     begin
       open($lobfile) do |f|
         while buf = lob.read($lobreadnum)
@@ -52,5 +54,5 @@ class TestDbiCLob < RUNIT::TestCase
 end
 
 if $0 == __FILE__
-  RUNIT::CUI::TestRunner.run(TestCLob.suite())
+  RUNIT::CUI::TestRunner.run(TestDbiCLob.suite())
 end

data/test/test_rowid.rb

@@ -0,0 +1,38 @@
+require 'oci8'
+require 'runit/testcase'
+require 'runit/cui/testrunner'
+require File.dirname(__FILE__) + '/config'
+
+class TestRowid < RUNIT::TestCase
+
+  def setup
+    @conn = get_oci_connection()
+  end
+
+  def teardown
+    @conn.logoff
+  end
+
+  def test_rowid
+    drop_table('test_table')
+    sql = <<-EOS
+CREATE TABLE test_table (N NUMBER(38))
+EOS
+    @conn.exec(sql)
+    cursor = @conn.parse("INSERT INTO test_table values(1)");
+    cursor.exec
+    rid1 = cursor.rowid
+    assert_instance_of(String, rid1)
+    cursor.close
+    rid2 = nil
+    @conn.exec('select rowid from test_table where rowid = :1', rid1) do |row|
+      rid2 = row[0]
+    end
+    assert_equal(rid2, rid1)
+    drop_table('test_table')
+  end
+end # TestRowid
+
+if $0 == __FILE__
+  RUNIT::CUI::TestRunner.run(TestRowid.suite())
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-oci8
 version: !ruby/object:Gem::Version 
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors: 
 - KUBO Takehiro
@@ -9,7 +9,7 @@ autorequire: oci8
 bindir: bin
 cert_chain: []
 
-date: 2008-08-10 00:00:00 +09:00
+date: 2009-02-08 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -63,7 +63,7 @@ files:
 - ext/oci8/stmt.c
 - ext/oci8/svcctx.c
 - lib/oci8.rb.in
-- lib/DBD/OCI8/OCI8.rb
+- lib/dbd/OCI8.rb
 - support/README
 - support/runit/assert.rb
 - support/runit/cui/testrunner.rb
@@ -92,6 +92,7 @@ files:
 - test/test_oradate.rb
 - test/test_oranumber.rb
 - test/test_metadata.rb
+- test/test_rowid.rb
 has_rdoc: true
 homepage: http://ruby-oci8.rubyforge.org
 post_install_message: 
@@ -117,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ruby-oci8
-rubygems_version: 1.1.1
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: Ruby interface for Oracle using OCI8 API