ruby-oci8 2.0.1-x86-mswin32-60 → 2.0.2-x86-mswin32-60

data/ChangeLog

@@ -1,3 +1,92 @@
+2009-05-17  KUBO Takehiro  <kubo@jiubao.org>
+	* NEWS: add changes between 2.0.1 and 2.0.2.
+	* VERSION: change version to 2.0.2.
+	* dist-files: append newly added files.
+	* ext/oci8/oci8.c: fix OCI8#ping not to raise an exception
+	    when OCIPing() failed. It should returns true or false.
+	* ext/oci8/oci8lib.c: Memory allocated by xmalloc() should be
+	    freed by xfree().
+
+2009-05-17  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/error.c, ext/oci8/extconf.rb, ext/oci8/oci8.h:
+	    fix the native library name in error messages from oci8lib.so
+	    to oci8lib_18.so or oci8lib_191.so.
+	* ext/oci8/ocinumber.c, test/test_oranumber.rb: fix OraNumber.new
+	    to accept BigDecimal and Rational.
+	* ext/oci8/bind.c, test/test_oci8.rb: implicitly convert the
+	    specified number to Float when the bind handle is for Float.
+	* ext/oci8/attr.c: fix for Oracle client which doesn't have
+	    OCIRowidToChar().
+	* ext/oci8/oci8.c, test/test_appinfo.rb, test/test_all.rb, dist-files:
+	    add new methods OCI8#ping and OCI8#client_identifier=.
+	    add test cases.
+	* ext/oci8/oci8lib.c: fix a bug for Oracle 8.0.
+	* lib/oci8/oci8.rb: add a convenient method OCI8#select_one
+	    to fetch one row.
+
+2009-04-18  KUBO Takehiro  <kubo@jiubao.org>
+	* lib/oci8/oci8.rb: move OCI8::BindType module to bindtype.rb.
+	* lib/oci8/bindtype.rb: added. This defines OCI8::BindType.
+	* lib/oci8.rb.in: require 'oci8/bindtype.rb'
+
+2009-04-17  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/encoding.c, ext/oci8/lob.c, ext/oci8/metadata.c,
+	  ext/oci8/oci8.c: suppress "warning C4761: integral size mismatch
+	  in argument; conversion supplied" when compiled by Visual C++.
+
+2009-04-17  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/apiwrap.yml, ext/oci8/env.c, ext/oci8/extconf.rb,
+	  ext/oci8/oci8.h, ext/oci8/oci8lib.c: OCIEnv is initialized
+	    when it is needed. This makes a basis to enable an event
+	    notification after "require 'oci8'."
+	* test/test_all.rb: fix a bug added four days ago.
+
+2009-04-14  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/oci8.h, ext/oci8/oci8lib.c, ext/oci8/ocinumber.c,
+	  ext/oci8/metadata.c, ext/oci8/object.c: pass an OCIError to
+	    OraNumber functions if it can. (This is the first step to
+	    delay OCIEnv initialization.)
+
+2009-04-14  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/oraconf.rb: Gets ORACLE_HOME from the Windows regitry
+	    by enumerating subkeys of \\HKEY_LOCAL_MACHINE\SOFTWARE\ORACLE.
+
+2009-04-12  KUBO Takehiro  <kubo@jiubao.org>
+	* lib/oci8/oci8.rb, test/test_encoding.rb: The string bind length should
+	    be got from the string bytesize converted to OCI8.encoding.
+
+2009-04-12  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/lob.c: OCI8::BLOB#read should return ASCII-8BIT.
+	    OCI8::BLOB#write should not convert the specified string
+	    to OCI8.encoding.
+	* test/test_dbi.rb: suppress warning: "shadowing outer local
+	    variable - i"
+	* test/test_all.rb, test/test_encoding.rb: add string encoding
+	    tests.
+
+2009-04-12  KUBO Takehiro  <kubo@jiubao.org>
+	* lib/dbd/OCI8.rb: fix DBI::DBD::OCI8::BindType::DBIStatementHandle
+	    to pass a newly added sanity check in dbi 0.4.1.
+	    (reported by Dirk Herzhauser)
+	* test/test_all.rb: fix to use dbi installed as a rubygem.
+
+2009-04-04  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/bind.c: fix an error when executing "select NULL from dual".
+	    http://rubyforge.org/forum/forum.php?thread_id=32468&forum_id=1078
+	    (contributed by Raimonds Simanovskis)
+
+2009-03-24  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/extconf.rb, ext/oci8/oci8.h, ext/oci8/oraconf.rb:
+	    fix a problem when compiling with Oracle 8.0.
+	    (reported by Axel Reinhold)
+
+2009-03-24  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/extconf.rb, ext/oci8/oci8.h: fix a problem when
+	    compiling with Oracle 9.2.
+	    (reported by Axel Reinhold)
+	* ext/oci8/apiwrap.yml: suppres warnings 'discards qualifiers
+	    from pointer target type' when compiling with Oracle 8i.
+
 2009-03-17  KUBO Takehiro  <kubo@jiubao.org>
 	* NEWS: add a new file.
 	* VERSION: change version to 2.0.1.

data/Makefile

@@ -50,38 +50,40 @@ dist-check: dist
 #
 # for Windows
 #
-GEMPKG = ruby-oci8-unstable-2.0.1-x86-mswin32-60.gem
+RUBY_18 = c:\ruby
+RUBY_191 = c:\ruby-1.9.1
+GEMPKG = ruby-oci8-2.0.2-x86-mswin32-60.gem
 
 ext\oci8\oci8lib_18.so:
-	c:\ruby\bin\ruby -r fileutils -e "FileUtils.rm_rf('ruby18')"
+	$(RUBY_18)\bin\ruby -r fileutils -e "FileUtils.rm_rf('ruby18')"
 	md ruby18
 	cd ruby18
