ruby-oci8 2.0.3 → 2.0.4

data/ext/oci8/oranumber_util.h

@@ -0,0 +1,24 @@
+/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
+/*
+ * oranumber_util.h - part of ruby-oci8
+ *
+ * Copyright (C) 2010 KUBO Takehiro <kubo@jiubao.org>
+ */
+#ifndef ORANUMBER_UTIL_H
+#define ORANUMBER_UTIL_H 1
+#include <orl.h>
+
+#define ORANUMBER_INVALID_INTERNAL_FORMAT -1
+#define ORANUMBER_TOO_SHORT_BUFFER -2
+
+#define ORANUMBER_SUCCESS 0
+#define ORANUMBER_INVALID_NUMBER 1722
+#define ORANUMBER_NUMERIC_OVERFLOW 1426
+
+int oranumber_to_str(const OCINumber *on, char *buf, int buflen);
+int oranumber_from_str(OCINumber *on, const char *buf, int buflen);
+
+#define ORANUMBER_DUMP_BUF_SIZ 99
+int oranumber_dump(const OCINumber *on, char *buf);
+
+#endif

data/ext/oci8/stmt.c

@@ -342,16 +342,18 @@ static VALUE oci8_stmt_do_fetch(oci8_stmt_t *stmt, oci8_svcctx_t *svcctx)
     oci8_bind_t *obind;
     const oci8_bind_class_t *bind_class;
 
