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

data/NEWS

@@ -1,3 +1,114 @@
+2.1.0:
+
+*** Ruby-oci8 2.1.0 doesn't support Oracle 8 (8.0) and Oracle 8i (8.1) anymore. ***
+
+* New Features
+
+  - OCI connection pooling
+
+    See: http://docs.oracle.com/cd/E11882_01/appdev.112/e10646/oci09adv.htm#sthref1479
+    and http://docs.oracle.com/cd/E11882_01/java.112/e16548/ociconpl.htm#JJDBC28789
+
+    Example:
+
+      # Create a connection pool.
+      # username and password are required to establish an implicit primary session.
+      cpool = OCI8::ConnectionPool.new(1, 5, 2, username, password, database)
+
+      # Get a session from the pool.
+      # Pass the connection pool to the third argument.
+      conn1 = OCI8.new(username, password, cpool)
+
+      # Get another session.
+      conn2 = OCI8.new(username, password, cpool)
+
+  - Daylight saving time aware if TZ is set.
+
+    You should set the environment variable TZ if your applications run
+    in a time zone with daylight saving time transitions.
+    Otherwise, Oracle session time zone is set with current constant
+    offset from GMT.
+    (reported by Yasuo Honda)
+
+  - connect as sysasm (Oracle 11g only)
+
+      OCI8.new('username/password as sysasm')
+    or
+      OCI8.new('username', 'password', nil, :SYSASM)
+
+  - Oracle number is converted to ruby float exactly same as ruby does.
+
+    From ruby 1.9.2, a float value converted from Oracle number 15.7 by
+    the Oracle function OCINumberToReal() makes a string representation
+    15.700000000000001 by Float#to_s. (See: http://redmine.ruby-lang.org/issues/4656)
+    To avoid this issue, any Oracle number is converted to a float as
+    ruby's String#to_f does.
+
+    The behavior is customizable by OCI8.properties[:float_conversion_type].
+
+      OCI8.properties[:float_conversion_type] = :oracle # => Use OCINumberToReal()
+      OCI8.properties[:float_conversion_type] = :ruby # => Use String#to_f
+
+    The default value is :ruby.
+
+  - OCI_SUCCESS_WITH_INFO handling is changed.
+
+    Ruby-oci8 2.0 treats OCI_SUCCESS_WITH_INFO in OCI layer as an error
+    and raise an exception OCISuccessWithInfo such as "ORA-24347: Warning of
+    a NULL column in an aggregate function" and "ORA-28002: the password will
+    expire within xx days."
+
+    From 2.1.0, it is treated as a warning and the exception is set
+    to OCI8#last_error.
+
+  - OCI8#last_error
+
+    The last error or warning associated with the session is set to
+    OCI8#last_error. The usecase is to detect OCI_SUCCESS_WITH_INFO.
+    It is reset by OCI8#exec and OCI8#parse.
+
+  - Experimental support of character length semantics
+
+    This is enabled when :char is set to OCI8.properties[:length_semantics].
+
+  - OCI8.client_charset_name and OCI8#database_charset_name is added.
+
+    They return Oracle charset name such as WE8ISO8859P15.
+
+* Specification changes
+
+  - The parent class OCINoData was changed from OCIException to OCIError.
+
+* Fixed Issues
+
+  - Fix a bug that an array is always bound as null.
+    This bug was introduced in ruby-oci8 2.0.5.
+    (reported by Leoš Bitto)
+
+  - Avoid a gcc internal compiler error when using ruby1.9.2-p290 on
+    ubuntu 11.10 (64bit). (reported by Bob Saveland.)
+
+  - Fix compilation problems on Solaris.
+    (Reported by Sanjiv Patel.)
+
+  - Fix compilation problems on Linux.
+    (Reported by Edgars Beigarts.)
+
+  - Connections are released by GC without explicit logoff.
+
+  - Set ruby encoding CP950 for oracle characterset ZHT16MSWIN950 and
+    CP951 for ZHT16HKSCS and ZHT16HKSCS31 when the ruby is 1.9.3.
+
+  - Clear an executuing thread information in a connection when a SQL
+    executions is canceled by Thread#kill or Timeout::timeout.
+    (reported by Aaron Qian)
+
+  - Fix some test cases for object type and TZ issues.
+    (reported by Yasuo Honda)
+
+  - Use Gem::Command.build_args to get arguments after '--'.
+    (reported by jbirdjavi)
+
 2.0.6:
 
 * Fixed issues

data/README

@@ -1,86 +1,5 @@
-= How to make
+Ruby-oci8 is a ruby interface for Oracle using OCI8 API. 
+The latest version (2.1.x) works with Oracle9i or later.
+Use ruby-oci8 2.0.6 or earlier for Oracle 8.
 