-	c:\ruby\bin\ruby ..\setup.rb config -- --with-runtime-check
-	c:\ruby\bin\ruby ..\setup.rb setup
-	rem c:\ruby\bin\ruby ..\setup.rb test
+	$(RUBY_18)\bin\ruby ..\setup.rb config -- --with-runtime-check
+	$(RUBY_18)\bin\ruby ..\setup.rb setup
+	rem $(RUBY_18)\bin\ruby ..\setup.rb test
 	cd ..
 	copy ruby18\ext\oci8\oci8lib_18.so ext\oci8\oci8lib_18.so
 
 ext\oci8\oci8lib_191.so:
-	c:\ruby\bin\ruby -r fileutils -e "FileUtils.rm_rf('ruby191')"
+	$(RUBY_191)\bin\ruby -r fileutils -e "FileUtils.rm_rf('ruby191')"
 	md ruby191
 	cd ruby191
-	c:\ruby-1.9.1\bin\ruby ..\setup.rb config -- --with-runtime-check
-	c:\ruby-1.9.1\bin\ruby ..\setup.rb setup
-	rem c:\ruby-1.9.1\bin\ruby ..\setup.rb test
+	$(RUBY_191)\bin\ruby ..\setup.rb config -- --with-runtime-check
+	$(RUBY_191)\bin\ruby ..\setup.rb setup
+	rem $(RUBY_191)\bin\ruby ..\setup.rb test
 	cd ..
 	copy ruby191\ext\oci8\oci8lib_191.so ext\oci8\oci8lib_191.so
 	copy ruby191\lib\oci8.rb lib\oci8.rb
 
 $(GEMPKG): ext\oci8\oci8lib_18.so ext\oci8\oci8lib_191.so ruby-oci8.gemspec
-	c:\ruby-1.9.1\bin\gem build ruby-oci8.gemspec -- current
+	$(RUBY_191)\bin\gem build ruby-oci8.gemspec -- current
 
 test-win32-ruby18: $(GEMPKG)
-	c:\ruby\bin\gem install $(GEMPKG) --no-rdoc --no-ri
-	c:\ruby\bin\ruby -rubygems test\test_all.rb
+	$(RUBY_18)\bin\gem install $(GEMPKG) --no-rdoc --no-ri --local
+	$(RUBY_18)\bin\ruby -rubygems test\test_all.rb
 
 test-win32-ruby191: $(GEMPKG)
-	c:\ruby-1.9.1\bin\gem install $(GEMPKG) --no-rdoc --no-ri
-	c:\ruby-1.9.1\bin\ruby test\test_all.rb
+	$(RUBY_191)\bin\gem install $(GEMPKG) --no-rdoc --no-ri --local
+	$(RUBY_191)\bin\ruby test\test_all.rb
 
 test-win32: test-win32-ruby18 test-win32-ruby191

data/NEWS

@@ -1,3 +1,39 @@
+2.0.2:
+
+* add new methods
+  - OCI8#select_one(sql, *bindvars)  -> first_row
+
+  - OCI8#ping   -> true or false
+
+    Verifies that the Oracle connection is alive.
+    OCI8#ping also can be used to flush all the pending OCI
+    client-side calls to the server if any exist.
+
+  - OCI8#client_identifier = client_id
+
+    Look at the following link to know what is the client identifier.
+      http://it.toolbox.com/blogs/database-solutions/oracle-session-tracing-part-i-16356
+
+    Note that the specified identifier doesn't change the v$session
+    immediately. It is done by the next network round trip
+    such as OCI8#exec or OCI8#ping.
+
+* fix problems when compiling with Oracle 9.2 and 8.0.
+  (reported by Axel Reinhold)
+
+* [dbi] fix to pass a newly added sanity check in dbi 0.4.1.
+  (reported by Dirk Herzhauser)
+
+* fix an error when executing "select NULL from dual".
+  http://rubyforge.org/forum/forum.php?thread_id=32468&forum_id=1078
+  (contributed by Raimonds Simanovskis)
+
+* [ruby 1.9] fix OCI8::BLOB to read/write binary. Prior to 2.0.1,
+  it was treated as text tagged with NLS_LANG encoding.
+
+* [ruby 1.9] fix to bind string data by the length got from String#bytesize
+  converted to OCI8.encoding, not by String#size.
+
 2.0.1:
 
 * release a binary gem for Windows, which contains libraries for both

data/VERSION

@@ -1 +1 @@
-2.0.1
+2.0.2

data/dist-files

@@ -43,6 +43,7 @@ lib/.document
 lib/oci8.rb.in
 lib/dbd/OCI8.rb
 lib/oci8/.document
+lib/oci8/bindtype.rb
 lib/oci8/compat.rb
 lib/oci8/datetime.rb
 lib/oci8/encoding-init.rb
@@ -54,12 +55,14 @@ lib/oci8/oracle_version.rb
 test/README
 test/config.rb
 test/test_all.rb
+test/test_appinfo.rb
 test/test_array_dml.rb
 test/test_bind_raw.rb
 test/test_bind_time.rb
 test/test_break.rb
 test/test_clob.rb
 test/test_connstr.rb
+test/test_encoding.rb
 test/test_datetime.rb
 test/test_dbi.rb
 test/test_dbi_clob.rb

data/lib/dbd/OCI8.rb

@@ -402,6 +402,21 @@ class Statement < DBI::BaseStatement
   end
 end
 
+# DBI_STMT_NEW_ARGS is DBI::StatementHandle.new's arguments except +handle+.
+#
+# FYI: DBI::StatementHandle.new method signatures are follows:
+#   0.2.2: handle, fetchable=false, prepared=true
+#   0.4.0: handle, fetchable=false, prepared=true, convert_types=true
+#   0.4.1: handle, fetchable=false, prepared=true, convert_types=true, executed=false
+begin
+  DBI::StatementHandle.new(nil, false, true, true, true)
+  # dbi 0.4.1
+  DBI_STMT_NEW_ARGS = [true, true, true, true] # :nodoc:
+rescue ArgumentError
+  # dbi 0.4.0 or lower
+  DBI_STMT_NEW_ARGS = [true] # :nodoc:
+end
+
 if defined? ::OCI8::BindType::Base
   ##
   ## ruby-oci8 2.0 bind classes.
