ruby-oci8 1.0.2 → 1.0.3

data/ChangeLog

@@ -1,3 +1,38 @@
+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.
+	* ext/oci8/lob.c: add workaround code for a losing character problem
+	    when reading CLOB. The problem is happened at the following condition.
+	    1. Oracle client version is 10.2.0.4 or 11.1.0.6.
+	       (It doesn't depend on Oracle server version.)
+	    2. The character set is a variable-length one (e.g. AL32UTF8).
+	    (This probmem was reported by Efren Yevale and Thomas Witt and
+	     fixed with Thomas Witt's help.)
+
+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,
+	    which affect OCI8::LOB#read and OCI8::LOB#write.
+	    (This probmem was reported by Jonathan Hadders.)
+
+2008-07-12  KUBO Takehiro  <kubo@jiubao.org>
+	* lib/oci8.rb.in: (1) add #to_json to OraDate too.
+	    (2) fix a bug when using Oracle 8i and dbd. OCI_ATTR_FSPRECISION
+	    is for TIMESTAMP data type which is new in Oracle 9i.
+	    (This probmem was reported by Glauco Magnelli.)
+
+2008-07-07  KUBO Takehiro  <kubo@jiubao.org>
+	* lib/oci8.rb.in: fix the problem that OraNumber#to_json returns
+	    "{}" when using Rails. (This issue is reported by Alex Moore)
+	    Object#to_json is added by active_support. But active_support
+	    doesn't know what OraNumber is.
+	* ext/oci8/oraconf.rb: merge chages in ruby-oci8 trunk.
+
+2008-07-05  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/oraconf.rb: prints more information on checking
+	   LD_LIBRARY_PATH.
+
 2008-06-26  KUBO Takehiro  <kubo@jiubao.org>
 	* NEWS: add changes between 1.0.1 and 1.0.2.
 	* VERSION: change version to 1.0.2.

data/NEWS

@@ -1,3 +1,29 @@
+1.0.3:
+
+1. add workaround code for a losing character problem when reading CLOB.
+   (reported by Efren Yevale and Thomas Witt and fixed with Thomas Witt's help.)
+
+   The problem is happened at the following condition.
+
+   (a) Oracle client version is 10.2.0.4 or 11.1.0.6.
+       It doesn't happend when using 10.2.0.3 client or lower.
+       It doesn't depend on Oracle server version.
+
+   (b) The character set is a variable-length one.
+       e.g. AL32UTF8
+
+2. fix a problem when reading BLOB/CLOB over 1GB.
+   (reported by Jonathan Hadders.)
+
+3. [rails] fix a problem that OraNumber#to_json returns "{}" when using Rails.
+   (reported by Alex Moore)
+
+   Rails add to_json method. But it doesn't know what OraNumber is.
+   OraNumber#to_json is added for Rails.
+
+4. [dbi] fix a problem when using Oracle 8i and ruby-dbi.
+   (reported by Glauco MagnelliRemi Gagnon.)
+
 1.0.2:
 
 1. add a gemspec file.

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.0.3

data/ext/oci8/lob.c

@@ -55,7 +55,7 @@ static VALUE oci8_lob_get_length(VALUE self, VALUE vsvc)
   rv = OCILobGetLength(svch->hp, h->errhp, h->hp, &len);
   if (rv != OCI_SUCCESS)
     oci8_raise(h->errhp, rv, NULL);
-  return INT2FIX(len);
+  return UINT2NUM(len);
 }
 
 #ifdef HAVE_OCILOBGETCHUNKSIZE
@@ -72,7 +72,7 @@ static VALUE oci8_lob_get_chunk_size(VALUE self, VALUE vsvc)
   rv = OCILobGetChunkSize(svch->hp, h->errhp, h->hp, &len);
   if (rv != OCI_SUCCESS)
     oci8_raise(h->errhp, rv, NULL);
-  return INT2FIX(len);
+  return UINT2NUM(len);
 }
 #endif
 
@@ -101,7 +101,7 @@ static VALUE oci8_lob_read(int argc, VALUE *argv, VALUE self)
   ub1 csfrm;
   ub4 amt;
   sword rv;
-  char buf[4096];
+  char buf[8192]; /* 8192 is chunk size in a platform. */
 #ifndef OCI8_USE_CALLBACK_LOB_READ
   size_t buf_size_in_char;
 #endif
@@ -110,8 +110,8 @@ static VALUE oci8_lob_read(int argc, VALUE *argv, VALUE self)
   rb_scan_args(argc, argv, "32", &vsvc, &voffset, &vamt, &vcsid, &vcsfrm);
   Get_Handle(self, h); /* 0 */
   Check_Handle(vsvc, OCISvcCtx, svch); /* 1 */
-  offset = NUM2INT(voffset); /* 2 */
-  amt = NUM2INT(vamt); /* 3 */
+  offset = NUM2UINT(voffset); /* 2 */
+  amt = NUM2UINT(vamt); /* 3 */
   csid = NIL_P(vcsid) ? 0 : NUM2INT(vcsid); /* 4 */
   csfrm = NIL_P(vcsfrm) ? SQLCS_IMPLICIT : NUM2INT(vcsfrm); /* 5 */
 
@@ -137,9 +137,22 @@ static VALUE oci8_lob_read(int argc, VALUE *argv, VALUE self)
    */
   buf_size_in_char = sizeof(buf) / h->u.lob_locator.char_width;
   do {
+    /* initialize buf in zeros everytime to check a nul characters. */
+    memset(buf, 0, sizeof(buf));
     rv = OCILobRead(svch->hp, h->errhp, h->hp, &amt, offset, buf, sizeof(buf), NULL, NULL, csid, csfrm);
     if (rv != OCI_SUCCESS && rv != OCI_NEED_DATA)
       oci8_raise(h->errhp, rv, NULL);
+
+    /* Workaround when using Oracle 10.2.0.4 or 11.1.0.6 client and
+     * variable-length character set (e.g. AL32UTF8).
+     *
+     * When the above mentioned condition, amt may be shorter. So
+     * amt is increaded until a nul character to know the actually
+     * read size.
+     */
+    while (amt < sizeof(buf) && buf[amt] != '\0') {
+      amt++;
+    }
     if (amt == 0)
       break;
     /* for fixed size charset, amt is the number of characters stored in buf. */
@@ -170,7 +183,7 @@ static VALUE oci8_lob_write(int argc, VALUE *argv, VALUE self)
   rb_scan_args(argc, argv, "32", &vsvc, &voffset, &vbuf, &vcsid, &vcsfrm);
   Get_Handle(self, h); /* 0 */
   Check_Handle(vsvc, OCISvcCtx, svch); /* 1 */
-  offset = NUM2INT(voffset); /* 2 */
+  offset = NUM2UINT(voffset); /* 2 */
   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/oraconf.rb

@@ -247,7 +247,7 @@ EOS
       print <<EOS
 ---------------------------------------------------
 error messages:
-#{$!.to_str}
+#{$!.to_s}
 ---------------------------------------------------
 See:
  * http://ruby-oci8.rubyforge.org/#{lang}/HowToInstall.html
@@ -270,7 +270,7 @@ EOS
   private
 
   def self.check_ic_dir
-    print "checking for load library path... "
+    puts "checking for load library path... "
     STDOUT.flush
 
     # get library load path names
@@ -340,24 +340,34 @@ EOS
     glob_name = "#{oci_basename}.#{so_ext}#{oci_glob_postfix}"
     ld_path = nil
     file = nil
-    @@ld_envs.collect do |env|
-      puts "(#{env})... "
-      ENV[env] && ENV[env].split(File::PATH_SEPARATOR)
-    end.flatten.each do |path|
-      next if path.nil? or path == ''
-      path.gsub!(/\\/, '/') if /mswin32|cygwin|mingw32|bccwin32/ =~ RUBY_PLATFORM
-      files = Dir.glob(File.join(path, glob_name))
-      next if files.empty?
-      STDOUT.flush
-      next if (check_proc && !check_proc.call(files[0]))
-      file = files[0]
-      ld_path = path
+    @@ld_envs.each do |env|
+      if ENV[env].nil?
+        puts "  #{env} is not set."
+        next
+      end
+      puts "  #{env}... "
+      ENV[env].split(File::PATH_SEPARATOR).each do |path|
+        next if path.nil? or path == ''
+        print "    checking #{path}... "
+        path.gsub!(/\\/, '/') if /mswin32|cygwin|mingw32|bccwin32/ =~ RUBY_PLATFORM
+        files = Dir.glob(File.join(path, glob_name))
+        if files.empty?
+          puts "no"
+          next
+        end
+        STDOUT.flush
+        next if (check_proc && !check_proc.call(files[0]))
+        file = files[0]
+        ld_path = path
+        puts "yes"
+        break
+      end
       break
     end
 
     if ld_path.nil? and RUBY_PLATFORM =~ /linux/
       open("|/sbin/ldconfig -p") do |f|
-        print "(ld.so.conf)... "
+        print "  checking ld.so.conf... "
         STDOUT.flush
         while line = f.gets
           if line =~ /libclntsh\.so\..* => (\/.*)\/libclntsh\.so\.(.*)/
@@ -365,22 +375,22 @@ EOS
             path = $1
             next if (check_proc && !check_proc.call(file))
             ld_path = path
+            puts "yes"
             break
           end
         end
+        puts "no"
       end
     end
 
     if ld_path
       ocidata_basename.each do |basename|
         if File.exist?(File.join(ld_path, "#{basename}.#{so_ext}"))
-          puts "  found: #{file} looks like an instant client."
+          puts "  #{file} looks like an instant client."
           return ld_path
         end
       end
-      puts "  found: #{file} looks like a full client."
-    else
-      puts "  not found"
+      puts "  #{file} looks like a full client."
     end
     nil
   end
@@ -433,7 +443,8 @@ EOS
   def check_ruby_header
     print "checking for ruby header... "
     STDOUT.flush
-    unless File.exist?("#{Config::CONFIG['archdir']}/ruby.h")
+    rubyhdrdir = Config::CONFIG["rubyhdrdir"] || Config::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")
         raise <<EOS

data/lib/oci8.rb.in

@@ -1293,6 +1293,10 @@ class OraDate
       out.scalar(taguri, self.to_s, :plain)
     end
   end
+
+  def to_json(options=nil) # :nodoc:
+    to_datetime.to_json(options)
+  end
 end
 
 class OraNumber
@@ -1305,6 +1309,10 @@ class OraNumber
       out.scalar(taguri, self.to_s, :plain)
     end
   end
+
+  def to_json(options=nil) # :nodoc:
+    to_s
+  end
 end
 
 
@@ -1564,6 +1572,12 @@ class OCI8
       attr_reader :scale
 
       # interval
+      if defined? OCI_ATTR_FSPRECISION and defined? OCI_ATTR_LFPRECISION
+        # Oracle 8i or upper has OCI_ATTR_FSPRECISION and OCI_ATTR_LFPRECISION
+        @@is_fsprecision_available = true
+      else
+        @@is_fsprecision_available = false
+      end
       attr_reader :fsprecision
       attr_reader :lfprecision
 
@@ -1588,8 +1602,22 @@ class OCI8
                         when 5; :lit_null
                         else raise "unknown charset_form #{param.attrGet(OCI_ATTR_CHARSET_FORM)}"
                         end
-        @fsprecision = param.attrGet(OCI_ATTR_FSPRECISION)
-        @lfprecision = param.attrGet(OCI_ATTR_LFPRECISION)
+
+        @fsprecision = nil
+        @lfprecision = nil
+        if @@is_fsprecision_available
+          begin
+            @fsprecision = param.attrGet(OCI_ATTR_FSPRECISION)
+            @lfprecision = param.attrGet(OCI_ATTR_LFPRECISION)
+          rescue OCIError
+            raise if $!.code != 24316 # ORA-24316: illegal handle type
+            # Oracle 8i could not use OCI_ATTR_FSPRECISION and
+            # OCI_ATTR_LFPRECISION even though it defines these
+            # constants in oci.h.
+            @@is_fsprecision_available = false
+          end
+        end
+
         @type_string = __type_string(param)
       end
 

data/ruby-oci8.spec

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

metadata

@@ -1,33 +1,26 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
-specification_version: 1
 name: ruby-oci8
 version: !ruby/object:Gem::Version 
-  version: 1.0.2
-date: 2008-06-26 00:00:00 +09:00
-summary: Ruby interface for Oracle using OCI8 API
-require_paths: 
-- lib
-email: kubo@jiubao.org
-homepage: http://ruby-oci8.rubyforge.org
-rubyforge_project: ruby-oci8
-description: ruby-oci8 is a ruby interface for Oracle using OCI8 API. It is available with Oracle8, Oracle8i, Oracle9i, Oracle10g and Oracle Instant Client.
-autorequire: oci8
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ~>
-    - !ruby/object:Gem::Version 
-      version: 1.8.0
-  version: 
+  version: 1.0.3
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - KUBO Takehiro
+autorequire: oci8
+bindir: bin
+cert_chain: []
+
+date: 2008-08-10 00:00:00 +09:00
+default_executable: 
+dependencies: []
+
+description: ruby-oci8 is a ruby interface for Oracle using OCI8 API. It is available with Oracle8, Oracle8i, Oracle9i, Oracle10g and Oracle Instant Client.
+email: kubo@jiubao.org
+executables: []
+
+extensions: 
+- ext/oci8/extconf.rb
+extra_rdoc_files: 
+- README
 files: 
 - NEWS
 - ChangeLog
@@ -99,20 +92,34 @@ files:
 - test/test_oradate.rb
 - test/test_oranumber.rb
 - test/test_metadata.rb
-test_files: 
-- test/test_all.rb
+has_rdoc: true
+homepage: http://ruby-oci8.rubyforge.org
+post_install_message: 
 rdoc_options: 
 - --main
 - README
 - --exclude
 - ext/*
-extra_rdoc_files: 
-- README
-executables: []
-
-extensions: 
-- ext/oci8/extconf.rb
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ~>
+    - !ruby/object:Gem::Version 
+      version: 1.8.0
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: []
-
+rubyforge_project: ruby-oci8
+rubygems_version: 1.1.1
+signing_key: 
+specification_version: 2
+summary: Ruby interface for Oracle using OCI8 API
+test_files: 
+- test/test_all.rb