-* <tt>ruby</tt> and <tt>make</tt> (or nmake on MSVC) commands in the environment variable <tt>PATH</tt>?
-* <tt>ruby</tt> is 1.8.0 or later? (Use ruby-oci8 0.1.x for ruby 1.6.x.)
-
-== For OCI installed by Oracle Universal Installer
-make sure the environment variable ORACLE_HOME (or registry on Windows)
-is set correctly. run the the following commands.
-
-  make (or nmake on MSVC)
-
-== For OCI installed by Oracle Instant Installer
-
-linux:
-  ruby setup.rb config -- --with-instant-client
-  make
-
-others:
-  ruby setup.rb config -- --with-instant-client=/path/to/instantclient10_1
-  make (or nmake on MSVC)
-
-= On compilation failure
-
-Please report the following information to kubo@jiubao.org.
-
-* last 100 lines of 'ext/oci8/mkmf.log'.
-* the results of the following commands:
-    ruby -r rbconfig -e "p Config::CONFIG['host']"
-    ruby -r rbconfig -e "p Config::CONFIG['CC']"
-    ruby -r rbconfig -e "p Config::CONFIG['CFLAGS']"
-    ruby -r rbconfig -e "p Config::CONFIG['LDSHARED']"
-    ruby -r rbconfig -e "p Config::CONFIG['LDFLAGS']"
-    ruby -r rbconfig -e "p Config::CONFIG['LIBS']"
-    ruby -r rbconfig -e "p Config::CONFIG['GNU_LD']"
-* if you use gcc:
-    gcc --print-prog-name=ld
-    gcc --print-prog-name=as
-* on platforms which can use both 32bit/64bit binaries:
-    file $ORACLE_HOME/bin/oracle
-    file `which ruby`
-    echo $LD_LIBRARY_PATH
-
-= How to run unit test
-
-before runing unit test, 
-1. connect to Oracle as system:
-
-    $ sqlplus system/<password_of_system>
-
-2. create user ruby:
-
-    SQL> CREATE USER ruby IDENTIFIED BY oci8;
-
-   or
-
-    SQL> CREATE USER ruby IDENTIFIED BY oci8
-       2 DEFAULT TABLESPACE users TEMPORARY TABLESPACE temp;
-
-3. grant the privilege to connect and execute.
-
-    SQL> GRANT connect, resource TO ruby;
-
-4. If the Oracle version is 8i or later:
-
-    SQL> CREATE TABLE ruby.test_clob (filename VARCHAR2(40), content CLOB);
-
-5. connect to Oracle as sys
-
-    $ sqlplus 'sys/<password_of_sys> as sysdba'
-
-6. grant the privilege for the unittest of blocking-mode.
-
-    SQL> GRANT EXECUTE ON dbms_lock TO ruby;
-
-7. change test/config.rb as you like
-
-Then you can run:
-  $ make check
-or
-  $ nmake check   (If your compiler is MS Visual C++.)
-
-= TODO
-
-* more proper handling of OCI_SUCCESS_WITH_INFO.
-* more proper handling of NUMBER without its scale values.
-* support Timestamp.
+See: http://ruby-oci8.rubyforge.org

data/VERSION

@@ -1 +1 @@
-2.0.6
+2.1.0

data/dist-files

@@ -21,12 +21,14 @@ ext/oci8/apiwrap.rb
 ext/oci8/apiwrap.yml
 ext/oci8/attr.c
 ext/oci8/bind.c
+ext/oci8/connection_pool.c
 ext/oci8/encoding.c
 ext/oci8/env.c
 ext/oci8/error.c
 ext/oci8/extconf.rb
 ext/oci8/lob.c
 ext/oci8/metadata.c
+ext/oci8/object.c
 ext/oci8/oci8.c
 ext/oci8/oci8.h
 ext/oci8/oci8lib.c
@@ -39,21 +41,23 @@ ext/oci8/oranumber_util.c
 ext/oci8/oranumber_util.h
 ext/oci8/post-config.rb
 ext/oci8/stmt.c
-ext/oci8/object.c
+ext/oci8/thread_util.c
+ext/oci8/thread_util.h
 ext/oci8/win32.c
-ext/oci8/xmldb.c
 lib/.document
 lib/oci8.rb.in
 lib/dbd/OCI8.rb
 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
@@ -62,14 +66,17 @@ test/test_all.rb
 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

data/lib/oci8.rb

@@ -6,16 +6,21 @@
 #  ruby -r oci8 -e 'OCI8.new("scott", "tiger", nil).exec("select * from emp") do |r| puts r.join(","); end'
 #  # select all data from emp and print them as CVS format.
 