@@ -491,7 +506,7 @@ if defined? ::OCI8::BindType::Base
         val = super
         return nil if val.nil?
         stmt = DBI::DBD::OCI8::Statement.new(val)
-        DBI::StatementHandle.new(stmt, true, false)
+        DBI::StatementHandle.new(stmt, *DBI_STMT_NEW_ARGS)
       end
     end
   end # BindType
@@ -560,7 +575,7 @@ else
           return val if val.nil?
           cur = ::OCI8::Cursor.new(@env, @svc, @ctx, val)
           stmt = DBI::DBD::OCI8::Statement.new(cur)
-          DBI::StatementHandle.new(stmt, true, false)
+          DBI::StatementHandle.new(stmt, *DBI_STMT_NEW_ARGS)
         end
       end
     end

data/lib/oci8.rb

@@ -71,11 +71,12 @@ end
 
 require 'oci8/datetime.rb'
 require 'oci8/oci8.rb'
+require 'oci8/bindtype.rb'
 require 'oci8/metadata.rb'
 require 'oci8/compat.rb'
 require 'oci8/object.rb'
 
 class OCI8
-  VERSION = '2.0.1'
+  VERSION = '2.0.2'
   CLIENT_VERSION = '1020'
 end

data/lib/oci8.rb.in

@@ -71,6 +71,7 @@ end
 
 require 'oci8/datetime.rb'
 require 'oci8/oci8.rb'
+require 'oci8/bindtype.rb'
 require 'oci8/metadata.rb'
 require 'oci8/compat.rb'
 require 'oci8/object.rb'

data/lib/oci8/bindtype.rb

