ruby-oci8 2.0.4 → 2.0.5

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

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 2
   - 0
-  - 4
-  version: 2.0.4
+  - 5
+  version: 2.0.5
 platform: ruby
 authors: 
 - KUBO Takehiro
@@ -14,7 +14,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: []
 
@@ -86,6 +86,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
@@ -117,6 +118,7 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -126,6 +128,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: 1.8.0
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -135,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ruby-oci8
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Ruby interface for Oracle using OCI8 API