ruby-oci8 1.0.6 → 1.0.7

data/ChangeLog

@@ -1,3 +1,26 @@
+2009-10-21  KUBO Takehiro  <kubo@jiubao.org>
+	* NEWS: add changes between 1.0.6 and 1.0.7.
+	* VERSION: change version to 1.0.7.
+
+2009-10-04  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/oraconf.rb:
+	    1. Fix for ruby 1.8.5 with Oracle 8.x which needs some object
+	       files to link with.
+	       (reported by Jayson Cena)
+	    2. Add additional error message if under the sudo environemnt.
+	    3. Print not only error message but also the error backtrace when
+	       oraconf.rb fails.
+
+2009-09-13  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/lob.c, ext/oci8/oci8.h, test/test_clob.rb: Change
+	    OCI8::LOB#write to accept an object which is not a String and
+	    doesn't respond to 'to_str' as IO#write does.
+	    (requested by Christopher Jones)
+
+2009-09-12  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/oraconf.rb: Fixed to compile for AIX instant clients.
+	    (reported by Kazuya Teramoto)
+
 2009-05-17  KUBO Takehiro  <kubo@jiubao.org>
 	* NEWS: add changes between 1.0.5 and 1.0.6.
 	* VERSION: change version to 1.0.6.

data/NEWS

@@ -1,3 +1,16 @@
+1.0.7:
+
+* change OCI8::LOB#write to accept an object which is not a String and
+  doesn't respond to 'to_str' as IO#write does.
+  (requested by Christopher Jones)
+
+* fix oraconf.rb for AIX instant clients.
+  (reported by Kazuya Teramoto)
+
+* fix oraconf.rb for ruby 1.8.5 with Oracle 8.x which needs some object
+  files to link with.
+  (reported by Jayson Cena)
+
 1.0.6:
 
 * fix a problem when compiling for Oracle 8.0.

data/VERSION

@@ -1 +1 @@
-1.0.6
+1.0.7

data/ext/oci8/lob.c

@@ -184,6 +184,10 @@ static VALUE oci8_lob_write(int argc, VALUE *argv, VALUE self)
   Get_Handle(self, h); /* 0 */
   Check_Handle(vsvc, OCISvcCtx, svch); /* 1 */
   offset = NUM2UINT(voffset); /* 2 */
+  if (TYPE(vbuf) != T_STRING) {
+    vbuf = rb_obj_as_string(vbuf);
+  }
+  RB_GC_GUARD(vbuf);
   Get_String(vbuf, buf); /* 3 */
   csid = NIL_P(vcsid) ? 0 : NUM2INT(vcsid); /* 4 */
   csfrm = NIL_P(vcsfrm) ? SQLCS_IMPLICIT : NUM2INT(vcsfrm); /* 5 */

data/ext/oci8/oci8.h

@@ -52,6 +52,10 @@ extern "C" {
 #define RARRAY_LEN(obj) RARRAY(obj)->len
 #endif
 
+#ifndef RB_GC_GUARD
+#define RB_GC_GUARD(v) (*(volatile VALUE *)&(v))
+#endif
+
 #ifndef HAVE_TYPE_ORATEXT
 typedef unsigned char oratext;
 #endif

data/ext/oci8/oraconf.rb

@@ -353,8 +353,10 @@ EOS
       end
       print <<EOS
 ---------------------------------------------------
-error messages:
-#{$!.to_s}
+Error Message:
+  #{$!.to_s.gsub(/\n/, "\n  ")}
+Backtrace:
+  #{$!.backtrace.join("\n  ")}
 ---------------------------------------------------
 See:
  * http://ruby-oci8.rubyforge.org/#{lang}/HowToInstall.html
@@ -383,15 +385,16 @@ EOS
     # get library load path names
     oci_basename = 'libclntsh'
     oci_glob_postfix = '.[0-9]*'
-    ocidata_basename = ['libociei', 'libociicus']
+    nls_data_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 = ''
-      ocidata_basename = ['oraociei11', 'oraociicus11', 'oraociei10', 'oraociicus10']
+      nls_data_basename = ['oraociei11', 'oraociicus11', 'oraociei10', 'oraociicus10']
       @@ld_envs = %w[PATH]
       so_ext = 'dll'
     when /i.86-linux/
@@ -434,6 +437,7 @@ 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]
@@ -529,8 +533,9 @@ EOS
     end
 
     if ld_path
-      ocidata_basename.each do |basename|
-        if File.exist?(File.join(ld_path, "#{basename}.#{so_ext}"))
+      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}"))
           puts "  #{file} looks like an instant client."
           return ld_path
         end
@@ -613,6 +618,7 @@ 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
@@ -860,10 +866,33 @@ EOS
     def get_home
       oracle_home = ENV['ORACLE_HOME']
       if oracle_home.nil?
-        raise <<EOS
+        msg = <<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
@@ -953,10 +982,10 @@ EOS
 
         # monkey patching!
         Object.module_eval do
-          alias :orig_link_command :link_command
-          def link_command(ldflags, opt="", libpath=$DEFLIBPATH|$LIBPATH)
-            opt = "" if opt == $libs
-            orig_link_command(ldflags, opt, libpath)
+          alias :link_command_pre_oci8 :link_command
+          def link_command(*args)
+            args[1] = "" if args[1] == $libs
+            link_command_pre_oci8(*args)
           end
         end
 

data/ruby-oci8.spec

@@ -3,7 +3,7 @@
 
 Summary: ruby interface for Oracle using OCI8 API
 Name: ruby-oci8
-Version: 1.0.6
+Version: 1.0.7
 Release: 1%{?dist}
 Group: Development/Libraries
 License: Ruby License

data/test/test_clob.rb

@@ -64,6 +64,27 @@ class TestCLob < RUNIT::TestCase
     lob.free()
   end
 
+  def test_insert_symbol
+    filename = 'test_symbol'
+    value = :foo_bar
+    @stmt.prepare("DELETE FROM test_clob WHERE filename = :1")
+    @stmt.bindByPos(1, String, filename.size).set(filename)
+    @stmt.execute(@svc)
+
+    @stmt.prepare("INSERT INTO test_clob(filename, content) VALUES (:1, EMPTY_CLOB())")
+    @stmt.bindByPos(1, String, filename.size).set(filename)
+    @stmt.execute(@svc)
+
+    lob = @env.alloc(OCILobLocator)
+    @stmt.prepare("SELECT content FROM test_clob WHERE filename = :1 FOR UPDATE")
+    @stmt.bindByPos(1, String, filename.size).set(filename)
+    @stmt.defineByPos(1, OCI_TYPECODE_CLOB, lob)
+    @stmt.execute(@svc, 1)
+    lob.write(@svc, 1, value)
+    assert_equal(value.to_s, lob.read(@svc, 1, 30))
+    lob.free()
+  end
+
   def test_read
     filename = File.basename($lobfile)
     test_insert() # first insert data.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-oci8
 version: !ruby/object:Gem::Version 
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors: 
 - KUBO Takehiro
@@ -9,7 +9,7 @@ autorequire: oci8
 bindir: bin
 cert_chain: []
 
-date: 2009-05-17 00:00:00 +09:00
+date: 2009-10-21 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -118,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ruby-oci8
-rubygems_version: 1.3.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: Ruby interface for Oracle using OCI8 API