@@ -0,0 +1,295 @@
+#--
+# bindtype.rb -- OCI8::BindType
+#
+# Copyright (C) 2009 KUBO Takehiro <kubo@jiubao.org>
+#++
+
+class OCI8
+  module BindType
+    Mapping = {}
+
+    class Base
+      def self.create(con, val, param, max_array_size)
+        self.new(con, val, param, max_array_size)
+      end
+    end
+
+    # get/set Date
+    class Date < OCI8::BindType::OraDate
+      def set(val)
+        super(val && ::OraDate.new(val.year, val.mon, val.mday))
+      end
+      def get()
+        (val = super()) && val.to_date
+      end
+    end
+
+    # get/set Number (for OCI8::SQLT_NUM)
+    class Number
+      def self.create(con, val, param, max_array_size)
+        if param.is_a? OCI8::Metadata::Base
+          precision = param.precision
+          scale = param.scale
+        end
+        if scale == -127
+          if precision == 0
+            # NUMBER declared without its scale and precision. (Oracle 9.2.0.3 or above)
+            klass = OCI8::BindType::Mapping[:number_no_prec_setting]
+          else
+            # FLOAT or FLOAT(p)
+            klass = OCI8::BindType::Float
+          end
+        elsif scale == 0
+          if precision == 0
+            # NUMBER whose scale and precision is unknown
+            # or
+            # NUMBER declared without its scale and precision. (Oracle 9.2.0.2 or below)
+            klass = OCI8::BindType::Mapping[:number_unknown_prec]
+          else
+            # NUMBER(p, 0)
+            klass = OCI8::BindType::Integer
+          end
+        else
+          # NUMBER(p, s)
+          if precision < 15 # the precision of double.
+            klass = OCI8::BindType::Float
+          else
+            # use BigDecimal instead?
+            klass = OCI8::BindType::OraNumber
+          end
+        end
+        klass.new(con, val, nil, max_array_size)
+      end
+    end
+
+    class String
+      # 1333 <= ceil(4000 / 3). 4000 is max size of char. 3 is NLS ratio of UTF-8.
+      @@minimum_bind_length = 1333
+
+      def self.minimum_bind_length
+        @@minimum_bind_length
+      end
+
+      def self.minimum_bind_length=(val)
+        @@minimum_bind_length = val
+      end
+
+      def self.create(con, val, param, max_array_size)
+        case param
+        when Hash
+          if param[:length]
+            # If length is passed explicitly, use it.
+            length = param[:length]
+          elsif val.is_a? String or (val.respond_to? :to_str and val = val.to_str)
+            if OCI8.respond_to? :encoding and OCI8.encoding != val.encoding
+              # If the string encoding is different with NLS_LANG character set,
+              # convert it to get the length.
+              val = val.encode(OCI8.encoding)
+            end
+            if val.respond_to? :bytesize
+              # ruby 1.8.7 or upper
+              length = val.bytesize
+            else
+              # ruby 1.8.6 or lower
+              length = val.size
+            end
+          end
+        when OCI8::Metadata::Base
+          case param.data_type
+          when :char, :varchar2
+            length = param.data_size
+            # character size may become large on character set conversion.
+            # 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?
+          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)
+      end
+    end
+
+    class RAW
+      def self.create(con, val, param, max_array_size)
+        case param
+        when Hash
+          length = 400 # default length
+          if param[:length]
+            length = param[:length]
+          elsif val.respond_to? :to_str and val.to_str.size > length
+            length = val.to_str.size
+          end
+        when OCI8::Metadata::Base
+          length = param.data_size
+        end
+        self.new(con, val, length, max_array_size)
+      end
+    end
+
+    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)
+      end
+    end
+
+    class LongRaw < OCI8::BindType::RAW
+      def self.create(con, val, param, max_array_size)
+        self.new(con, val, con.long_read_len, max_array_size)
+      end
+    end
+
+    class CLOB
+      def self.create(con, val, param, max_array_size)
+        if param.is_a? OCI8::Metadata::Base and param.charset_form == :nchar
+          OCI8::BindType::NCLOB.new(con, val, nil, max_array_size)
+        else
+          OCI8::BindType::CLOB.new(con, val, nil, max_array_size)
+        end
+      end
+    end
+  end # BindType
+end
+
+# bind or explicitly define
+OCI8::BindType::Mapping[String]       = OCI8::BindType::String
+OCI8::BindType::Mapping[OraNumber]    = OCI8::BindType::OraNumber
+OCI8::BindType::Mapping[Fixnum]       = OCI8::BindType::Integer
+OCI8::BindType::Mapping[Float]        = OCI8::BindType::Float
+OCI8::BindType::Mapping[Integer]      = OCI8::BindType::Integer
+OCI8::BindType::Mapping[Bignum]       = OCI8::BindType::Integer
+OCI8::BindType::Mapping[OraDate]      = OCI8::BindType::OraDate
+OCI8::BindType::Mapping[Time]         = OCI8::BindType::Time
+OCI8::BindType::Mapping[Date]         = OCI8::BindType::Date
+OCI8::BindType::Mapping[DateTime]     = OCI8::BindType::DateTime
+OCI8::BindType::Mapping[OCI8::CLOB]   = OCI8::BindType::CLOB
+OCI8::BindType::Mapping[OCI8::NCLOB]  = OCI8::BindType::NCLOB
+OCI8::BindType::Mapping[OCI8::BLOB]   = OCI8::BindType::BLOB
+OCI8::BindType::Mapping[OCI8::BFILE]  = OCI8::BindType::BFILE
+OCI8::BindType::Mapping[OCI8::Cursor] = OCI8::BindType::Cursor
+
+# implicitly define
+
+# datatype        type     size prec scale
+# -------------------------------------------------
+# CHAR(1)       SQLT_AFC      1    0    0
+# CHAR(10)      SQLT_AFC     10    0    0
+OCI8::BindType::Mapping[:char] = OCI8::BindType::String
+
+# datatype        type     size prec scale
+# -------------------------------------------------
+# VARCHAR(1)    SQLT_CHR      1    0    0
+# VARCHAR(10)   SQLT_CHR     10    0    0
+# VARCHAR2(1)   SQLT_CHR      1    0    0
+# VARCHAR2(10)  SQLT_CHR     10    0    0
+OCI8::BindType::Mapping[:varchar2] = OCI8::BindType::String
+
+# datatype        type     size prec scale
+# -------------------------------------------------
+# RAW(1)        SQLT_BIN      1    0    0
+# RAW(10)       SQLT_BIN     10    0    0
+OCI8::BindType::Mapping[:raw] = OCI8::BindType::RAW
+
+# datatype        type     size prec scale
+# -------------------------------------------------
+# LONG          SQLT_LNG      0    0    0
+OCI8::BindType::Mapping[:long] = OCI8::BindType::Long
+
+# datatype        type     size prec scale
+# -------------------------------------------------
+# LONG RAW      SQLT_LBI      0    0    0
+OCI8::BindType::Mapping[:long_raw] = OCI8::BindType::LongRaw
+
+# datatype        type     size prec scale
+# -------------------------------------------------
+# CLOB          SQLT_CLOB  4000    0    0
+OCI8::BindType::Mapping[:clob] = OCI8::BindType::CLOB
+OCI8::BindType::Mapping[:nclob] = OCI8::BindType::NCLOB
+
+# datatype        type     size prec scale
+# -------------------------------------------------
+# BLOB          SQLT_BLOB  4000    0    0
+OCI8::BindType::Mapping[:blob] = OCI8::BindType::BLOB
+
+# datatype        type     size prec scale
+# -------------------------------------------------
+# BFILE         SQLT_BFILE 4000    0    0
+OCI8::BindType::Mapping[:bfile] = OCI8::BindType::BFILE
+
+# datatype        type     size prec scale
+# -------------------------------------------------
+# DATE          SQLT_DAT      7    0    0
+OCI8::BindType::Mapping[:date] = OCI8::BindType::Time
+
+if OCI8.oracle_client_version >= OCI8::ORAVER_9_0
+  OCI8::BindType::Mapping[:timestamp] = OCI8::BindType::Time
+  OCI8::BindType::Mapping[:timestamp_tz] = OCI8::BindType::Time
+  OCI8::BindType::Mapping[:timestamp_ltz] = OCI8::BindType::Time
+  OCI8::BindType::Mapping[:interval_ym] = OCI8::BindType::IntervalYM
+  OCI8::BindType::Mapping[:interval_ds] = OCI8::BindType::IntervalDS
+end
+
+# datatype        type     size prec scale
+# -------------------------------------------------
+# ROWID         SQLT_RDD      4    0    0
+OCI8::BindType::Mapping[:rowid] = OCI8::BindType::String
+
+# datatype           type     size prec scale
+# -----------------------------------------------------
+# FLOAT            SQLT_NUM     22  126 -127
+# FLOAT(1)         SQLT_NUM     22    1 -127
+# FLOAT(126)       SQLT_NUM     22  126 -127
+# DOUBLE PRECISION SQLT_NUM     22  126 -127
+# REAL             SQLT_NUM     22   63 -127
+# NUMBER           SQLT_NUM     22    0    0
+# NUMBER(1)        SQLT_NUM     22    1    0
+# NUMBER(38)       SQLT_NUM     22   38    0
+# NUMBER(1, 0)     SQLT_NUM     22    1    0
+# NUMBER(38, 0)    SQLT_NUM     22   38    0
+# NUMERIC          SQLT_NUM     22   38    0
+# INT              SQLT_NUM     22   38    0
+# INTEGER          SQLT_NUM     22   38    0
+# SMALLINT         SQLT_NUM     22   38    0
+OCI8::BindType::Mapping[:number] = OCI8::BindType::Number
+
+# mapping for calculated number values.
+#
+# for example:
+#   select col1 * 1.1 from tab1;
+#
+# For Oracle 9.2.0.2 or below, this is also used for NUMBER
+# datatypes that have no explicit setting of their precision
+# and scale.
+#
+# The default mapping is Float for ruby-oci8 1.0. It is OraNumber
+# for ruby-oci8 2.0.
+OCI8::BindType::Mapping[:number_unknown_prec] = OCI8::BindType::OraNumber
+
+# mapping for number without precision and scale.
+#
+# for example:
+#   create table tab1 (col1 number);
+#   select col1 from tab1;
+#
+# note: This is available only on Oracle 9.2.0.3 or above.
+# see:  Oracle 9.2.0.x Patch Set Notes.
+#
+# The default mapping is Float for ruby-oci8 1.0. It is OraNumber
+# for ruby-oci8 2.0.
+OCI8::BindType::Mapping[:number_no_prec_setting] = OCI8::BindType::OraNumber
+
+if defined? OCI8::BindType::BinaryDouble
+  OCI8::BindType::Mapping[:binary_float] = OCI8::BindType::BinaryDouble
+  OCI8::BindType::Mapping[:binary_double] = OCI8::BindType::BinaryDouble
+else
+  OCI8::BindType::Mapping[:binary_float] = OCI8::BindType::Float
+  OCI8::BindType::Mapping[:binary_double] = OCI8::BindType::Float
+end
+
+# Cursor
+OCI8::BindType::Mapping[:cursor] = OCI8::BindType::Cursor
+
+# XMLType (This mapping will be changed before release.)
+OCI8::BindType::Mapping[:xmltype] = OCI8::BindType::Long