-    obind = (oci8_bind_t *)stmt->base.children;
-    do {
-        if (obind->base.type == OCI_HTYPE_DEFINE) {
-            bind_class = (const oci8_bind_class_t *)obind->base.klass;
-            if (bind_class->pre_fetch_hook != NULL) {
-                bind_class->pre_fetch_hook(obind, stmt->svc);
+    if (stmt->base.children != NULL) {
+        obind = (oci8_bind_t *)stmt->base.children;
+        do {
+            if (obind->base.type == OCI_HTYPE_DEFINE) {
+                bind_class = (const oci8_bind_class_t *)obind->base.klass;
+                if (bind_class->pre_fetch_hook != NULL) {
+                    bind_class->pre_fetch_hook(obind, stmt->svc);
+                }
             }
-        }
-        obind = (oci8_bind_t *)obind->base.next;
-    } while (obind != (oci8_bind_t*)stmt->base.children);
+            obind = (oci8_bind_t *)obind->base.next;
+        } while (obind != (oci8_bind_t*)stmt->base.children);
+    }
     rv = OCIStmtFetch_nb(svcctx, stmt->base.hp.stmt, oci8_errhp, 1, OCI_FETCH_NEXT, OCI_DEFAULT);
 #ifdef USE_DYNAMIC_FETCH
     while (rv == OCI_NEED_DATA) {

data/lib/oci8/datetime.rb

@@ -92,9 +92,13 @@ class OCI8
         end
         return [year, month, day, hour, minute, sec] unless full
 
-        # sec_fraction
+        # fractional second
         if val.respond_to? :sec_fraction
           fsec = (val.sec_fraction * @@datetime_fsec_base).to_i
+        elsif val.respond_to? :nsec
+          fsec = val.nsec
+        elsif val.respond_to? :usec
+          fsec = val.usec * 1000
         else
           fsec = 0
         end

data/test/test_oranumber.rb

@@ -473,6 +473,45 @@ class TestOraNumber < Test::Unit::TestCase
       actual_val = OraNumber.new(x).to_s
       assert_equal(expected_val, actual_val, x)
     end
+
+    conn = get_oci8_connection()
+    begin
+      cursor = conn.parse('select to_number(:1) from dual')
+      cursor.define(1, OraNumber)
+      cursor.bind_param(1, nil, String, 200)
+      [
+       "100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", # 1E125
+       "10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", # 1E124
+       "234567890234567890234567890234567890000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+       "23456789023456789023456789023456789000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+       "2345678902345678902345678902345678900",
+       "234567890234567890234567890234567890",
+       "23456789023456789023456789023456789",
+       "2345678902345678902345678902345678.9",
+       "234567890234567890234567890234567.89",
+       "23.456789023456789023456789023456789",
+       "2.3456789023456789023456789023456789",
+       "0.23456789023456789023456789023456789", # 2.34..snip..E-1
+       "0.023456789023456789023456789023456789", # 2.34..snip..E-2
+       "0.0023456789023456789023456789023456789", # 2.34..snip..E-3
+       "0.00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000023456789023456789023456789023456789", # 2.34..snip..E-130
+       "0.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001", # 1E-129
+       "0.0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001", # 1E-130
+      ].each do |str|
+        cursor[1] = str
+        cursor.exec
+        onum = cursor.fetch[0]
+        assert_equal(str, onum.to_s, "test data: " + str)
+
+        str = '-' + str
+        cursor[1] = str
+        cursor.exec
+        onum = cursor.fetch[0]
+        assert_equal(str, onum.to_s, "test data: " + str)
+      end
+    ensure
+      conn.logoff
+    end
   end
 
   # onum.truncate -> integer
@@ -488,6 +527,109 @@ class TestOraNumber < Test::Unit::TestCase
     end
   end
 
+  def test_new_from_string
+    conn = get_oci8_connection()
+    begin
+      cursor = conn.parse('select to_number(:1) from dual')
+      cursor.define(1, OraNumber)
+      cursor.bind_param(1, nil, String, 200)
+      [
+       "100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", # 1E125
+       "10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", # 1E124
+       "234567890234567890234567890234567890000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+       "23456789023456789023456789023456789000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+       "2345678902345678902345678902345678900",
+       "234567890234567890234567890234567890",
+       "23456789023456789023456789023456789",
+       "2345678902345678902345678902345678.9",
+       "234567890234567890234567890234567.89",
+       "23.456789023456789023456789023456789",
+       "2.3456789023456789023456789023456789",
+       "0.23456789023456789023456789023456789", # 2.34..snip..E-1
+       "0.023456789023456789023456789023456789", # 2.34..snip..E-2
+       "0.0023456789023456789023456789023456789", # 2.34..snip..E-3
+       "0.00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000023456789023456789023456789023456789", # 2.34..snip..E-130
+       "0.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001", # 1E-129
+       "0.0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001", # 1E-130
+
+       # leading spaces
+       "       123",
+       # trailing spaces
+       "123        ",
+       "123.456    ",
+       "123E10    ",
+       "123.456E10    ",
+       # scientific notation
+       "1234567890000e-9",
+       "123456789000e-8",
+       "123456789e-5",
+       "12345.6789e-1",
+       "12.3456789e+1",
+       "0.0000123456789E7",
+       # round to zero
+       "1E-131",
+       # overflow
+       "1E126",
+       "10E125",
+       "100000000000E115",
+       "1E+126",
+       # invalid number
+       "",
+       "     ",
+       "abc",
+       "1E10a",
+       "11E10a",
+       "1.1.1",
+       # round down
+       "444444444444444444444444444444444444444444444444440000",
+       "44444444444444444444444444444444444444444444444444000",
+       "44444444444444444444444444.444444444444444444444444",
+       "4444444444444444444444444.4444444444444444444444444",
+       "0.000000044444444444444444444444444444444444444444444444444",
+       "0.00000044444444444444444444444444444444444444444444444444",
+       # round up
+       "555555555555555555555555555555555555555555555555550000",
+       "55555555555555555555555555555555555555555555555555000",
+       "55555555555555555555555555.555555555555555555555555",
+       "5555555555555555555555555.5555555555555555555555555",
+       "0.000000055555555555555555555555555555555555555555555555555",
+       "0.00000055555555555555555555555555555555555555555555555555",
+       "999999999999999999999999999999999999999999999999990000",
+       "99999999999999999999999999999999999999999999999999000",
+       "99999999999999999999999999.999999999999999999999999",
+       "9999999999999999999999999.9999999999999999999999999",
+       "0.000000099999999999999999999999999999999999999999999999999",
+       "0.00000099999999999999999999999999999999999999999999999999",
+       # overflow by round up
+       "999999999999999999999999999999999999999999999999999999999900000000000000000000000000000000000000000000000000000000000000000000",
+      ].each do |str|
+        run_test_new_from_string(cursor, str)
+        run_test_new_from_string(cursor, '-' + str)
+      end
+    ensure
+      conn.logoff
+    end
+  end
+
+  def run_test_new_from_string(cursor, str)
+    cursor[1] = str
+    onum = nil
+    begin
+      cursor.exec
+      onum = cursor.fetch[0]
+    rescue OCIError => oraerr
+      begin
+        OraNumber.new(str)
+        flunk("exception expected but none was thrown. test data: " + str)
+      rescue
+        assert_equal(oraerr.to_s, $!.to_s, "test data: " + str)
+      end
+    end
+    if onum
+      assert_equal(onum.dump, OraNumber.new(str).dump, "test data: " + str)
+    end
+  end
+
   def test_new_from_bigdecimal
     ["+Infinity", "-Infinity", "NaN"].each do |n|
       assert_raise TypeError do
@@ -504,7 +646,8 @@ class TestOraNumber < Test::Unit::TestCase
     [
      [Rational(1, 2), "0.5"],
      [Rational(3, 5), "0.6"],
-     [Rational(10, 3), "3.3333333333333333333333333333333333333"],
+     [Rational(10, 3), "3.33333333333333333333333333333333333333"],
+     [Rational(20, 3), "6.66666666666666666666666666666666666667"],
     ].each do |ary|
       assert_equal(ary[1], OraNumber.new(ary[0]).to_s)
     end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-oci8
 version: !ruby/object:Gem::Version 
-  version: 2.0.3
+  prerelease: false
+  segments: 
+  - 2
+  - 0
+  - 4
+  version: 2.0.4
 platform: ruby
 authors: 
 - KUBO Takehiro
@@ -9,11 +14,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-21 00:00:00 +09:00
+date: 2010-02-28 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.
+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: []
 
@@ -55,9 +62,12 @@ files:
 - ext/oci8/oci8.h
 - ext/oci8/oci8lib.c
 - ext/oci8/ocidatetime.c
+- ext/oci8/ocihandle.c
 - ext/oci8/ocinumber.c
 - ext/oci8/oraconf.rb
 - ext/oci8/oradate.c
+- ext/oci8/oranumber_util.c
+- ext/oci8/oranumber_util.h
 - ext/oci8/post-config.rb
 - ext/oci8/stmt.c
 - ext/oci8/object.c
@@ -98,6 +108,8 @@ files:
 - test/test_rowid.rb
 has_rdoc: true
 homepage: http://ruby-oci8.rubyforge.org
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
@@ -108,20 +120,24 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 8
+      - 0
       version: 1.8.0
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: ruby-oci8
-rubygems_version: 1.2.0
+rubygems_version: 1.3.6
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Ruby interface for Oracle using OCI8 API
 test_files: 
 - test/test_all.rb