ruby-oci8 2.1.5.1-x64-mingw32 → 2.1.7-x64-mingw32

data/lib/oci8/metadata.rb

@@ -89,6 +89,15 @@ class OCI8
       #  attr_get_oradate(OCI_ATTR_TIMESTAMP)
       #end
 
+      # Returns the database link name if the object is at the remote host.
+      # Note that this is available only when the object is returned by OCI8#describe_* methods.
+      #
+      # @return [String or nil] database link name
+      # @since 2.1.7
+      def obj_link
+        @obj_link
+      end
+
       # @private
       def inspect
         "#<#{self.class.name}:(#{obj_id}) #{obj_schema}.#{obj_name}>"
@@ -110,7 +119,7 @@ class OCI8
                           Proc.new do |p|
                             if p.charset_form == :nchar
                               "NVARCHAR2(#{p.char_size})"
-                            elsif p.char_used?
+                            elsif p.respond_to?(:char_used?) && p.char_used?
                               "VARCHAR2(#{p.char_size} CHAR)"
                             else
                               "VARCHAR2(#{p.data_size})"
@@ -248,6 +257,12 @@ class OCI8
                                 "TIMESTAMP(#{fsprecision}) WITH LOCAL TIME ZONE"
                               end
                             end]
+      DATA_TYPE_MAP[245] = [:record,
+                            Proc.new do |p|
+                              "#{p.schema_name}.#{p.type_name}"
+                            end]
+      DATA_TYPE_MAP[252] = [:boolean, "BOOLEAN"]
+      DATA_TYPE_MAP[266] = [:pls_integer, "PLS_INTEGER"]
 
       def __data_type # :nodoc:
         return @data_type if defined? @data_type
@@ -337,6 +352,9 @@ class OCI8
         #when 228; :sysfirst   # OCI_TYPECODE_SYSFIRST
         #when 235; :syslast    # OCI_TYPECODE_SYSLAST
         when 266; :pls_integer # OCI_TYPECODE_PLS_INTEGER
+        when 250; :record      # OCI_TYPECODE_RECORD
+        when 251; :itable      # OCI_TYPECODE_ITABLE
+        when 252; :boolean     # OCI_TYPECODE_BOOLEAN
         end
       end
     end
@@ -632,6 +650,12 @@ class OCI8
       end
       private :list_subprograms
 
+      # package type list
+      def list_types # :nodoc:
+        __param(137) # OCI_ATTR_LIST_PKG_TYPES
+      end
+      private :list_types
+
       # Returns +true+ if the package subprograms have
       # {invoker's rights}[http://download.oracle.com/docs/cd/B28359_01/appdev.111/b28370/subprograms.htm#i18574].
       # Otherwise, +false+.
@@ -647,6 +671,22 @@ class OCI8
           prog.instance_variable_set(:@is_standalone, false)
         end
       end
+
+      if OCI8.oracle_client_version < ORAVER_12_1
+        def types
+          raise "This version of the Oracle client does not support PL/SQL package type descriptions."
+        end
+      else
+        # Returns an array of types defined within the Package.
+        #
+        # @return [array of OCI8::Metadata::Type]
+        # @since 2.1.6
+        def types
+          @types ||= list_types.to_a.each do |type|
+            type.instance_variable_set(:@is_standalone, false)
+          end
+        end
+      end
     end
 
     # Information about types
@@ -851,6 +891,15 @@ class OCI8
         attr_get_string(OCI_ATTR_SUPERTYPE_NAME) if is_subtype?
       end
 
+      # Returns the package name if the type is a package type.
+      # Otherwise, +nil+.
+      #
+      # @return [String or nil]
+      # @since 2.1.6
+      def package_name
+        attr_get_string(12, false) # OCI_ATTR_PACKAGE_NAME
+      end
+
       # Returns attribute information of the type.
       #
       # @return [array of OCI8::Metadata::TypeAttr]
@@ -1199,6 +1248,7 @@ class OCI8
       # schema name of the synonym translation
       def schema_name
         @schema_name ||= attr_get_string(OCI_ATTR_SCHEMA_NAME)
+        @schema_name.size == 0 ? nil : @schema_name
       end
 
       # object name of the synonym translation