data/lib/oci8/oci8.rb

@@ -1,5 +1,12 @@
-#   --*- ruby -*--
-# This is based on yoshidam's oracle.rb.
+#--
+# oci8.rb -- OCI8 and OCI8::Cursor
+#
+# Copyright (C) 2002-2009 KUBO Takehiro <kubo@jiubao.org>
+#
+# Original Copyright is:
+#   Oracle module for Ruby
+#   1998-2000 by yoshidam
+#++
 
 require 'date'
 
@@ -122,6 +129,20 @@ class OCI8
     end
   end # exec
 
+  # :call-seq:
+  #   select_one(sql, *bindvars) -> first_one_row
+  #
+  def select_one(sql, *bindvars)
+    cursor = self.parse(sql)
+    begin
+      cursor.exec(*bindvars)
+      row = cursor.fetch
+    ensure
+      cursor.close
+    end
+    return row
+  end
+
   def username
     @username || begin
       exec('select user from dual') do |row|
@@ -160,133 +181,6 @@ class OCI8
     @oracle_server_version
   end
 
-  module BindType
-    Mapping = {}
-
-    class Base
-      def self.create(con, val, param, max_array_size)
-        self.new(con, val, param, max_array_size)
-      end
-    end
-
-    # get/set Date
-    class Date < OCI8::BindType::OraDate
-      def set(val)
-        super(val && ::OraDate.new(val.year, val.mon, val.mday))
-      end
-      def get()
-        (val = super()) && val.to_date
-      end
-    end
-
-    # get/set Number (for OCI8::SQLT_NUM)
-    class Number
-      def self.create(con, val, param, max_array_size)
-        if param.is_a? OCI8::Metadata::Base
-          precision = param.precision
-          scale = param.scale
-        end
-        if scale == -127
-          if precision == 0
-            # NUMBER declared without its scale and precision. (Oracle 9.2.0.3 or above)
-            klass = OCI8::BindType::Mapping[:number_no_prec_setting]
-          else
-            # FLOAT or FLOAT(p)
-            klass = OCI8::BindType::Float
-          end
-        elsif scale == 0
-          if precision == 0
-            # NUMBER whose scale and precision is unknown
-            # or
-            # NUMBER declared without its scale and precision. (Oracle 9.2.0.2 or below)
-            klass = OCI8::BindType::Mapping[:number_unknown_prec]
-          else
-            # NUMBER(p, 0)
-            klass = OCI8::BindType::Integer
-          end
-        else
-          # NUMBER(p, s)
-          if precision < 15 # the precision of double.
-            klass = OCI8::BindType::Float
-          else
-            # use BigDecimal instead?
-            klass = OCI8::BindType::OraNumber
-          end
-        end
-        klass.new(con, val, nil, max_array_size)
-      end
-    end
-
-    class String
-      def self.create(con, val, param, max_array_size)
-        case param
-        when Hash
-          # 1333 = ceil(4000 (max size of char) / 3 (NLS ratio of UTF8))
-          length = 1333 # default length
-          if param[:length]
-            length = param[:length]
-          elsif val.respond_to? :to_str and val.to_str.size > length
-            length = val.to_str.size
-          end
-        when OCI8::Metadata::Base
-          case param.data_type
-          when :char, :varchar2
-            length = param.data_size
-            # character size may become large on character set conversion.
-            # 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?
-          when :raw
-            # HEX needs twice space.
-            length = param.data_size * 2
-          else
-            length = 100
-          end
-        end
-        self.new(con, val, length, max_array_size)
-      end
-    end
-
-    class RAW
-      def self.create(con, val, param, max_array_size)
-        case param
-        when Hash
-          length = 400 # default length
-          if param[:length]
-            length = param[:length]
-          elsif val.respond_to? :to_str and val.to_str.size > length
-            length = val.to_str.size
-          end
-        when OCI8::Metadata::Base
-          length = param.data_size
-        end
-        self.new(con, val, length, max_array_size)
-      end
-    end
-
-    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)
-      end
-    end
-
-    class LongRaw < OCI8::BindType::RAW
-      def self.create(con, val, param, max_array_size)
-        self.new(con, val, con.long_read_len, max_array_size)
-      end
-    end
-
-    class CLOB
-      def self.create(con, val, param, max_array_size)
-        if param.is_a? OCI8::Metadata::Base and param.charset_form == :nchar
-          OCI8::BindType::NCLOB.new(con, val, nil, max_array_size)
-        else
-          OCI8::BindType::CLOB.new(con, val, nil, max_array_size)
-        end
-      end
-    end
-  end # BindType
-
   # The instance of this class corresponds to cursor in the term of
   # Oracle, which corresponds to java.sql.Statement of JDBC and statement
   # handle $sth of Perl/DBI.
