ruby-oci8 2.1.4-x86-mingw32 → 2.1.5-x86-mingw32

data/.yardopts

@@ -5,6 +5,7 @@
 --exclude lib/oci8/compat.rb
 --exclude lib/dbd
 --hide-void-return
+--charset UTF-8
 -
 NEWS
 COPYING

data/ChangeLog

@@ -1,3 +1,70 @@
+2013-03-09  KUBO Takehiro  <kubo@jiubao.org>
+	* ruby-oci8.gemspec: revert the previous commit because old
+	    rubygems doesn't support:
+	       required_ruby_version = ['>= 1.8.0', '<= 2.0.0']
+
+2013-03-09  KUBO Takehiro  <kubo@jiubao.org>
+	* NEWS: add changes between 2.1.5 and 2.1.4
+	* VERSION: change the version to 2.1.5.
+	* docs/platform-specific-issues.md: remove obsolete description.
+	* ext/oci8/extconf.rb, ext/oci8/oraconf.rb: fix to compile for
+	    Windows x64 client.
+	* ruby-oci8.gemspec: change required_ruby_version range
+	    when a binary gem includes more than one compiled object.
+	* test/test_connection_pool.rb: fix to pass tests on slow
+	    machines.
+
+2013-03-05  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/oci8.c, lib/oci8/oci8.rb, lib/oci8/oracle_version.rb:
+	    refactoring.
+
+2013-03-03  KUBO Takehiro  <kubo@jiubao.org>
+	* lib/oci8/oci8.rb, test/test_oci8.rb: set 'rubyoci8' as
+	    the driver name, which is displayed in
+	    V$SESSION_CONNECT_INFO.CLIENT_DRIVER.
+	    (require Oracle 11g or upper)
+
+2013-03-03  KUBO Takehiro  <kubo@jiubao.org>
+	* lib/oci8.rb.in: use RbConfig::CONFIG instead of obsolete
+	    constant Config::CONFIG.
+	* lib/oci8/object.rb, test/test_bind_time.rb, test/test_metadata.rb
+	  test/test_object.rb, test/test_oci8.rb:
+	    suppress warning: assigned but unused variable
+
+2013-03-03  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/lob.c, ext/oci8/oci8.c, ext/oci8/oci8.h:
+	    refactor oci8_lob_t.
+
+2013-03-03  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/oci8.c: fix segmentation fault when the process
+	    exits on rubinius.
+
+2013-03-02  KUBO Takehiro  <kubo@jiubao.org>
+	* .yardopts, ext/oci8/object.c, lib/oci8/metadata.rb,
+	  lib/oci8/oracle_version.rb: update comments for rdoc/yard.
+
+2013-03-02  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/ocihandle.c: change arguments of internal methods
+	    OCIHandle#attr_get_*() to ignore "ORA-24328: illegal
+	    attribute value".
+	* lib/oci8/metadata.rb: change OCI8::Metadata::Base#obj_id,
+	    #obj_name and #obj_schema not to raise "ORA-24328:
+	    illegal attribute value".
+
+2013-03-02  KUBO Takehiro  <kubo@jiubao.org>
+	* ruby-oci8.gemspec: fix for ruby 2.0.0 to make binary gems.
+
+2013-03-02  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/oraconf.rb: fix for compilation on Windows x64 by mingw64.
+
+2013-01-12  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/oci8lib.c: export a main function for Solaris x86 (32-bit).
+	    When a main function is invisible from Oracle instant client
+	    11.2.0.3 for Solaris x86 (32-bit), OCIEnvCreate() fails by
+	    unknown reasons.
+	* docs/platform-specific-issues.md: change the workaround for
+	    Solaris x86 (32-bit) instant client.
+
 2013-01-06  KUBO Takehiro  <kubo@jiubao.org>
 	* NEWS: add changes between 2.1.4 and 2.1.3
 	* VERSION: change the version to 2.1.4.

data/NEWS

@@ -1,5 +1,26 @@
 # @markup markdown
 