@@ -1214,11 +1264,7 @@ class OCI8
 
       # full-qualified synonym translation name with schema, object and database link name.
       def translated_name
-        if link.nil?
-          schema_name + '.' + name
-        else
-          schema_name + '.' + name + '@' + link
-        end
+        (schema_name ? schema_name + '.' : '') + name + (link ? '@' + link : '')
       end
 
       def inspect # :nodoc:
@@ -1487,10 +1533,21 @@ class OCI8
       end
 
       # Indicates whether an argument has a default
+      #
+      # @return [1 or 0]
+      # @deprecated
       def has_default
         attr_get_ub1(OCI_ATTR_HAS_DEFAULT)
       end
 
+      # Indicates whether an argument has a default
+      #
+      # @return [true or false]
+      # @since 2.1.6
+      def has_default?
+        __boolean(OCI_ATTR_HAS_DEFAULT)
+      end
+
       # The list of arguments at the next level (when the argument is
       # of a record or table type).
       def list_arguments
@@ -1648,8 +1705,9 @@ class OCI8
         #when OCI_LTYPE_TABLE_ALIAS;   offset = ?
         #when OCI_LTYPE_VARIABLE_TYPE; offset = ?
         #when OCI_LTYPE_NAME_VALUE;    offset = ?
+        when 15; offset = 0 # OCI_LTYPE_PACKAGE_TYPE
         else
-          raise NotImplementedError, "unsupported list type #{list.ltype}"
+          raise NotImplementedError, "unsupported list type #{ltype}"
         end
         ary = []
         0.upto(num_params - 1) do |i|
@@ -1994,7 +2052,13 @@ class OCI8
   # @param [String] object_name
   # @return [a subclass of OCI8::Metadata::Base]
   def describe_any(object_name)
-    __describe(object_name, OCI8::Metadata::Unknown, true)
+    if /^PUBLIC\.(.*)/i =~ object_name
+      md = __describe($1, OCI8::Metadata::Unknown, true)
+      raise OCIError.new(4043, object_name) if md.obj_schema != 'PUBLIC'
+      md
+    else
+      __describe(object_name, OCI8::Metadata::Unknown, true)
+    end
   end
   # Returns table or view information. If the name is a current schema's synonym
   # name or a public synonym name, it returns table or view information which
@@ -2011,6 +2075,9 @@ class OCI8
       __describe(table_name, OCI8::Metadata::Table, false)
     else
       # check tables, views, synonyms and public synonyms.
+
+      # follow synonyms up to 20 times to prevent infinite loop
+      # caused by recursive synonyms.
       recursive_level = 20
       recursive_level.times do
         metadata = __describe(table_name, OCI8::Metadata::Unknown, true)
@@ -2019,6 +2086,11 @@ class OCI8
           return metadata
         when OCI8::Metadata::Synonym
           table_name = metadata.translated_name
+          if metadata.obj_link and metadata.link.nil?
+            # table_name is a synonym in a remote database for an object in the
+            # remote database itself.
+            table_name = "#{table_name}@#{metadata.obj_link}"
+          end
         else
           raise OCIError.new(4043, table_name) # ORA-04043: object %s does not exist
         end
@@ -2066,7 +2138,13 @@ class OCI8
   # @param [String] synonym_name
   # @return [OCI8::Metadata::Synonym]
   def describe_synonym(synonym_name, check_public_also = true)
-    __describe(synonym_name, OCI8::Metadata::Synonym, check_public_also)
+    if /^PUBLIC\.(.*)/i =~ synonym_name
+      md = __describe($1, OCI8::Metadata::Synonym, true)
+      raise OCIError.new(4043, synonym_name) if md.obj_schema != 'PUBLIC'
+      md
+    else
+      __describe(synonym_name, OCI8::Metadata::Synonym, check_public_also)
+    end
   end
   # Returns sequence information
   #

data/lib/oci8/object.rb

@@ -71,6 +71,29 @@ EOS
     OCI8::TDO.new(self, metadata, klass)
   end
 
