ruby-oci8 1.0.3-i386-mswin32 → 1.0.4-i386-mswin32

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/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

@@ -55,7 +55,7 @@ class OCI8
     @@error_in_initialization = $!
   end
 
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
   CLIENT_VERSION = '1020'
   # :stopdoc:
   RAW = OCI_TYPECODE_RAW
@@ -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/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

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: ruby-oci8
 version: !ruby/object:Gem::Version 
-  version: 1.0.3
-date: 2008-08-10 00:00:00 +09:00
+  version: 1.0.4
+date: 2009-02-08 00:00:00 +09:00
 summary: Ruby interface for Oracle using OCI8 API
 require_paths: 
 - lib
@@ -47,7 +47,7 @@ files:
 - doc/api.ja.rd
 - doc/manual.css
 - lib/oci8.rb.in
-- lib/DBD/OCI8/OCI8.rb
+- lib/dbd/OCI8.rb
 - support/README
 - support/runit/assert.rb
 - support/runit/cui/testrunner.rb
@@ -76,6 +76,7 @@ files:
 - test/test_oradate.rb
 - test/test_oranumber.rb
 - test/test_metadata.rb
+- test/test_rowid.rb
 - ext/oci8/oci8lib.so
 - lib/oci8.rb
 test_files: