ruby-oci8 2.0.6-x86-mingw32 → 2.1.0-x86-mingw32

data/test/test_oci8.rb

@@ -96,9 +96,9 @@ EOS
     cursor = @conn.parse("INSERT INTO test_table VALUES (:C, :V, :N, :D1, :D2, :D3, :D4, :INT, :BIGNUM)")
     1.upto(10) do |i|
       if i == 1
-	dt = [nil, OraDate]
+        dt = [nil, OraDate]
       else
-	dt = OraDate.new(2000 + i, 8, 3, 23, 59, 59)
+        dt = OraDate.new(2000 + i, i % 2 == 0 ? 7 : 1, 3, 23, 59, 59)
       end
       cursor.exec(format("%10d", i * 10), i.to_s, i, dt, dt, dt, dt, i * 11111111111, i * 10000000000)
     end
@@ -122,9 +122,10 @@ EOS
 	assert_nil(rv[5])
 	assert_nil(rv[6])
       else
-        tm = Time.local(2000 + i, 8, 3, 23, 59, 59)
-	dt = Date.civil(2000 + i, 8, 3)
-	dttm = DateTime.civil(2000 + i, 8, 3, 23, 59, 59, Time.now.utc_offset.to_r/86400)
+        month = i % 2 == 0 ? 7 : 1
+        tm = Time.local(2000 + i, month, 3, 23, 59, 59)
+        dt = Date.civil(2000 + i, month, 3)
+        dttm = DateTime.civil(2000 + i, month, 3, 23, 59, 59, tm.utc_offset.to_r/86400)
 	assert_equal(tm, rv[3])
 	assert_equal(tm, rv[4])
 	assert_equal(dt, rv[5])
@@ -148,9 +149,10 @@ EOS
 	assert_nil(row['D3'])
 	assert_nil(row['D4'])
       else
-        tm = Time.local(2000 + i, 8, 3, 23, 59, 59)
-	dt = Date.civil(2000 + i, 8, 3)
-	dttm = DateTime.civil(2000 + i, 8, 3, 23, 59, 59, Time.now.utc_offset.to_r/86400)
+        month = i % 2 == 0 ? 7 : 1
+        tm = Time.local(2000 + i, month, 3, 23, 59, 59)
+        dt = Date.civil(2000 + i, month, 3)
+        dttm = DateTime.civil(2000 + i, month, 3, 23, 59, 59, tm.utc_offset.to_r/86400)
 	assert_equal(tm, row['D1'])
 	assert_equal(tm, row['D2'])
 	assert_equal(dt, row['D3'])
@@ -431,4 +433,21 @@ EOS
     end
   end
 
+  def test_last_error
+    # OCI8#parse and OCI8#exec reset OCI8#last_error
+    @conn.last_error = 'dummy'
+    @conn.exec('begin null; end;')
+    assert_nil(@conn.last_error)
+    @conn.last_error = 'dummy'
+    cursor = @conn.parse('select col1, max(col2) from (select 1 as col1, null as col2 from dual) group by col1')
+    assert_nil(@conn.last_error)
+
+    # When an OCI function returns OCI_SUCCESS_WITH_INFO, OCI8#last_error is set.
+    @conn.last_error = 'dummy'
+    cursor.exec
+    assert_equal('dummy', @conn.last_error)
+    cursor.fetch
+    assert_kind_of(OCISuccessWithInfo, @conn.last_error)
+    assert_equal(24347, @conn.last_error.code)
+  end
 end # TestOCI8

data/test/test_oranumber.rb

@@ -743,4 +743,45 @@ EOS
     assert_equal(false, OraNumber(10.0).has_decimal_part?)
     assert_equal(true,  OraNumber(10.1).has_decimal_part?)
   end
+
+  def test_float_conversion_type_ruby
+    orig = OCI8.properties[:float_conversion_type]
+    conn = get_oci8_connection
+    begin
+      OCI8.properties[:float_conversion_type] = :ruby
+      # Oracle Number -> Ruby Float
+      cursor = conn.parse('begin :out := :in; end;')
+      cursor.bind_param(:in, nil, String, 50)
+      cursor.bind_param(:out, nil, Float)
+      LARGE_RANGE_VALUES.each do |n|
+        cursor[:in] = n
+        cursor.exec
+        assert_equal(n.to_f, cursor[:out])
+      end
+      cursor.close
+      # Ruby Float -> Oracle Number
+      LARGE_RANGE_VALUES.each do |n|
+        float_val = n.to_f
+        expected_val = float_val.to_s
+        # convert 
+        if /(-?)(\d).(\d+)e([+-]?\d+)/ =~ expected_val
+          sign = $1
+          int = $2
+          frac = $3
+          shift = $4.to_i
+          if frac.length <= shift
+            expected_val = sign + int + frac + '0' * (shift - frac.length)
+          elsif shift < 0
+            expected_val = sign + '0.' + '0' * (-shift - 1) + int + frac
+            expected_val.gsub!(/0+$/, '')
+          end
+        end
+        expected_val.gsub!(/\.0$/, '')
+        assert_equal(expected_val, OraNumber(float_val).to_s, "n = #{n}, float_val.to_s = #{float_val.to_s}")
+      end
+    ensure
+      OCI8.properties[:float_conversion_type] = orig
+      conn.logoff
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-oci8
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 11
   prerelease: false
   segments: 
   - 2
+  - 1
   - 0
-  - 6
-  version: 2.0.6
+  version: 2.1.0
 platform: x86-mingw32
 authors: 
 - KUBO Takehiro
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-14 00:00:00 +09:00
+date: 2011-12-13 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -51,12 +51,14 @@ files:
 - lib/oci8/.document
 - lib/oci8/bindtype.rb
 - lib/oci8/compat.rb
+- lib/oci8/connection_pool.rb
 - lib/oci8/datetime.rb
 - lib/oci8/encoding-init.rb
 - lib/oci8/encoding.yml
 - lib/oci8/metadata.rb
 - lib/oci8/object.rb
 - lib/oci8/oci8.rb
+- lib/oci8/ocihandle.rb
 - lib/oci8/oracle_version.rb
 - lib/oci8/properties.rb
 - test/README
@@ -65,22 +67,25 @@ files:
 - test/test_appinfo.rb
 - test/test_array_dml.rb
 - test/test_bind_raw.rb
+- test/test_bind_string.rb
 - test/test_bind_time.rb
 - test/test_break.rb
 - test/test_clob.rb
+- test/test_connection_pool.rb
 - test/test_connstr.rb
 - test/test_encoding.rb
 - test/test_datetime.rb
 - test/test_dbi.rb
 - test/test_dbi_clob.rb
+- test/test_error.rb
 - test/test_metadata.rb
 - test/test_oci8.rb
 - test/test_oracle_version.rb
 - test/test_oradate.rb
 - test/test_oranumber.rb
 - test/test_rowid.rb
-- lib/oci8lib_18.so
 - lib/oci8lib_191.so
+- lib/oci8lib_18.so
 - lib/oci8.rb
 has_rdoc: true
 homepage: http://ruby-oci8.rubyforge.org