@@ -655,144 +549,3 @@ class String
     OraNumber.new(self, format, nls_params)
   end
 end
-
-# bind or explicitly define
-OCI8::BindType::Mapping[String]       = OCI8::BindType::String
-OCI8::BindType::Mapping[OraNumber]    = OCI8::BindType::OraNumber
-OCI8::BindType::Mapping[Fixnum]       = OCI8::BindType::Integer
-OCI8::BindType::Mapping[Float]        = OCI8::BindType::Float
-OCI8::BindType::Mapping[Integer]      = OCI8::BindType::Integer
-OCI8::BindType::Mapping[Bignum]       = OCI8::BindType::Integer
-OCI8::BindType::Mapping[OraDate]      = OCI8::BindType::OraDate
-OCI8::BindType::Mapping[Time]         = OCI8::BindType::Time
-OCI8::BindType::Mapping[Date]         = OCI8::BindType::Date
-OCI8::BindType::Mapping[DateTime]     = OCI8::BindType::DateTime
-OCI8::BindType::Mapping[OCI8::CLOB]   = OCI8::BindType::CLOB
-OCI8::BindType::Mapping[OCI8::NCLOB]  = OCI8::BindType::NCLOB
-OCI8::BindType::Mapping[OCI8::BLOB]   = OCI8::BindType::BLOB
-OCI8::BindType::Mapping[OCI8::BFILE]  = OCI8::BindType::BFILE
-OCI8::BindType::Mapping[OCI8::Cursor] = OCI8::BindType::Cursor
-
-# implicitly define
-
-# datatype        type     size prec scale
-# -------------------------------------------------
-# CHAR(1)       SQLT_AFC      1    0    0
-# CHAR(10)      SQLT_AFC     10    0    0
-OCI8::BindType::Mapping[:char] = OCI8::BindType::String
-
-# datatype        type     size prec scale
-# -------------------------------------------------
-# VARCHAR(1)    SQLT_CHR      1    0    0
-# VARCHAR(10)   SQLT_CHR     10    0    0
-# VARCHAR2(1)   SQLT_CHR      1    0    0
-# VARCHAR2(10)  SQLT_CHR     10    0    0
-OCI8::BindType::Mapping[:varchar2] = OCI8::BindType::String
-
-# datatype        type     size prec scale
-# -------------------------------------------------
-# RAW(1)        SQLT_BIN      1    0    0
-# RAW(10)       SQLT_BIN     10    0    0
-OCI8::BindType::Mapping[:raw] = OCI8::BindType::RAW
-
-# datatype        type     size prec scale
-# -------------------------------------------------
-# LONG          SQLT_LNG      0    0    0
-OCI8::BindType::Mapping[:long] = OCI8::BindType::Long
-
-# datatype        type     size prec scale
-# -------------------------------------------------
-# LONG RAW      SQLT_LBI      0    0    0
-OCI8::BindType::Mapping[:long_raw] = OCI8::BindType::LongRaw
-
-# datatype        type     size prec scale
-# -------------------------------------------------
-# CLOB          SQLT_CLOB  4000    0    0
-OCI8::BindType::Mapping[:clob] = OCI8::BindType::CLOB
-OCI8::BindType::Mapping[:nclob] = OCI8::BindType::NCLOB
-
-# datatype        type     size prec scale
-# -------------------------------------------------
-# BLOB          SQLT_BLOB  4000    0    0
-OCI8::BindType::Mapping[:blob] = OCI8::BindType::BLOB
-
-# datatype        type     size prec scale
-# -------------------------------------------------
-# BFILE         SQLT_BFILE 4000    0    0
-OCI8::BindType::Mapping[:bfile] = OCI8::BindType::BFILE
-
-# datatype        type     size prec scale
-# -------------------------------------------------
-# DATE          SQLT_DAT      7    0    0
-OCI8::BindType::Mapping[:date] = OCI8::BindType::Time
-
-if OCI8.oracle_client_version >= OCI8::ORAVER_9_0
-  OCI8::BindType::Mapping[:timestamp] = OCI8::BindType::Time
-  OCI8::BindType::Mapping[:timestamp_tz] = OCI8::BindType::Time
-  OCI8::BindType::Mapping[:timestamp_ltz] = OCI8::BindType::Time
-  OCI8::BindType::Mapping[:interval_ym] = OCI8::BindType::IntervalYM
-  OCI8::BindType::Mapping[:interval_ds] = OCI8::BindType::IntervalDS
-end
-
-# datatype        type     size prec scale
-# -------------------------------------------------
-# ROWID         SQLT_RDD      4    0    0
-OCI8::BindType::Mapping[:rowid] = OCI8::BindType::String
-
-# datatype           type     size prec scale
-# -----------------------------------------------------
-# FLOAT            SQLT_NUM     22  126 -127
-# FLOAT(1)         SQLT_NUM     22    1 -127
-# FLOAT(126)       SQLT_NUM     22  126 -127
-# DOUBLE PRECISION SQLT_NUM     22  126 -127
-# REAL             SQLT_NUM     22   63 -127
-# NUMBER           SQLT_NUM     22    0    0
-# NUMBER(1)        SQLT_NUM     22    1    0
-# NUMBER(38)       SQLT_NUM     22   38    0
-# NUMBER(1, 0)     SQLT_NUM     22    1    0
-# NUMBER(38, 0)    SQLT_NUM     22   38    0
-# NUMERIC          SQLT_NUM     22   38    0
-# INT              SQLT_NUM     22   38    0
-# INTEGER          SQLT_NUM     22   38    0
-# SMALLINT         SQLT_NUM     22   38    0
-OCI8::BindType::Mapping[:number] = OCI8::BindType::Number
-
-# mapping for calculated number values.
-#
-# for example:
-#   select col1 * 1.1 from tab1;
-#
-# For Oracle 9.2.0.2 or below, this is also used for NUMBER
-# datatypes that have no explicit setting of their precision
-# and scale.
-#
-# The default mapping is Float for ruby-oci8 1.0. It is OraNumber
-# for ruby-oci8 2.0.
-OCI8::BindType::Mapping[:number_unknown_prec] = OCI8::BindType::OraNumber
-
-# mapping for number without precision and scale.
-#
-# for example:
-#   create table tab1 (col1 number);
-#   select col1 from tab1;
-#
-# note: This is available only on Oracle 9.2.0.3 or above.
-# see:  Oracle 9.2.0.x Patch Set Notes.
-#
-# The default mapping is Float for ruby-oci8 1.0. It is OraNumber
-# for ruby-oci8 2.0.
-OCI8::BindType::Mapping[:number_no_prec_setting] = OCI8::BindType::OraNumber
-
-if defined? OCI8::BindType::BinaryDouble
-  OCI8::BindType::Mapping[:binary_float] = OCI8::BindType::BinaryDouble
-  OCI8::BindType::Mapping[:binary_double] = OCI8::BindType::BinaryDouble
-else
-  OCI8::BindType::Mapping[:binary_float] = OCI8::BindType::Float
-  OCI8::BindType::Mapping[:binary_double] = OCI8::BindType::Float
-end
-
-# Cursor
-OCI8::BindType::Mapping[:cursor] = OCI8::BindType::Cursor
-
-# XMLType (This mapping will be changed before release.)
-OCI8::BindType::Mapping[:xmltype] = OCI8::BindType::Long