+ENV['ORA_SDTZ'] = ENV['TZ'] unless ENV['ORA_SDTZ']
+
 if RUBY_PLATFORM =~ /cygwin/
   # Cygwin manages environment variables by itself.
   # They don't synchroize with Win32's ones.
   # This set some Oracle's environment variables to win32's enviroment.
   require 'Win32API'
   win32setenv = Win32API.new('Kernel32.dll', 'SetEnvironmentVariableA', 'PP', 'I')
-  ['NLS_LANG', 'ORA_NLS10', 'ORA_NLS32', 'ORA_NLS33', 'ORACLE_BASE', 'ORACLE_HOME', 'ORACLE_SID', 'TNS_ADMIN', 'LOCAL'].each do |name|
+  ['NLS_LANG', 'TNS_ADMIN', 'LOCAL'].each do |name|
     val = ENV[name]
     win32setenv.call(name, val && val.dup)
   end
+  ENV.each do |name, val|
+    win32setenv.call(name, val && val.dup) if name =~ /^ORA/
+  end
 end
 
 so_basename = 'oci8lib_'
@@ -28,7 +33,7 @@ end
 #  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/
+when /^1\.9/, /^2\.0/
   so_basename += '191'
 when /^1\.8/
   so_basename += '18'
@@ -37,14 +42,13 @@ else
 end
 require so_basename
 
-if OCI8.respond_to? :encoding
-  if defined? DEFAULT_OCI8_ENCODING
-    OCI8.encoding = DEFAULT_OCI8_ENCODING
-  else
-    load 'oci8/encoding-init.rb'
-  end
+if OCI8::VERSION != '2.1.0'
+  require 'rbconfig'
+  so_name = so_basename + "." + Config::CONFIG['DLEXT']
+  raise "VERSION MISMATCH! #{so_name} version is #{OCI8::VERSION}, but oci8.rb version is 2.1.0."
 end
 
+require 'oci8/encoding-init.rb'
 require 'oci8/oracle_version.rb'
 
 class OCI8
@@ -77,17 +81,19 @@ class OCI8
   def self.oracle_client_version
     @@oracle_client_version
   end
+
+  # defined for backward compatibility.
+  CLIENT_VERSION = @@oracle_client_version.major.to_s +
+    @@oracle_client_version.minor.to_s +
+    @@oracle_client_version.update.to_s
 end
 
+require 'oci8/ocihandle.rb'
 require 'oci8/datetime.rb'
 require 'oci8/oci8.rb'
 require 'oci8/bindtype.rb'
 require 'oci8/metadata.rb'
 require 'oci8/compat.rb'
 require 'oci8/object.rb'
+require 'oci8/connection_pool.rb'
 require 'oci8/properties.rb'
-
-class OCI8
-  VERSION = '2.0.6'
-  CLIENT_VERSION = '1020'
-end

data/lib/oci8.rb.in

@@ -6,16 +6,21 @@
 #  ruby -r oci8 -e 'OCI8.new("scott", "tiger", nil).exec("select * from emp") do |r| puts r.join(","); end'
 #  # select all data from emp and print them as CVS format.
 
+ENV['ORA_SDTZ'] = ENV['TZ'] unless ENV['ORA_SDTZ']
+
 if RUBY_PLATFORM =~ /cygwin/
   # Cygwin manages environment variables by itself.
   # They don't synchroize with Win32's ones.
   # This set some Oracle's environment variables to win32's enviroment.
   require 'Win32API'
   win32setenv = Win32API.new('Kernel32.dll', 'SetEnvironmentVariableA', 'PP', 'I')
-  ['NLS_LANG', 'ORA_NLS10', 'ORA_NLS32', 'ORA_NLS33', 'ORACLE_BASE', 'ORACLE_HOME', 'ORACLE_SID', 'TNS_ADMIN', 'LOCAL'].each do |name|
+  ['NLS_LANG', 'TNS_ADMIN', 'LOCAL'].each do |name|
     val = ENV[name]
     win32setenv.call(name, val && val.dup)
   end
+  ENV.each do |name, val|
+    win32setenv.call(name, val && val.dup) if name =~ /^ORA/
+  end
 end
 
 so_basename = 'oci8lib_'
@@ -28,7 +33,7 @@ end
 #  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/
+when /^1\.9/, /^2\.0/
   so_basename += '191'
 when /^1\.8/
   so_basename += '18'
@@ -37,14 +42,13 @@ else
 end
 require so_basename
 
-if OCI8.respond_to? :encoding
-  if defined? DEFAULT_OCI8_ENCODING
-    OCI8.encoding = DEFAULT_OCI8_ENCODING
-  else
-    load 'oci8/encoding-init.rb'
-  end
+if OCI8::VERSION != '@@OCI8_MODULE_VERSION@@'
+  require 'rbconfig'
+  so_name = so_basename + "." + Config::CONFIG['DLEXT']
+  raise "VERSION MISMATCH! #{so_name} version is #{OCI8::VERSION}, but oci8.rb version is @@OCI8_MODULE_VERSION@@."
 end
 
