ruby-oci8 2.0.4-x86-mingw32 → 2.0.5-x86-mingw32

data/ChangeLog

@@ -1,6 +1,163 @@
+2011-06-12  KUBO Takehiro  <kubo@jiubao.org>
+	* NEWS: add changes between 2.0.4 and 2.0.5.
+	* VERSION: change the version to 2.0.5.
+
+2011-06-12  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/oci8lib.c: add __declspec(dllexport) to Init_oci8lib(). The mingw32
+	    gcc compiler doesn't export functions without it if more than one function
+	    is declared with it.
+	* ext/oci8/oraconf.rb: work around for rubinius 1.2.3, which doesn't support
+	    Array#pack('P').
+	* lib/oci8/oci8.rb: fix a bug introduced by the previous commit.
+	* ext/oci8/env.c, ext/oci8/extconf.rb, ext/oci8/oci8.c, ext/oci8/oci8.h,
+	  ext/oci8/oci8lib.c: Use HAVE_RB_THREAD_BLOCKING_REGION instead of
+	    HAVE_TYPE_RB_BLOCKING_FUNCTION_T. have_type("rb_blocking_function_t", "ruby.h")
+	    unexpectedly doesn't work on Visual Studio 2010.
+
+2011-06-10  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/apiwrap.yml, lib/oci8/oci8.rb: fix for Psych YAML library.
+	* ext/oci8/extconf.rb, ext/oci8/oci8.h, ext/oci8/ocihandle.c: fix to
+	    work with ruby 1.9.3dev.
+
+2011-06-10  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/oci8.c: prevent GC on failed-logon connections from freeing
+	    alive connections when the service context handle addresses are
+	    accidentally same.
+	* ext/oci8/ocidatetime.c: raise "OCIError: ORA-01805: possible error in
+	    date/time operation" when Oracle 11gR2's client and server timezone versions
+	    are not same instead of raising a exception "undefined method `*' for
+	    nil:NilClass." This is a temporary fix.
+	    See: http://rubyforge.org/forum/forum.php?thread_id=49102&forum_id=1078
+
+2011-06-10  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/env.c, ext/oci8/oci8.h: Free OCI error handles on the
+	    native thread termination, not on the ruby thread termination.
+	    (reported by Jordan Curzon and Aaron Qian)
+	    See: http://rubyforge.org/forum/forum.php?thread_id=49751&forum_id=1078
+
+2011-02-21  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/lob.c, ext/oci8/metadata.c, ext/oci8/oci8.c,
+	  ext/oci8/oci8.h, ext/oci8/oci8lib.c, ext/oci8/stmt.c:
+	    fix segmentation fault when calling OCI8::Cursor#[] for
+	    closed statement object's (reported by Hugo L. Borges)
+
+2011-02-01  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/ocidatetime.c, lib/oci8/datetime.rb: rename
+	    the name of the class to binding timestamp with time zone
+	    from OCITimestamp to OCITimestampTZ. OCITimestamp will be
+	    used for timestamp without time zone.
+
+2011-01-30  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/oraconf.rb: check Oracle client's cpu type on Solaris as
+	    on Linux and Mac OS X. change error messages on Mac OS X to suggest
+	    to set RC_ARCHS=x86_64 when mkmf.log contains messages such as
+	    'missing required architecture i386 in file.'
+
+2010-12-26  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/ocinumber.c, lib/oci8/bindtype.rb, test/test_oranumber.rb:
+	    add OraNumber#has_decimal_part? and OCI8::BindType::BasicNumberType.
+
+2010-12-14  KUBO Takehiro  <kubo@jiubao.org>
+	* dist-files, lib/oci8.rb.in, lib/oci8/.document, lib/oci8/properties.rb:
+	    add OCI8.properties to get and set ruby-oci8 global setting.
+	* ext/oci8/bind.c, lib/oci8/bindtype.rb: fix NCHAR support and add
+	    OCI8.properties[:bind_string_as_nchar] to control charset form (CHAR or NCHAR)
+	    when binding string values.
+	    See: http://rubyforge.org/forum/forum.php?thread_id=48838&forum_id=1078
+
+2010-12-04  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/object.c, ext/oci8/bind.c, lib/oci8/object.rb,
+	  test/test_object.rb: fix a problem to assign NULL bind value
+	    to object type bind variables.
+	    (reported by Raimonds Simanovskis)
+	* ext/oci8/oraconf.rb: fix for 32-bit ruby compiled on
+	    x86_64 linux. (reported by Jason Renschler)
+	* ext/oci8/oranumber_util.c, test/test_oranumber.rb:
+	    suppress warning: unknown conversion type character 'h' in format
+
+2010-09-18  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/win32.c: undefine boolean to pass compilation on
+	    Cygwin. (reported by Don Hill).
+	* lib/oci8/encoding-init.rb, lib/oci8/encoding.yml: add a
+	    mapping from ZHT16HKSCS to Big5-HKSCS when the latter
+	    is available in ruby.
+
+2010-09-12  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/env.c, ext/oci8/extconf.rb: suppress warning
+	    'use "ruby/util.h" instead of bare "util.h".'
+	* test/test_break.rb: make tests insensitive to execution timing.
+
+2010-09-10  KUBO Takehiro  <kubo@jiubao.org>
+	* test/test_array_dml.rb: delete workaround code. It now works
+	    fine on rubinius head.
+
+2010-09-07  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/extconf.rb, ext/oci8/oci8lib.c: Don't use
+	    rb_set_end_proc() when it isn't available.
+	* ext/oci8/extconf.rb, lib/oci8.rb.in: add RUBY_ENGINE to
+	    the C extension library name when RUBY_ENGINE is not "ruby."
+	* test/test_array_dml.rb: skip test_array_insert1 on rubinius.
+	    This will be enabled after the rubinius issue #445 is fixed.
+
+2010-09-05  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/extconf.rb, ext/oci8/oci8.h, ext/oci8/oci8lib.c,
+	  ext/oci8/ocinumber.c: use rb_intern() to retrieve IDs of '+', '-',
+	    '*' and '/' on rubinus.
+	* ext/oci8/oradate.c: use rb_call_super() instead of
+	    rb_obj_init_copy(), which is not declared in rubinus.
+
+2010-08-28  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/env.c: fix for rubinius.
+
+2010-08-28  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/env.c, ext/oci8/error.c, ext/oci8/extconf.rb, ext/oci8/oci8.c,
+	  ext/oci8/oci8.h, oci8/oci8lib.c, ext/oci8/ocinumber.c: fix for rubinius.
+	    Note that this is not enough to compile ruby-oci8 on it.
+
+2010-08-23  KUBO Takehiro  <kubo@jiubao.org>
+	* lib/oci8/object.rb: fix an error when SDO_GEOMETRY is used
+	    and $VERBOSE is set.
+	* test/test_oranumber.rb: change a testcase for ruby 1.9.2.
+	    Math::atan2(0, 0) behaviour was changed in 1.9.2.
+
+2010-08-15  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/lob.c, ext/oci8/object.c, ext/oci8/oci8.h,
+	  lib/oci8/object.rb: support LOB datatypes in Oracle objects.
+	  (reported by Michael Sexton)
+	* ext/oci8/ocihandle.c: fix SEGV in finalizer when temporary LOBs
+	    are used. This bug was introduced by the previous commit.
+
+2010-08-15  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/apiwrap.yml, ext/oci8/lob.c: fix memory leak when temporary
+	    lobs are used.
+
+2010-08-14  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/bind.c: fix a bug that a string is bound to RAW.
+	    Its encoding had been convertd to OCI.encoding incorrectly.
+	    (backport from the trunk)
+	* ext/oci8/stmt.c: fix SEGV when an exception is raised while
+	    a bind value is deallocated.
+	    (backport from the trunk)
+
+2010-04-23  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/oranumber_util.c, test/test_oranumber.rb:
+	    add limitted support for OraNumber's positive and negative
+	    infinity. They are converted to '~' and '-~' respectively
+	    as described in <URL:http://www.ixora.com.au/notes/infinity.htm>.
+
+2010-04-23  KUBO Takehiro  <kubo@jiubao.org>
+	* Makefile: fix wrong dependencies in Makefile when running
+	    'make -jNNN (where NNN >= 2)'
+	    (contributed by Alyano Alyanos. See bug #28129 on rubyforge.)
+
+2010-03-07  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/ocinumber.c: fix to compile on HP-UX.
+	    Duplicate const qualifiers prevented HP-UX cc from compiling.
+	    (reported by Sebastian YEPES)
+
 2010-02-28  KUBO Takehiro  <kubo@jiubao.org>
 	* NEWS: add changes between 2.0.3 and 2.0.4.
-	* VERSION: change the version to 2.0.3.
+	* VERSION: change the version to 2.0.4.
 	* ext/oci8/stmt.c: fix segmentation fault when OCI8::Cursor#fetch
 	    is called prior to OCI8::Cursor#exec.
 	* ext/oci8/oci8.c: minor fix in rdoc comment.

data/Makefile

@@ -4,12 +4,10 @@ RDOC = rdoc
 
 all: build
 
-build: config.save setup
-
 config.save: lib/oci8.rb.in
 	$(RUBY) setup.rb config
 
-setup:
+build: config.save
 	$(RUBY) setup.rb setup
 
 check: build

data/NEWS

@@ -1,3 +1,73 @@
+2.0.5:
+
+* New Features
+
+  - Support Rubinius.
+
+  - OraNumber#has_decimal_part? -> boolean
+
+      OraNumber(10).has_decimal_part?   # => false
+      OraNumber(10.1).has_decimal_part? # => true
+
+  - Limitted support for OraNumber's positive and negative infinity.
+
+    They are converted to '~' and '-~' respectively as described in
+    <URL:http://www.ixora.com.au/notes/infinity.htm>.
+
+  - OCI8.properties is added to control ruby-oci8 behaviour.
+    It supports :bind_string_as_nchar only for now.
+
+  - OCI8.properties[:bind_string_as_nchar] is added.
+
+    You need to set "OCI8.properties[:bind_string_as_nchar] = true"
+    if the database character set is not UTF-8 and NCHAR/NVARCHAR2 columns
+    contain characters which cannot be converted to the database character set.
+    See: http://rubyforge.org/forum/forum.php?thread_id=48838&forum_id=1078
+
+* Fixed issues
+
+  - Fix InvalidHandle errors on Rails.
+    (reported by Jordan Curzon and Aaron Qian)
+    See: http://rubyforge.org/forum/forum.php?thread_id=49751&forum_id=1078
+
+  - Raise "OCIError: ORA-01805: possible error in date/time operation"
+    when Oracle 11gR2's client and server timezone versions are not same
+    instead of raising a exception "undefined method `*' for nil:NilClass."
+    See: http://rubyforge.org/forum/forum.php?thread_id=49102&forum_id=1078
+
+  - Fix unexpectedly disconnect when failed-logon connections is GC'ed
+    and the connection object's address is accidentally same with
+    an alive connection.
+
+  - Fix segmentation fault when calling OCI8::Cursor#[] for
+    closed statement object's (reported by Hugo L. Borges)
+
+  - Fix a bug that a string is bound to RAW.
+    Its encoding had been convertd to OCI.encoding incorrectly.
+
+  - Fix memory leaks when temporary lobs are used.
+
+  - Fix a problem to assign NULL bind value to object type bind variables.
+    (reported by Raimonds Simanovskis)
+
+  - Support LOB datatypes in object type.
+    (reported by Michael Sexton)
+
+  - Fix to compile on cygwin. The declaration of 'boolean' in Oracle
+    conflicts with that of latest cygwin.
+    (reported by Don Hill).
+
+  - Fix to complie for the 32-bit ruby which was compiled on x86_64 linux
+    and configured without '--build', '--host' nor '--target'.
+    The RUBY_PLATFORM is 'x86_64-linux' even though the ruby is 32-bit.
+    (reported by Jason Renschler)
+
+  - Fix wrong dependencies in Makefile when running 'make -jNNN (where NNN >= 2)'
+    (contributed by Alyano Alyanos. See bug #28129 on rubyforge.)
+
+  - Fix to compile on HP-UX. Duplicated const qualifiers prevented HP-UX cc
+    from compiling. (reported by Sebastian YEPES)
+
 2.0.4:
 
 * New Features

data/VERSION

@@ -1 +1 @@
-2.0.4
+2.0.5

data/dist-files

@@ -55,6 +55,7 @@ lib/oci8/metadata.rb
 lib/oci8/object.rb
 lib/oci8/oci8.rb
 lib/oci8/oracle_version.rb
+lib/oci8/properties.rb
 test/README
 test/config.rb
 test/test_all.rb

data/lib/oci8.rb

@@ -18,14 +18,24 @@ if RUBY_PLATFORM =~ /cygwin/
   end
 end
 
+so_basename = 'oci8lib_'
+if defined? RUBY_ENGINE and RUBY_ENGINE != 'ruby'
+  so_basename += RUBY_ENGINE
+end
+
+# The suffix number indicates the ruby API version.
+#  18  - ruby 1.8.x
+#  191 - ruby 1.9.1 and 1.9.2
+#  19x - ruby 1.9.x future version which will break the API compatibility
 case RUBY_VERSION
 when /^1\.9/
-  require 'oci8lib_191'
+  so_basename += '191'
 when /^1\.8/
-  require 'oci8lib_18'
+  so_basename += '18'
 else
   raise 'unsupported ruby version: ' + RUBY_VERSION
 end
+require so_basename
 
 if OCI8.respond_to? :encoding
   if defined? DEFAULT_OCI8_ENCODING
@@ -75,8 +85,9 @@ require 'oci8/bindtype.rb'
 require 'oci8/metadata.rb'
 require 'oci8/compat.rb'
 require 'oci8/object.rb'
+require 'oci8/properties.rb'
 
 class OCI8
-  VERSION = '2.0.4'
+  VERSION = '2.0.5'
   CLIENT_VERSION = '1020'
 end

data/lib/oci8.rb.in

@@ -18,14 +18,24 @@ if RUBY_PLATFORM =~ /cygwin/
   end
 end
 
+so_basename = 'oci8lib_'
+if defined? RUBY_ENGINE and RUBY_ENGINE != 'ruby'
+  so_basename += RUBY_ENGINE
+end
+
+# The suffix number indicates the ruby API version.
+#  18  - ruby 1.8.x
+#  191 - ruby 1.9.1 and 1.9.2
+#  19x - ruby 1.9.x future version which will break the API compatibility
 case RUBY_VERSION
 when /^1\.9/
-  require 'oci8lib_191'
+  so_basename += '191'
 when /^1\.8/
-  require 'oci8lib_18'
+  so_basename += '18'
 else
   raise 'unsupported ruby version: ' + RUBY_VERSION
 end
+require so_basename
 
 if OCI8.respond_to? :encoding
   if defined? DEFAULT_OCI8_ENCODING
@@ -75,6 +85,7 @@ require 'oci8/bindtype.rb'
 require 'oci8/metadata.rb'
 require 'oci8/compat.rb'
 require 'oci8/object.rb'
+require 'oci8/properties.rb'
 
 class OCI8
   VERSION = '@@OCI8_MODULE_VERSION@@'

data/lib/oci8/.document

@@ -3,3 +3,4 @@ object.rb
 metadata.rb
 oracle_version.rb
 oci8.rb
+properties.rb

data/lib/oci8/bindtype.rb

@@ -1,7 +1,7 @@
 #--
 # bindtype.rb -- OCI8::BindType
 #
-# Copyright (C) 2009 KUBO Takehiro <kubo@jiubao.org>
+# Copyright (C) 2009-2010 KUBO Takehiro <kubo@jiubao.org>
 #++
 
 class OCI8
@@ -46,6 +46,12 @@ class OCI8
       end
     end
 
+    class BasicNumberType < OCI8::BindType::OraNumber
+      def get()
+        (val = super()) && (val.has_decimal_part? ? val.to_f : val.to_i)
+      end
+    end
+
     # get/set Number (for OCI8::SQLT_NUM)
     class Number
       def self.create(con, val, param, max_array_size)
@@ -116,6 +122,8 @@ class OCI8
               length = val.size
             end
           end
+          # use the default value when :nchar is not set explicitly.
+          nchar = OCI8.properties[:bind_string_as_nchar] unless param.has_key?(:nchar)
         when OCI8::Metadata::Base
           case param.data_type
           when :char, :varchar2
@@ -124,13 +132,18 @@ class OCI8
             # The length of a Japanese half-width kana is one in Shift_JIS,
             # two in EUC-JP, three in UTF-8.
             length *= 3 unless param.char_used?
+            nchar = (param.charset_form == :nchar)
           when :raw
             # HEX needs twice space.
             length = param.data_size * 2
           end
         end
         length = @@minimum_bind_length if length.nil? or length < @@minimum_bind_length
-        self.new(con, val, length, max_array_size)
+        if nchar
+          OCI8::BindType::NCHAR.new(con, val, length, max_array_size)
+        else
+          OCI8::BindType::CHAR.new(con, val, length, max_array_size)
+        end
       end
     end
 
@@ -153,7 +166,7 @@ class OCI8
 
     class Long < OCI8::BindType::String
       def self.create(con, val, param, max_array_size)
-        self.new(con, val, con.long_read_len, max_array_size)
+        super(con, val, {:length => con.long_read_len}, max_array_size)
       end
     end
 

data/lib/oci8/datetime.rb

@@ -38,6 +38,14 @@ class OCI8
         @@time_new_accepts_timezone = false # prior to ruby 1.9.2
       end
 
+      begin
+        # 2001-01-01 00:00:59.999
+        ::DateTime.civil(2001, 1, 1, 0, 0, Rational(59_999, 1000), 0)
+        @@datetime_has_fractional_second_bug = false
+      rescue ArgumentError
+        @@datetime_has_fractional_second_bug = true
+      end
+
       def self.default_timezone
         @@default_timezone
       end
@@ -162,8 +170,8 @@ class OCI8
           return nil if ary.nil?
 
           year, month, day, hour, minute, sec, fsec, tz_hour, tz_min = ary
-          if sec >= 59 and fsec != 0
-            # convert to a DateTime via a String as a last resort.
+          if @@datetime_has_fractional_second_bug and sec >= 59 and fsec != 0
+            # convert to a DateTime via a String as a workaround
             if tz_hour >= 0 && tz_min >= 0
               sign = ?+
             else
@@ -245,7 +253,7 @@ class OCI8
     end
 
     if OCI8.oracle_client_version >= ORAVER_9_0
-      class DateTimeViaOCITimestamp < OCI8::BindType::OCITimestamp # :nodoc:
+      class DateTimeViaOCITimestampTZ < OCI8::BindType::OCITimestampTZ # :nodoc:
         include OCI8::BindType::Util
 
         def set(val) # :nodoc:
@@ -257,7 +265,7 @@ class OCI8
         end
       end
 
-      class TimeViaOCITimestamp < OCI8::BindType::OCITimestamp # :nodoc:
+      class TimeViaOCITimestampTZ < OCI8::BindType::OCITimestampTZ # :nodoc:
         include OCI8::BindType::Util
 
         def set(val) # :nodoc:
@@ -335,7 +343,7 @@ class OCI8
       if OCI8.oracle_client_version >= ORAVER_9_0
         def self.create(con, val, param, max_array_size) # :nodoc:
           if true # TODO: check Oracle server version
-            DateTimeViaOCITimestamp.new(con, val, param, max_array_size)
+            DateTimeViaOCITimestampTZ.new(con, val, param, max_array_size)
           else
             DateTimeViaOCIDate.new(con, val, param, max_array_size)
           end
@@ -414,7 +422,7 @@ class OCI8
       if OCI8.oracle_client_version >= ORAVER_9_0
         def self.create(con, val, param, max_array_size) # :nodoc:
           if true # TODO: check Oracle server version
-            TimeViaOCITimestamp.new(con, val, param, max_array_size)
+            TimeViaOCITimestampTZ.new(con, val, param, max_array_size)
           else
             TimeViaOCIDate.new(con, val, param, max_array_size)
           end

data/lib/oci8/encoding-init.rb

@@ -5,7 +5,8 @@
 # try to get NLS_LANG.
 nls_lang = ENV['NLS_LANG']
 
-if defined? OCI8::Win32Util
+# if NLS_LANG is not set, get it from the Windows registry.
+if nls_lang.nil? and defined? OCI8::Win32Util
   dll_path = OCI8::Win32Util.dll_path.upcase
   if dll_path =~ %r{\\BIN\\OCI.DLL}
     oracle_home = $`
@@ -33,6 +34,10 @@ if nls_lang
   if enc.nil?
     raise "Ruby encoding name is not found in encoding.yml for NLS_LANG #{nls_lang}."
   end
+  if enc.is_a? Array
+    # Use the first available encoding in the array.
+    enc = enc.find do |e| Encoding.find(e) rescue false; end
+  end
 else
   warn "Warning: NLS_LANG is not set. fallback to US-ASCII."
   enc = 'US-ASCII'

data/lib/oci8/encoding.yml

@@ -40,7 +40,7 @@ ZHS16GBK:          GBK
 # MS Windows Code Page 950 with Hong Kong Supplementary Character
 # Set HKSCS-2001 (character set conversion to and from Unicode is
 # based on Unicode 3.0)
-ZHT16HKSCS:        Big5         # Does the Big5 include HKSCS?
+ZHT16HKSCS:        [Big5-HKSCS, Big5]
 
 # MS Windows Code Page 950 Traditional Chinese
 ZHT16MSWIN950:     Big5
@@ -166,7 +166,7 @@ ZHT16DBT:          nil          # FIXME
 # MS Windows Code Page 950 with Hong Kong Supplementary Character
 # Set HKSCS-2001 (character set conversion to and from Unicode is
 # based on Unicode 3.1)
-ZHT16HKSCS31:      Big5         # Does the Big5 include HKSCS?
+ZHT16HKSCS31:      [Big5-HKSCS, Big5]
 
 # SOPS 32-bit Traditional Chinese
 ZHT32SOPS:         nil          # FIXME

data/lib/oci8/object.rb

@@ -394,7 +394,7 @@ EOS
             @class_methods[type_method.name.downcase.intern] = result_type
           end
         else
-          warn "unsupported return type (#{schema_name}.#{name}.#{type_method.name})" if $VERBOSE
+          warn "unsupported return type (#{metadata.schema_name}.#{metadata.name}.#{type_method.name})" if $VERBOSE
         end
       end
     end
@@ -457,6 +457,16 @@ EOS
         #[ATTR_NAMED_COLLECTION, [datatype, typeinfo], SIZE_OF_POINTER, 2, ALIGNMENT_OF_POINTER]
         tdo = con.get_tdo_by_metadata(metadata.type_metadata)
         [ATTR_NAMED_COLLECTION, tdo, tdo.val_size, tdo.ind_size, tdo.alignment]
+      when :clob
+        if metadata.charset_form != :nchar
+          [ATTR_CLOB, con, SIZE_OF_POINTER, 2, ALIGNMENT_OF_POINTER]
+        else
+          [ATTR_NCLOB, con, SIZE_OF_POINTER, 2, ALIGNMENT_OF_POINTER]
+        end
+      when :blob
+        [ATTR_BLOB, con, SIZE_OF_POINTER, 2, ALIGNMENT_OF_POINTER]
+      when :bfile
+        [ATTR_BFILE, con, SIZE_OF_POINTER, 2, ALIGNMENT_OF_POINTER]
       else
         raise "unsupported typecode #{metadata.typecode}"
       end
@@ -487,6 +497,7 @@ EOS
 
   class NamedType
     def to_value
+      return nil if self.null?
       obj = tdo.ruby_class.new
       obj.instance_variable_set(:@attributes, self.attributes)
       obj
@@ -503,20 +514,28 @@ EOS
     end
 
     def attributes=(obj)
-      obj = obj.instance_variable_get(:@attributes) unless obj.is_a? Hash
-      tdo.attributes.each do |attr|
-        attr_val = obj[attr.name]
-        attr_val = attr.set_proc.call(attr_val) if attr.set_proc
-        set_attribute(attr.datatype, attr.typeinfo, attr.val_offset, attr.ind_offset, attr_val)
+      if obj.nil?
+        self.null = true
+      else
+        obj = obj.instance_variable_get(:@attributes) unless obj.is_a? Hash
+        tdo.attributes.each do |attr|
+          attr_val = obj[attr.name]
+          attr_val = attr.set_proc.call(attr_val) if attr.set_proc
+          set_attribute(attr.datatype, attr.typeinfo, attr.val_offset, attr.ind_offset, attr_val)
+        end
+        self.null = false
       end
     end
   end
 
   class NamedCollection
     def to_value
-      obj = tdo.ruby_class.new
-      obj.instance_variable_set(:@attributes, self.attributes)
-      obj
+      attr = self.attributes
+      if attr
+        obj = tdo.ruby_class.new
+        obj.instance_variable_set(:@attributes, attr)
+        obj
+      end
     end
 
     def attributes

data/lib/oci8/oci8.rb

@@ -8,6 +8,7 @@
 #
 
 require 'date'
+require 'yaml'
 
 # A connection to a Oracle database server.
 #
@@ -543,13 +544,28 @@ class OraDate
 end
 
 class OraNumber
-  def yaml_initialize(type, val) # :nodoc:
-    initialize(val)
-  end
 
-  def to_yaml(opts = {}) # :nodoc:
-    YAML.quick_emit(object_id, opts) do |out|
-      out.scalar(taguri, self.to_s, :plain)
+  if defined? Psych and YAML == Psych
+
+    yaml_tag '!ruby/object:OraNumber'
+    def encode_with coder # :nodoc:
+      coder.scalar = self.to_s
+    end
+
+    def init_with coder # :nodoc:
+      initialize(coder.scalar)
+    end
+
+  else
+
+    def yaml_initialize(type, val) # :nodoc:
+      initialize(val)
+    end
+
+    def to_yaml(opts = {}) # :nodoc:
+      YAML.quick_emit(object_id, opts) do |out|
+        out.scalar(taguri, self.to_s, :plain)
+      end
     end
   end
 

data/lib/oci8/properties.rb

@@ -0,0 +1,50 @@
+# properties.rb -- implements OCI8.properties
+#
+# Copyright (C) 2010 KUBO Takehiro <kubo@jiubao.org>
+
+class OCI8
+
+  @@properties = {
+    :bind_string_as_nchar => false,
+  }
+
+  def @@properties.[](name)
+    raise IndexError, "No such property name: #{name}" unless @@properties.has_key?(name)
+    super(name)
+  end
+
+  def @@properties.[]=(name, val)
+    raise IndexError, "No such property name: #{name}" unless @@properties.has_key?(name)
+    case name
+    when :bind_string_as_nchar
+      val = val ? true : false
+    end
+    super(name, val)
+  end
+
+  # call-seq:
+  #   OCI8.properties -> a customized Hash
+  #
+  # (new in 2.0.5)
+  #
+  # Returns a Hash which ruby-oci8 global settings.
+  # The hash's setter and getter methods are customized to check
+  # property names and values.
+  #
+  #   # get properties
+  #   OCI8.properties[:bind_string_as_nchar]  # => false
+  #   OCI8.properties[:invalid_property_name] # raises an IndexError
+  #
+  #   # set properties
+  #   OCI8.properties[:bind_string_as_nchar] = true
+  #   OCI8.properties[:invalid_property_name] = true # raises an IndexError
+  #
+  # Supported properties are listed below:
+  #
+  # [:bind_string_as_nchar]
+  #     +true+ when string bind variables are bound as NCHAR,
+  #     otherwise +false+. The default value is +false+.
+  def self.properties
+    @@properties
+  end
+end

data/test/test_break.rb

@@ -23,23 +23,22 @@ class TestBreak < Test::Unit::TestCase
 
   TIME_IN_PLSQL = 5
   TIME_TO_BREAK = 2
-  MARGIN = 0.1
 
   def do_test_ocibreak(conn, expect)
     $start_time = Time.now
 
     th = Thread.start do 
       begin
-	conn.exec("BEGIN DBMS_LOCK.SLEEP(#{TIME_IN_PLSQL}); END;")
-	assert_equal(expect[PLSQL_DONE], (Time.now - $start_time + MARGIN).to_i, 'PLSQL_DONE')
+        conn.exec("BEGIN DBMS_LOCK.SLEEP(#{TIME_IN_PLSQL}); END;")
+        assert_equal(expect[PLSQL_DONE], (Time.now - $start_time).round, 'PLSQL_DONE')
       rescue OCIBreak
-	assert_equal(expect[OCIBREAK], (Time.now - $start_time + MARGIN).to_i, 'OCIBREAK')
+        assert_equal(expect[OCIBREAK], (Time.now - $start_time).round, 'OCIBREAK')
       end
     end
 
-    sleep(0.01) # make a time to run DBMS_LOCK.SLEEP
-    sleep(TIME_TO_BREAK)
-    assert_equal(expect[SEND_BREAK], (Time.now - $start_time + MARGIN).to_i, 'SEND_BREAK')
+    sleep(0.3) # Wait until DBMS_LOCK.SLEEP is running.
+    sleep(TIME_TO_BREAK - 0.3)
+    assert_equal(expect[SEND_BREAK], (Time.now - $start_time).round, 'SEND_BREAK')
     conn.break()
     th.join
   end

data/test/test_oranumber.rb

@@ -125,6 +125,33 @@ class TestOraNumber < Test::Unit::TestCase
         val = $1+'.'+$2 if /(-?)0\.(.*)/ =~ val
         assert_equal(val, cursor[:out])
       end
+      # Infinity and -Infinity
+      ['~', '-~'].each do |val|
+        cursor[:in] = OraNumber.new(val)
+        cursor.exec
+        assert_equal(val, cursor[:out])
+      end
+      if OCI8::oracle_client_version >= OCI8::ORAVER_10_1
+        cursor = conn.parse(<<EOS)
+BEGIN
+  IF (:in_oranum = CAST(:in_binary_double AS NUMBER)) THEN
+    :result := 'match';
+  ELSE
+    :result := 'unmatch';
+  END IF;
+END;
+EOS
+        cursor.bind_param(:in_oranum, nil, OraNumber)
+        cursor.bind_param(:in_binary_double, nil, :binary_double)
+        cursor.bind_param(:result, nil, String, 7)
+        [['~', 1.0/0.0], ['-~', -1.0/0.0]].each do |val|
+          cursor[:in_oranum] = OraNumber.new(val[0])
+          cursor[:in_binary_double] = val[1]
+          cursor.exec
+          assert_equal(cursor[:result], 'match')
+        end
+      end
+
     ensure
       conn.logoff
     end
@@ -142,13 +169,39 @@ class TestOraNumber < Test::Unit::TestCase
         cursor.exec
         assert_equal(OraNumber.new(val), cursor[:out])
       end
+      # Infinity and -Infinity
+      if OCI8::oracle_client_version >= OCI8::ORAVER_10_1
+        cursor = conn.parse("BEGIN :out := CAST(:in AS NUMBER); END;")
+        cursor.bind_param(:out, OraNumber)
+        cursor.bind_param(:in, nil, :binary_double)
+        [['~', 1.0/0.0], ['-~', -1.0/0.0]].each do |val|
+          cursor[:in] = val[1]
+          cursor.exec
+          assert_equal(OraNumber.new(val[0]), cursor[:out])
+        end
+      end
+    ensure
+      conn.logoff
+    end
+  end
+
+  def test_bind_basic_number_type
+    conn = get_oci8_connection
+    bind_type = OCI8::BindType::Mapping[:number]
+    begin
+      OCI8::BindType::Mapping[:number] = OCI8::BindType::BasicNumberType
+      assert_kind_of(NilClass, conn.select_one('select CAST(NULL AS NUMBER) from dual')[0])
+      assert_kind_of(Integer,  conn.select_one('select 0.0 from dual')[0])
+      assert_kind_of(Integer,  conn.select_one('select 10.0 from dual')[0])
+      assert_kind_of(Float,    conn.select_one('select 10.1 from dual')[0])
     ensure
       conn.logoff
+      OCI8::BindType::Mapping[:number] = bind_type
     end
   end
 
   def test_dup
-    LARGE_RANGE_VALUES.each do |x|
+    (LARGE_RANGE_VALUES + ['~', '-~']).each do |x|
       n = OraNumber.new(x)
       assert_equal(n, n.dup)
       assert_equal(n, n.clone)
@@ -156,14 +209,14 @@ class TestOraNumber < Test::Unit::TestCase
   end
 
   def test_marshal
-    LARGE_RANGE_VALUES.each do |x|
+    (LARGE_RANGE_VALUES + ['~', '-~']).each do |x|
       n = OraNumber.new(x)
       assert_equal(n, Marshal.load(Marshal.dump(n)))
     end
   end
 
   def test_yaml
-    LARGE_RANGE_VALUES.each do |x|
+    (LARGE_RANGE_VALUES + ['~', '-~']).each do |x|
       n = OraNumber.new(x)
       assert_equal(n, YAML.load(YAML.dump(n)))
     end
@@ -200,11 +253,28 @@ class TestOraNumber < Test::Unit::TestCase
 
   # OCI8::Math.atan2(y, x) -> ocinumber
   def test_math_atan2
+    # Prior to ruby 1.9.2:
+    #   Following method calls' return values depend on the underneath C library
+    #   implementation.
+    #
+    #     Math::atan2(+0.0, +0.0)
+    #     Math::atan2(-0.0, +0.0)
+    #     Math::atan2(+0.0, -0.0)
+    #     Math::atan2(-0.0, -0.0)
+    #
+    #   They are +0.0, -0.0, +PI and -PI respectively as far as I checked them on
+    #   Windows and Linux.
+    #
+    # After ruby 1.9.2:
+    #   They all raise a Math::DomainError exception.
+    #
+    # In contrast to Math::atan2, OCI8::Math::atan2(0, 0) allways returns 0 because
+    # OraNumber doesn't have the difference between +0 and -0.
     compare_with_float2(SMALL_RANGE_VALUES, SMALL_RANGE_VALUES,
-                        Proc.new {|x, y| Math::atan2(x, y.to_f)},
+                        Proc.new {|x, y| (x.to_f == 0 && y.to_f == 0) ? 0 : Math::atan2(x, y.to_f)},
                         Proc.new {|x, y| OCI8::Math::atan2(x, y.to_f)})
     compare_with_float2(SMALL_RANGE_VALUES, SMALL_RANGE_VALUES,
-                        Proc.new {|x, y| Math::atan2(y.to_f, x)},
+                        Proc.new {|x, y| (x.to_f == 0 && y.to_f == 0) ? 0 : Math::atan2(y.to_f, x)},
                         Proc.new {|x, y| OCI8::Math::atan2(y.to_f, x)})
   end
 
@@ -652,4 +722,25 @@ class TestOraNumber < Test::Unit::TestCase
       assert_equal(ary[1], OraNumber.new(ary[0]).to_s)
     end
   end
+
+  def test_dump
+    conn = get_oci8_connection
+    begin
+      cursor = conn.parse("select dump(to_number(:1)) from dual")
+      cursor.bind_param(1, nil, String, 40)
+      LARGE_RANGE_VALUES.each do |val|
+        cursor[1] = val
+        cursor.exec
+        assert_equal(cursor.fetch[0], OraNumber.new(val).dump)
+      end
+    ensure
+      conn.logoff
+    end
+    LARGE_RANGE_VALUES
+  end
+
+  def test_has_decimal_part
+    assert_equal(false, OraNumber(10.0).has_decimal_part?)
+    assert_equal(true,  OraNumber(10.1).has_decimal_part?)
+  end
 end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-oci8
 version: !ruby/object:Gem::Version 
-  version: 2.0.4
+  hash: 5
+  prerelease: false
+  segments: 
+  - 2
+  - 0
+  - 5
+  version: 2.0.5
 platform: x86-mingw32
 authors: 
 - KUBO Takehiro
@@ -9,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-28 00:00:00 +09:00
+date: 2011-06-12 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -52,6 +58,7 @@ files:
 - lib/oci8/object.rb
 - lib/oci8/oci8.rb
 - lib/oci8/oracle_version.rb
+- lib/oci8/properties.rb
 - test/README
 - test/config.rb
 - test/test_all.rb
@@ -86,21 +93,29 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 55
+      segments: 
+      - 1
+      - 8
+      - 0
       version: 1.8.0
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: ruby-oci8
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Ruby interface for Oracle using OCI8 API