+2.1.5
+=====
+
+New Features
+------------
+
+### V$SESSION_CONNECT_INFO.CLIENT_DRIVER.
+
+'rubyoci8' is set as the driver name, which is displayed in
+V$SESSION_CONNECT_INFO.CLIENT_DRIVER when both the client and
+the server are Oracle 11g or upper.
+
+Fixed Issues
+------------
+
+-   fix segmentation fault when the process exits on rubinius.
+
+-   fix "OCI Library Initialization Error" only when the Oracle
+    instant client is 11.2.0.3 for Solaris x86 32-bit, the ruby
+    version is 1.9.3 or upper and the ruby is compiled by gcc.
+
 2.1.4
 =====
 

data/VERSION

@@ -1 +1 @@
-2.1.4
+2.1.5

data/docs/platform-specific-issues.md

@@ -34,15 +34,10 @@ Note: "`" is a back quote.
 Mac OS X
 ========
 
-OS X 10.7 Lion
---------------
-
-64-bit instant client doesn't work. Use 32-bit ruby and instant client or jruby.
+OS X 10.7+
+----------
 
-See:
-
-* {http://rubyforge.org/forum/forum.php?thread\_id=49548&forum\_id=1078}
-* {https://forums.oracle.com/forums/thread.jspa?threadID=2187558}
+Use the latest 64-bit instant client. The older 64-bit (10.2.0.4) instant client [doesn't work](https://forums.oracle.com/forums/thread.jspa?threadID=2187558). The older 32-bit instant client will work but only with 32-bit ruby or jruby (using JDBC).
 
 Intel Mac (64-bit)
 ------------------
@@ -59,7 +54,7 @@ The Intel Instant client is for Mac OS X 10.5 Leopard. If you are using 10.4 Tig
 use one of the following workarounds.
 
 * compile ruby as ppc. (look at [How to setup Ruby and Oracle client on Intel Mac](http://blog.rayapps.com/2007/08/27/how-to-setup-ruby-and-oracle-client-on-intel-mac/))
-* use [ruby-odbc|http://www.ch-werner.de/rubyodbc/] and a third party ODBC driver ([Actual Technologies](http://www.actualtechnologies.com) or [OpenLink Software](http://uda.openlinksw.com/)).
+* use [ruby-odbc](http://www.ch-werner.de/rubyodbc/) and a third party ODBC driver ([Actual Technologies](http://www.actualtechnologies.com) or [OpenLink Software](http://uda.openlinksw.com/)).
 * use JRuby and Oracle JDBC driver.
 
 PowerPC Mac
@@ -74,21 +69,6 @@ You need a same compiler which is used to make ruby itself.
 For example, if the ruby is compiled by gcc, you need gcc. If it is compiled by Oracle Solaris Studio
 (formerly called as Sun Studio), you need Oracle Solaris Studio.
 
-If ruby is compiled by gcc and "require 'oci8'" raises "OCI Library Initialization Error",
-you may need to recompile ruby as follows:
-
-    $ bzip2 -dc ruby-1.9.3-pxxx.tar.bz2 | tar xvf -
-    $ cd ruby-1.9.3-pxxx
-    $ vi main.c   # <- Add RUBY_FUNC_EXPORTED just before "int main(..)" as follows:
-    -------------
-    RUBY_FUNC_EXPORTED  /* Add this line */
-    int
-    main(int argc, char **argv)
-    -------------
-    $ ./configure
-    $ make
-    $ make install
-
 If you use Blastwave.org's ruby and want not to install Sun Studio,
 you can edit rbconfig.rb by your self. [(look at here)](http://forum.textdrive.com/viewtopic.php?id=12630)
 

data/lib/oci8.rb

@@ -80,10 +80,10 @@ else
 end
 require so_basename
 
-if OCI8::VERSION != '2.1.4'
+if OCI8::VERSION != '2.1.5'
   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.4."
+  so_name = so_basename + "." + RbConfig::CONFIG['DLEXT']
+  raise "VERSION MISMATCH! #{so_name} version is #{OCI8::VERSION}, but oci8.rb version is 2.1.5."
 end
 
 require 'oci8/encoding-init.rb'

data/lib/oci8.rb.in

@@ -82,7 +82,7 @@ require so_basename
 
 if OCI8::VERSION != '@@OCI8_MODULE_VERSION@@'
   require 'rbconfig'
-  so_name = so_basename + "." + Config::CONFIG['DLEXT']
+  so_name = so_basename + "." + RbConfig::CONFIG['DLEXT']
   raise "VERSION MISMATCH! #{so_name} version is #{OCI8::VERSION}, but oci8.rb version is @@OCI8_MODULE_VERSION@@."
 end
 

data/lib/oci8/metadata.rb

@@ -1,6 +1,6 @@
 # oci8.rb -- implements OCI8::Metadata.
 #
-# Copyright (C) 2006-2010 KUBO Takehiro <kubo@jiubao.org>
+# Copyright (C) 2006-2013 Kubo Takehiro <kubo@jiubao.org>
 #
 # See {'Describing Schema Metadata' in Oracle Call Interface Programmer's Guide}
 # [http://download-west.oracle.com/docs/cd/B19306_01/appdev.102/b14250/oci06des.htm]
@@ -14,33 +14,33 @@ class OCI8
   # OCI8::Metadata::Base's subclass.
   #
   # List of methods which return OCI8::Metadata::Base.
-  # * OCI8#describe_any(object_name)
-  # * OCI8#describe_table(table_name, table_only = false)
-  # * OCI8#describe_view(view_name)
-  # * OCI8#describe_procedure(procedure_name)
-  # * OCI8#describe_function(function_name)
-  # * OCI8#describe_package(package_name)
-  # * OCI8#describe_type(type_name)
-  # * OCI8#describe_synonym(synonym_name, check_public_also = true)
-  # * OCI8#describe_sequence(sequence_name)
-  # * OCI8#describe_schema(schema_name)
-  # * OCI8#describe_database(database_name)
-  # * OCI8::Metadata::Type#map_method
-  # * OCI8::Metadata::Type#order_method
-  # * OCI8::Metadata::Type#collection_element
+  # * {OCI8#describe_any OCI8#describe_any(object_name)}
+  # * {OCI8#describe_table OCI8#describe_table(table_name, table_only = false)}
+  # * {OCI8#describe_view OCI8#describe_view(view_name)}
+  # * {OCI8#describe_procedure OCI8#describe_procedure(procedure_name)}
+  # * {OCI8#describe_function OCI8#describe_function(function_name)}
+  # * {OCI8#describe_package OCI8#describe_package(package_name)}
+  # * {OCI8#describe_type OCI8#describe_type(type_name)}
+  # * {OCI8#describe_synonym OCI8#describe_synonym(synonym_name, check_public_also = true)}
+  # * {OCI8#describe_sequence OCI8#describe_sequence(sequence_name)}
+  # * {OCI8#describe_schema OCI8#describe_schema(schema_name)}
+  # * {OCI8#describe_database OCI8#describe_database(database_name)}
+  # * {OCI8::Metadata::Type#map_method OCI8::Metadata::Type#map_method}
+  # * {OCI8::Metadata::Type#order_method OCI8::Metadata::Type#order_method}
+  # * {OCI8::Metadata::Type#collection_element OCI8::Metadata::Type#collection_element}
   #
   # List of methods which return an array of OCI8::Metadata::Base.
-  # * OCI8::Cursor#column_metadata
-  # * OCI8::Metadata::Database#schemas
-  # * OCI8::Metadata::Schema#all_objects
-  # * OCI8::Metadata::Schema#objects
-  # * OCI8::Metadata::Table#columns
-  # * OCI8::Metadata::Package#subprograms
-  # * OCI8::Metadata::Procedure#arguments
-  # * OCI8::Metadata::Function#arguments
-  # * OCI8::Metadata::Type#type_attrs
-  # * OCI8::Metadata::Type#type_methods
-  # * OCI8::Metadata::TypeMethod#arguments
+  # * {OCI8::Cursor#column_metadata OCI8::Cursor#column_metadata}
+  # * {OCI8::Metadata::Database#schemas OCI8::Metadata::Database#schemas}
+  # * {OCI8::Metadata::Schema#all_objects OCI8::Metadata::Schema#all_objects}
+  # * {OCI8::Metadata::Schema#objects OCI8::Metadata::Schema#objects}
+  # * {OCI8::Metadata::Table#columns OCI8::Metadata::Table#columns}
+  # * {OCI8::Metadata::Package#subprograms OCI8::Metadata::Package#subprograms}
+  # * {OCI8::Metadata::Subprogram#arguments OCI8::Metadata::Procedure#arguments}
+  # * {OCI8::Metadata::Subprogram#arguments OCI8::Metadata::Function#arguments}
+  # * {OCI8::Metadata::Type#type_attrs OCI8::Metadata::Type#type_attrs}
+  # * {OCI8::Metadata::Type#type_methods OCI8::Metadata::Type#type_methods}
+  # * {OCI8::Metadata::TypeMethod#arguments OCI8::Metadata::TypeMethod#arguments}
   #
   # Example:
   #   conn = OCI8.new('username/passord')
@@ -54,34 +54,31 @@ class OCI8
       # Table 6-1 Attributes Belonging to All Parameters
 
       # Returns the number of parameters.
-      def num_params # :nodoc:
+      def num_params
         attr_get_ub2(OCI_ATTR_NUM_PARAMS)
       end
       private :num_params
 
-      # Returns the object ID, which is the same as the value of the
-      # OBJECT_ID column from ALL_OBJECTS. It returns +nil+
-      # if the database object doesn't have ID.
+      # Returns the object ID which corresponds to the data dictionary
+      # view column ALL_OBJECTS.OBJECT_ID.
       #
       # @return [Integer or nil]
       def obj_id
-        attr_get_ub4(OCI_ATTR_OBJ_ID)
+        attr_get_ub4(OCI_ATTR_OBJ_ID, false)
       end
 
-      # Retruns the object name such as table name, view name,
-      # procedure name, and so on.
+      # Returns the object name which corresponds to the data dictionary view column ALL_OBJECTS.OBJECT_NAME.
       #
-      # @return [String]
+      # @return [String or nil] object name
       def obj_name
-        attr_get_string(OCI_ATTR_OBJ_NAME)
+        attr_get_string(OCI_ATTR_OBJ_NAME, false)
       end
 
-      # Retruns the schema name. It returns +nil+
-      # if the database object is not defined just under a schema.
+      # Returns the schema name which corresponds to the data dictionary view column ALL_OBJECTS.OWNER.
       #
-      # @return [String]
+      # @return [String or nil] schema name
       def obj_schema
-        attr_get_string(OCI_ATTR_OBJ_SCHEMA)
+        attr_get_string(OCI_ATTR_OBJ_SCHEMA, false)
       end
 
       # The timestamp of the object
@@ -92,7 +89,8 @@ class OCI8
       #  attr_get_oradate(OCI_ATTR_TIMESTAMP)
       #end
 
-      def inspect # :nodoc:
+      # @private
+      def inspect
         "#<#{self.class.name}:(#{obj_id}) #{obj_schema}.#{obj_name}>"
       end
       private
@@ -103,8 +101,9 @@ class OCI8
       alias __word attr_get_sb4
       def __anydata(idx); raise NotImplementedError; end
 
-      # SQLT values to name
-      DATA_TYPE_MAP = {} # :nodoc:
+      # Mapping from SQLT values to names
+      # @private
+      DATA_TYPE_MAP = {}
 
       # SQLT_CHR
       DATA_TYPE_MAP[1] = [:varchar2,
@@ -346,7 +345,7 @@ class OCI8
     # into other metadata classes.
     #
     # An instance of this class is returned by:
-    # * OCI8::Metadata::Schema#all_objects
+    # * {OCI8::Metadata::Schema#all_objects OCI8::Metadata::Schema#all_objects}
     class Unknown < Base
       register_ptype OCI_PTYPE_UNK
     end
@@ -354,14 +353,10 @@ class OCI8
     # Information about tables
     #
     # An instance of this class is returned by:
-    # * OCI8#describe_any(name)
-    # * OCI8#describe_table(name)
-    # * OCI8::Metadata::Schema#all_objects
-    # * OCI8::Metadata::Schema#objects
-    #
-    # See also:
-    # * OCI8::Metadata::Base#obj_name
-    # * OCI8::Metadata::Base#obj_schema
+    # * {OCI8#describe_any OCI8#describe_any(name)}
+    # * {OCI8#describe_table OCI8#describe_table(name)}
+    # * {OCI8::Metadata::Schema#all_objects OCI8::Metadata::Schema#all_objects}
+    # * {OCI8::Metadata::Schema#objects OCI8::Metadata::Schema#objects}
     class Table < Base
       register_ptype OCI_PTYPE_TABLE
 
@@ -464,15 +459,11 @@ class OCI8
     # Information about views
     #
     # An instance of this class is returned by:
-    # * OCI8#describe_any(name)
-    # * OCI8#describe_table(name, false)
-    # * OCI8#describe_view(name)
-    # * OCI8::Metadata::Schema#all_objects
-    # * OCI8::Metadata::Schema#objects
-    #
-    # See also:
-    # * OCI8::Metadata::Base#obj_name
-    # * OCI8::Metadata::Base#obj_schema
+    # * {OCI8#describe_any OCI8#describe_any(name)}
+    # * {OCI8#describe_table OCI8#describe_table(name, false)}
+    # * {OCI8#describe_view OCI8#describe_view(name)}
+    # * {OCI8::Metadata::Schema#all_objects OCI8::Metadata::Schema#all_objects}
+    # * {OCI8::Metadata::Schema#objects OCI8::Metadata::Schema#objects}
     class View < Base
       register_ptype OCI_PTYPE_VIEW
 
@@ -525,8 +516,8 @@ class OCI8
     # with a set of parameters. A subprogram can be either a procedure
     # or a function.
     #
-    # This is the abstract base class of OCI8::Metadata::Procedure and
-    # OCI8::Metadata::Function.
+    # This is the abstract base class of {OCI8::Metadata::Procedure OCI8::Metadata::Procedure} and
+    # {OCI8::Metadata::Function OCI8::Metadata::Function}.
     class Subprogram < Base
       ## Table 6-4 Attribute Belonging to Procedures or Functions
 
@@ -565,9 +556,9 @@ class OCI8
       alias name obj_name # :nodoc: for backward compatibility
 
       # Returns +nil+ for a standalone stored subprogram,
-      # positive integer for a
-      # {overloaded packaged subprogram}[http://download.oracle.com/docs/cd/B28359_01/appdev.111/b28370/subprograms.htm#i12352].
-      # , otherwise zero.
+      # positive integer for an
+      # {overloaded packaged subprogram}[http://download.oracle.com/docs/cd/B28359_01/appdev.111/b28370/subprograms.htm#i12352],
+      # otherwise zero.
       #
       # @return [Integer or nil]
       def overload_id
@@ -589,7 +580,8 @@ class OCI8
         @is_standalone
       end
 
-      def inspect # :nodoc:
+      # @private
+      def inspect
         "#<#{self.class.name}: #{name}>"
       end
     end
@@ -1230,7 +1222,7 @@ class OCI8
       end
 
       def inspect # :nodoc:
-        "#<#{self.class.name}:(#{obj_id}) #{obj_schema}.#{obj_name}>"
+        "#<#{self.class.name}:(#{obj_id}) #{obj_schema}.#{obj_name} FOR #{translated_name}>"
       end
     end
 

data/lib/oci8/object.rb

@@ -394,7 +394,6 @@ EOS
       @instance_methods = {}
       metadata.type_methods.each_with_index do |type_method, i|
         next if type_method.is_constructor? or type_method.is_destructor?
-        args = type_method.arguments
 
         result_type = nil
         if type_method.has_result?

data/lib/oci8/oci8.rb

@@ -1,6 +1,6 @@
 # oci8.rb -- OCI8
 #
-# Copyright (C) 2002-2012 KUBO Takehiro <kubo@jiubao.org>
+# Copyright (C) 2002-2013 Kubo Takehiro <kubo@jiubao.org>
 #
 # Original Copyright is:
 #   Oracle module for Ruby
@@ -123,48 +123,38 @@ class OCI8
     stmt_cache_size = OCI8.properties[:statement_cache_size]
     stmt_cache_size = nil if stmt_cache_size == 0
 
-    if mode.nil? and cred.nil?
-      # logon by the OCI function OCILogon2().
-      logon2_mode = 0
-      if dbname.is_a? OCI8::ConnectionPool
-        @pool = dbname # to prevent GC from freeing the connection pool.
-        dbname = dbname.send(:pool_name)
-        logon2_mode |= 0x0200 # OCI_LOGON2_CPOOL
-      end
-      if stmt_cache_size
-        # enable statement caching
-        logon2_mode |= 0x0004 # OCI_LOGON2_STMTCACHE
-      end
-
-      logon2(username, password, dbname, logon2_mode)
+    attach_mode = 0
+    if dbname.is_a? OCI8::ConnectionPool
+      @pool = dbname # to prevent GC from freeing the connection pool.
+      dbname = dbname.send(:pool_name)
+      attach_mode |= 0x0200 # OCI_CPOOL and OCI_LOGON2_CPOOL
+    end
+    if stmt_cache_size
+      # enable statement caching
+      attach_mode |= 0x0004 # OCI_STMT_CACHE and OCI_LOGON2_STMTCACHE
+    end
 
-      if stmt_cache_size
-        # set statement cache size
-        attr_set_ub4(176, stmt_cache_size) # 176: OCI_ATTR_STMTCACHESIZE
-      end
-    else
+    if true
       # logon by the OCI function OCISessionBegin().
-      attach_mode = 0
-      if dbname.is_a? OCI8::ConnectionPool
-        @pool = dbname # to prevent GC from freeing the connection pool.
-        dbname = dbname.send(:pool_name)
-        attach_mode |= 0x0200 # OCI_CPOOL
-      end
-      if stmt_cache_size
-        # enable statement caching
-        attach_mode |= 0x0004 # OCI_STMT_CACHE
-      end
-
       allocate_handles()
       @session_handle.send(:attr_set_string, OCI_ATTR_USERNAME, username) if username
       @session_handle.send(:attr_set_string, OCI_ATTR_PASSWORD, password) if password
+      if @@oracle_client_version >= ORAVER_11_1
+        # 'rubyoci8' is displayed in V$SESSION_CONNECT_INFO.CLIENT_DRIVER
+        # if both the client and the server are Oracle 11g or upper.
+        # 424: OCI_ATTR_DRIVER_NAME
+        @session_handle.send(:attr_set_string, 424, 'rubyoci8')
+      end
       server_attach(dbname, attach_mode)
       session_begin(cred ? cred : OCI_CRED_RDBMS, mode ? mode : OCI_DEFAULT)
+    else
+      # logon by the OCI function OCILogon2().
+      logon2(username, password, dbname, attach_mode)
+    end
 
-      if stmt_cache_size
-        # set statement cache size
-        attr_set_ub4(176, stmt_cache_size) # 176: OCI_ATTR_STMTCACHESIZE
-      end
+    if stmt_cache_size
+      # set statement cache size
+      attr_set_ub4(176, stmt_cache_size) # 176: OCI_ATTR_STMTCACHESIZE
     end
 
     @prefetch_rows = nil
@@ -339,6 +329,16 @@ class OCI8
     end
   end
 
+  # Sets the prefetch rows size. The default value is one.
+  # When a select statement is executed, the OCI library allocate
+  # prefetch buffer to reduce the number of network round trips by
+  # retrieving specified number of rows in one round trip.
+  #
+  # Note: Active record adaptors set 100 by default.
+  def prefetch_rows=(num)
+    @prefetch_rows = num
+  end
+
   # @private
   def inspect
     "#<OCI8:#{username}>"