+  # Returns the type descriptor object which correspond to the given type name.
+  #
+  # @param [String] typename
+  # @return [OCI8::TDO]
+  #
+  # @private
+  def get_tdo_by_typename(typename)
+    tdo = @name_to_tdo && @name_to_tdo[typename]
+    return tdo if tdo
+
+    metadata = describe_any(typename)
+    if metadata.is_a? OCI8::Metadata::Synonym
+      metadata = describe_any(metadata.translated_name)
+    end
+    unless metadata.is_a? OCI8::Metadata::Type
+      raise "unknown typename #{typename}"
+    end
+    tdo = get_tdo_by_metadata(metadata)
+
+    @name_to_tdo[typename] = tdo
+    tdo
+  end
+
   # A helper class to bind arguments.
   #
   # @private

data/ruby-oci8.gemspec

@@ -19,7 +19,7 @@ spec = Gem::Specification.new do |s|
   s.version = File.read('VERSION').strip
   s.summary = 'Ruby interface for Oracle using OCI8 API'
   s.email = 'kubo@jiubao.org'
-  s.homepage = 'http://ruby-oci8.rubyforge.org'
+  s.homepage = 'https://github.com/kubo/ruby-oci8/'
   s.rubyforge_project = 'ruby-oci8'
   s.description = <<EOS
 ruby-oci8 is a ruby interface for Oracle using OCI8 API. It is available with Oracle8i, Oracle9i, Oracle10g, Oracle11g and Oracle Instant Client.

data/test/config.rb

@@ -18,6 +18,21 @@ $lobreadnum = 256 # counts in charactors
 
 # don't modify below.
 
+begin
+  require 'minitest/autorun'
+  Minitest = MiniTest unless defined? Minitest
+  Minitest::Test = Minitest::Unit::TestCase unless defined? Minitest::Test
+rescue LoadError
+  require 'test/unit'
+  module Minitest
+    Test = ::Test::Unit::TestCase
+    Assertions = ::Test::Unit::Assertions
+    module Assertions
+      alias refute_nil assert_not_nil
+    end
+  end
+end
+
 # $oracle_server_version: database compatible level of the Oracle server.
 # $oracle_client_version: Oracle client library version for which oci8 is compiled.
 # $oracle_version: lower value of $oracle_server_version and $oracle_client_version.
@@ -108,77 +123,72 @@ def convert_to_datetime(year, month, day, hour, minute, sec, subsec, timezone)
   end
 end
 
-module Test
-  module Unit
-    class TestCase
+class Minitest::Test
 
-      def get_oci8_connection()
-        OCI8.new($dbuser, $dbpass, $dbname)
+  def get_oci8_connection()
+    OCI8.new($dbuser, $dbpass, $dbname)
       rescue OCIError
-        raise if $!.code != 12516 && $!.code != 12520
-        # sleep a few second and try again if
-        # the error code is ORA-12516 or ORA-12520.
-        #
-        # ORA-12516 - TNS:listener could not find available handler with
-        #             matching protocol stack
-        # ORA-12520 - TNS:listener could not find available handler for
-        #             requested type of server
-        #
-        # Thanks to Christopher Jones.
-        #
-        # Ref: The Underground PHP and Oracle Manual (page 175 in vesion 1.4)
-        #      http://www.oracle.com/technology/tech/php/pdf/underground-php-oracle-manual.pdf
-        #
-        sleep(5)
-        OCI8.new($dbuser, $dbpass, $dbname)
-      end
+    raise if $!.code != 12516 && $!.code != 12520
+    # sleep a few second and try again if
+    # the error code is ORA-12516 or ORA-12520.
+    #
+    # ORA-12516 - TNS:listener could not find available handler with
+    #             matching protocol stack
+    # ORA-12520 - TNS:listener could not find available handler for
+    #             requested type of server
+    #
+    # Thanks to Christopher Jones.
+    #
+    # Ref: The Underground PHP and Oracle Manual (page 175 in vesion 1.4)
+    #      http://www.oracle.com/technology/tech/php/pdf/underground-php-oracle-manual.pdf
+    #
+    sleep(5)
+    OCI8.new($dbuser, $dbpass, $dbname)
+  end
+
+  def get_dbi_connection()
+    DBI.connect("dbi:OCI8:#{$dbname}", $dbuser, $dbpass, 'AutoCommit' => false)
+  rescue DBI::DatabaseError
+    raise if $!.err != 12516 && $!.err != 12520
+    # same as get_oci8_connection()
+    sleep(5)
+    DBI.connect("dbi:OCI8:#{$dbname}", $dbuser, $dbpass, 'AutoCommit' => false)
+  end
 