+require 'oci8/encoding-init.rb'
 require 'oci8/oracle_version.rb'
 
 class OCI8
@@ -77,17 +81,19 @@ class OCI8
   def self.oracle_client_version
     @@oracle_client_version
   end
+
+  # defined for backward compatibility.
+  CLIENT_VERSION = @@oracle_client_version.major.to_s +
+    @@oracle_client_version.minor.to_s +
+    @@oracle_client_version.update.to_s
 end
 
+require 'oci8/ocihandle.rb'
 require 'oci8/datetime.rb'
 require 'oci8/oci8.rb'
 require 'oci8/bindtype.rb'
 require 'oci8/metadata.rb'
 require 'oci8/compat.rb'
 require 'oci8/object.rb'
+require 'oci8/connection_pool.rb'
 require 'oci8/properties.rb'
-
-class OCI8
-  VERSION = '@@OCI8_MODULE_VERSION@@'
-  CLIENT_VERSION = '@@OCI8_CLIENT_VERSION@@'
-end

data/lib/oci8/.document

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

data/lib/oci8/bindtype.rb

@@ -1,7 +1,7 @@
 #--
 # bindtype.rb -- OCI8::BindType
 #
-# Copyright (C) 2009-2010 KUBO Takehiro <kubo@jiubao.org>
+# Copyright (C) 2009-2011 KUBO Takehiro <kubo@jiubao.org>
 #++
 
 class OCI8
@@ -105,45 +105,56 @@ class OCI8
       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
+          param[:length_semantics] = OCI8::properties[:length_semantics] unless param.has_key? :length_semantics
+          unless param[:length]
+            if val.respond_to? :to_str
+              val = val.to_str
+              if param[:length_semantics] == :char
+                # character semantics
+                param[:length] = val.size
+              else
+                # byte semantics
+                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
+                  param[:length] = val.bytesize
+                else
+                  # ruby 1.8.6 or lower
+                  param[:length] = val.size
+                end
+              end
             else
-              # ruby 1.8.6 or lower
-              length = val.size
+              param[:length] = @@minimum_bind_length
             end
           end
           # use the default value when :nchar is not set explicitly.
-          nchar = OCI8.properties[:bind_string_as_nchar] unless param.has_key?(:nchar)
+          param[:nchar] = OCI8.properties[:bind_string_as_nchar] unless param.has_key?(:nchar)
         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?
-            nchar = (param.charset_form == :nchar)
+            length_semantics = OCI8.properties[:length_semantics]
+            if length_semantics == :char
+              length = param.char_size
+            else
+              length = param.data_size * OCI8.nls_ratio
+            end
+            param = {
+              :length => length,
+              :length_semantics => length_semantics,
+              :nchar => (param.charset_form == :nchar),
+            }
           when :raw
             # HEX needs twice space.
-            length = param.data_size * 2
+            param = {:length => param.data_size * 2}
+          else
+            param = {:length => @@minimum_bind_length}
           end
         end
-        length = @@minimum_bind_length if length.nil? or length < @@minimum_bind_length
-        if nchar
-          OCI8::BindType::NCHAR.new(con, val, length, max_array_size)
-        else
-          OCI8::BindType::CHAR.new(con, val, length, max_array_size)
-        end
+        self.new(con, val, param, max_array_size)
       end
     end
 
@@ -151,28 +162,36 @@ class OCI8
       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
+          unless param[:length]
+            if val.respond_to? :to_str
+              val = val.to_str
+              if val.respond_to? :bytesize
+                param[:length] = val.bytesize
+              else
+                param[:length] = val.size
+              end
+            else
+              param[:length] = 400
+            end
           end
         when OCI8::Metadata::Base
-          length = param.data_size
+          param = {:length => param.data_size}
         end
-        self.new(con, val, length, max_array_size)
+        self.new(con, val, param, max_array_size)
       end
     end
 
     class Long < OCI8::BindType::String
       def self.create(con, val, param, max_array_size)
-        super(con, val, {:length => con.long_read_len}, max_array_size)
+        param = {:length => con.long_read_len, :char_semantics => true}
+        super(con, val, param, 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)
+        param = {:length => con.long_read_len, :char_semantics => false}
+        self.new(con, val, param, max_array_size)
       end
     end
 
@@ -260,13 +279,11 @@ OCI8::BindType::Mapping[:bfile] = OCI8::BindType::BFILE
 # 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
+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
 
 # datatype        type     size prec scale
 # -------------------------------------------------