data/test/test_all.rb

@@ -19,16 +19,25 @@ require "#{srcdir}/test_connstr"
 require "#{srcdir}/test_metadata"
 require "#{srcdir}/test_array_dml"
 require "#{srcdir}/test_rowid"
+require "#{srcdir}/test_appinfo"
 require "#{srcdir}/test_oracle_version"
 
+if OCI8.respond_to? :encoding
+  require "#{srcdir}/test_encoding"
+end
+
 # Ruby/DBI
 begin
   require 'dbi'
-  is_dbi_loaded = true
 rescue LoadError
-  is_dbi_loaded = false
+  begin
+    require 'rubygems'
+    require 'dbi'
+  rescue LoadError
+    dbi_not_found = true
+  end
 end
-if is_dbi_loaded
+unless dbi_not_found
   require "#{srcdir}/test_dbi"
   if $test_clob
     require "#{srcdir}/test_dbi_clob"

data/test/test_appinfo.rb

@@ -0,0 +1,29 @@
+require 'oci8'
+require 'test/unit'
+require File.dirname(__FILE__) + '/config'
+
+class TestAppInfo < Test::Unit::TestCase
+
+  def setup
+    @conn = get_oci8_connection
+  end
+
+  def test_set_client_identifier
+    # set client_id
+    client_id = "ruby-oci8:#{Process.pid()}"
+    @conn.client_identifier = client_id
+    assert_equal(client_id, @conn.select_one("SELECT SYS_CONTEXT('USERENV', 'CLIENT_IDENTIFIER') FROM DUAL")[0]);
+    # check the first character
+    assert_raise ArgumentError do
+      @conn.client_identifier = ':bad_identifier'
+    end
+
+    # clear client_id
+    @conn.client_identifier = nil
+    assert_nil(@conn.select_one("SELECT SYS_CONTEXT('USERENV', 'CLIENT_IDENTIFIER') FROM DUAL")[0]);
+  end
+
+  def teardown
+    @conn.logoff
+  end
+end

data/test/test_dbi.rb

@@ -252,7 +252,7 @@ EOS
 
     drop_table('test_table')
     @dbh.execute(<<-EOS)