-      def get_dbi_connection()
-        DBI.connect("dbi:OCI8:#{$dbname}", $dbuser, $dbpass, 'AutoCommit' => false)
+  def drop_table(table_name)
+    if $oracle_server_version < OCI8::ORAVER_10_1
+      # Oracle 8 - 9i
+      sql = "DROP TABLE #{table_name}"
+    else
+      # Oracle 10g -
+      sql = "DROP TABLE #{table_name} PURGE"
+    end
+
+    if defined? @conn
+      begin
+        @conn.exec(sql)
+      rescue OCIError
+        raise if $!.code != 942 # table or view does not exist
+      end
+    elsif instance_variable_get(:@dbh)
+      begin
+        @dbh.do(sql)
       rescue DBI::DatabaseError
-        raise if $!.err != 12516 && $!.err != 12520
-        # same as get_oci8_connection()
-        sleep(5)
-        DBI.connect("dbi:OCI8:#{$dbname}", $dbuser, $dbpass, 'AutoCommit' => false)
+        raise if $!.err != 942 # table or view does not exist
       end
+    end
+  end # drop_table
 
-      def drop_table(table_name)
-        if $oracle_server_version < OCI8::ORAVER_10_1
-          # Oracle 8 - 9i
-          sql = "DROP TABLE #{table_name}"
-        else
-          # Oracle 10g -
-          sql = "DROP TABLE #{table_name} PURGE"
-        end
-
-        if defined? @conn
-          begin
-            @conn.exec(sql)
-          rescue OCIError
-            raise if $!.code != 942 # table or view does not exist
-          end
-        elsif instance_variable_get(:@dbh)
-          begin
-            @dbh.do(sql)
-          rescue DBI::DatabaseError
-            raise if $!.err != 942 # table or view does not exist
-          end
-        end
-      end # drop_table
-
-      def drop_type(type_name)
-        begin
-          @conn.exec("DROP TYPE BODY #{type_name}")
-        rescue OCIError
-          raise if $!.code != 4043
-        end
-        begin
-          @conn.exec("DROP TYPE #{type_name}")
-        rescue OCIError
-          raise if $!.code != 4043
-        end
-      end # drop_type
+  def drop_type(type_name)
+    begin
+      @conn.exec("DROP TYPE BODY #{type_name}")
+    rescue OCIError
+      raise if $!.code != 4043
     end
-  end
+    begin
+      @conn.exec("DROP TYPE #{type_name}")
+    rescue OCIError
+      raise if $!.code != 4043
+    end
+  end # drop_type
 end
-

data/test/test_all.rb

@@ -1,7 +1,6 @@
 srcdir = File.dirname(__FILE__)
 
 require 'oci8'
-require 'test/unit'
 require "#{srcdir}/config"
 
 require "#{srcdir}/test_oradate"
@@ -30,6 +29,10 @@ if OCI8.respond_to? :encoding
   require "#{srcdir}/test_encoding"
 end
 
+if $oracle_version >= OCI8::ORAVER_12_1
+  require "#{srcdir}/test_package_type"
+end
+
 # Ruby/DBI
 begin
   require 'dbi'
@@ -47,8 +50,3 @@ unless dbi_not_found
     require "#{srcdir}/test_dbi_clob"
   end
 end
-
-#Test::Unit::AutoRunner.run(true, true)
-if defined? Test::Unit::AutoRunner
-  Test::Unit::AutoRunner.run()
-end

data/test/test_appinfo.rb

@@ -1,8 +1,7 @@
 require 'oci8'
-require 'test/unit'
 require File.dirname(__FILE__) + '/config'
 
-class TestAppInfo < Test::Unit::TestCase
+class TestAppInfo < Minitest::Test
 
   def setup
     @conn = get_oci8_connection
@@ -14,7 +13,7 @@ class TestAppInfo < Test::Unit::TestCase
     @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
+    assert_raises ArgumentError do
       @conn.client_identifier = ':bad_identifier'
     end