-CREATE TABLE test_table (#{i = 0; coldef.collect do |c| i += 1; "C#{i} " + c[1] + (c[8] ? ' PRIMARY KEY' : ''); end.join(',')})
+CREATE TABLE test_table (#{n = 0; coldef.collect do |c| n += 1; "C#{n} " + c[1] + (c[8] ? ' PRIMARY KEY' : ''); end.join(',')})
 STORAGE (
    INITIAL 100k
    NEXT 100k

data/test/test_encoding.rb

@@ -0,0 +1,100 @@
+require 'oci8'
+require 'test/unit'
+require File.dirname(__FILE__) + '/config'
+
+class TestEncoding < Test::Unit::TestCase
+  def setup
+    @conn = get_oci8_connection
+  end
+
+  def test_select
+    drop_table('test_table')
+    @conn.exec(<<EOS)
+CREATE TABLE test_table
+  (C CHAR(10),
+   V VARCHAR2(10),
+   R RAW(10),
+   LR LONG RAW,
+   CL CLOB,
+   NCL NCLOB,
+   BL BLOB)
+STORAGE (
+   INITIAL 4k
+   NEXT 4k
+   MINEXTENTS 1
+   MAXEXTENTS UNLIMITED
+   PCTINCREASE 0)
+EOS
+    ascii_8bit = Encoding.find('ASCII-8BIT')
+    @conn.exec(<<EOS)
+INSERT INTO test_table VALUES ('abcd', 'abcd', 'abcd', 'abcd', 'abcd', 'abcd', 'abcd')
+EOS
+    @conn.exec("SELECT * FROM test_table") do |row|
+      assert_equal('abcd      ', row[0], 'CHAR(10)')
+      assert_equal(OCI8.encoding, row[0].encoding);
+      assert_equal('abcd', row[1], 'VARCHAR2(10)')
+      assert_equal(OCI8.encoding, row[1].encoding);
+      assert_equal("\xab\xcd", row[2], 'RAW(10)')
+      assert_equal(ascii_8bit, row[2].encoding);
+      assert_equal("\xab\xcd", row[3], 'LONG RAW')
+      assert_equal(ascii_8bit, row[3].encoding);
+      assert_equal('abcd', (data = row[4].read), 'CLOB')
+      assert_equal(OCI8.encoding, data.encoding);
+      assert_equal('abcd', (data = row[5].read), 'NCLOB')
+      assert_equal(OCI8.encoding, data.encoding);
+      assert_equal("\xab\xcd", (data = row[6].read), 'BLOB')
+      assert_equal(ascii_8bit, data.encoding);
+
+      if OCI8.encoding.name == "UTF-8"
+        utf_8 = "\u00A1\u00A2\u00A3\u00A4\u00A5\u00A6\u00A7\u00A8\u00A9"
+        iso_8859_1 = utf_8.encode("ISO-8859-1")
+        # CLOB
+        lob = row[4]
+        lob.rewind
+        lob.write(iso_8859_1) # converted to OCI8.encoding(UTF-8)
+        lob.rewind
+        assert_equal(utf_8, lob.read)
+        # NCLOB
+        lob = row[5]
+        lob.rewind
+        lob.write(iso_8859_1) # converted to OCI8.encoding(UTF-8)
+        lob.rewind
+        assert_equal(utf_8, lob.read)
+        # BLOB
+        lob = row[6]
+        lob.rewind
+        lob.write(iso_8859_1) # written without encoding conversion
+        lob.rewind
+        assert_equal(iso_8859_1.force_encoding('ASCII-8BIT'), lob.read)
+      end
+    end
+    drop_table('test_table')
+  end
+
+  if OCI8.encoding.name == "UTF-8"
+    def test_bind_string_with_code_conversion
+      drop_table('test_table')
+      @conn.exec(<<EOS)
+CREATE TABLE test_table
+  (V VARCHAR2(3000))
+STORAGE (
+   INITIAL 4k
+   NEXT 4k
+   MINEXTENTS 1
+   MAXEXTENTS UNLIMITED
+   PCTINCREASE 0)
+EOS
+      utf_8 = "\u00A1" * 1500 # 3000 byte
+      iso_8859_1 = utf_8.encode("ISO-8859-1") # 1500 byte
+      @conn.exec("INSERT INTO test_table VALUES (:1)", iso_8859_1)
+      @conn.exec("SELECT * FROM test_table") do |row|
+        assert_equal(utf_8, row[0])
+      end
+      drop_table('test_table')
+    end
+  end
+
+  def teardown
+    @conn.logoff
+  end
+end

data/test/test_oci8.rb

@@ -1,6 +1,8 @@
 require 'oci8'
 require 'test/unit'
 require File.dirname(__FILE__) + '/config'
+require 'bigdecimal'
+require 'rational'
 
 class TestOCI8 < Test::Unit::TestCase
 
@@ -366,4 +368,39 @@ EOS
     drop_table('test_table')
   end
 
+  def test_bind_number_with_implicit_conversions
+    src = [1, 1.2, BigDecimal("1.2"), Rational(12, 10)]
+    int = [1, 1, 1, 1]
+    flt = [1, 1.2, 1.2, 1.2]
+
+    cursor = @conn.parse("begin :1 := :2; end;")
+
+    # Float
+    cursor.bind_param(1, nil, Float)
+    cursor.bind_param(2, nil, Float)
+    src.each_with_index do |s, idx|
+      cursor[2] = s
+      cursor.exec
+      assert_equal(cursor[1], flt[idx])
+    end
+
+    # Fixnum
+    cursor.bind_param(1, nil, Fixnum)
+    cursor.bind_param(2, nil, Fixnum)
+    src.each_with_index do |s, idx|
+      cursor[2] = s
+      cursor.exec
+      assert_equal(cursor[1], int[idx])
+    end
+
+    # Integer
+    cursor.bind_param(1, nil, Integer)
+    cursor.bind_param(2, nil, Integer)
+    src.each_with_index do |s, idx|
+      cursor[2] = s
+      cursor.exec
+      assert_equal(cursor[1], int[idx])
+    end
+  end
+
 end # TestOCI8

data/test/test_oranumber.rb

@@ -3,6 +3,8 @@ require 'oci8'
 require 'test/unit'
 require File.dirname(__FILE__) + '/config'
 require 'yaml'
+require 'bigdecimal'
+require 'rational'
 
 class TestOraNumber < Test::Unit::TestCase
 
@@ -480,4 +482,26 @@ class TestOraNumber < Test::Unit::TestCase
       assert_equal(expected_val, actual_val, x)
     end
   end
+
+  def test_new_from_bigdecimal
+    ["+Infinity", "-Infinity", "NaN"].each do |n|
+      assert_raise TypeError do
+        OraNumber.new(BigDecimal.new(n))
+      end
+    end
+
+    LARGE_RANGE_VALUES.each do |val|
+      assert_equal(val, OraNumber.new(BigDecimal.new(val)).to_s)
+    end
+  end
+
+  def test_new_from_rational
+    [
+     [Rational(1, 2), "0.5"],
+     [Rational(3, 5), "0.6"],
+     [Rational(10, 3), "3.3333333333333333333333333333333333333"],
+    ].each do |ary|
+      assert_equal(ary[1], OraNumber.new(ary[0]).to_s)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-oci8
 version: !ruby/object:Gem::Version 
-  version: 2.0.1
+  version: 2.0.2
 platform: x86-mswin32-60
 authors: 
 - KUBO Takehiro
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-18 00:00:00 +09:00
+date: 2009-05-17 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -41,6 +41,7 @@ files:
 - lib/oci8.rb.in
 - lib/dbd/OCI8.rb
 - lib/oci8/.document
+- lib/oci8/bindtype.rb
 - lib/oci8/compat.rb
 - lib/oci8/datetime.rb
 - lib/oci8/encoding-init.rb
@@ -52,12 +53,14 @@ files:
 - test/README
 - test/config.rb
 - test/test_all.rb
+- test/test_appinfo.rb
 - test/test_array_dml.rb
 - test/test_bind_raw.rb
 - test/test_bind_time.rb
 - test/test_break.rb
 - test/test_clob.rb
 - test/test_connstr.rb
+- test/test_encoding.rb
 - test/test_datetime.rb
 - test/test_dbi.rb
 - test/test_dbi_clob.rb