ruby-oci8 2.1.5-x86-mingw32 → 2.1.7-x86-mingw32

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.
@@ -57,7 +57,7 @@ EOS
       if so_vers[0] < '2.0.0'
         s.required_ruby_version = "~> #{so_vermin}"
       else
-        s.required_ruby_version = "= #{so_vermin}"
+        s.required_ruby_version = "~> #{so_vermin}.0"
       end
     else
       puts "Binary gem for ruby #{so_vers.join(', ')}"

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
 

data/test/test_array_dml.rb

@@ -1,8 +1,7 @@
 require 'oci8'
-require 'test/unit'
 require File.dirname(__FILE__) + '/config'
 
-class TestArrayDML < Test::Unit::TestCase
+class TestArrayDML < Minitest::Test
   def setup
     @conn = get_oci8_connection
   end
@@ -131,7 +130,7 @@ EOS
       v_arr << i.to_s if i != max_array_size
     end
     cursor[1] = n_arr
-    assert_raise(RuntimeError) { cursor[2] = v_arr }
+    assert_raises(RuntimeError) { cursor[2] = v_arr }
     cursor.close
     
     drop_table('test_table')
@@ -154,9 +153,9 @@ EOS
     cursor.bind_param_array(1, [1, 2, 3])
     cursor.bind_param_array(2, ['happy', 'new', 'year'])
     cursor.bind_param_array(3, [Time.gm(1990,1,1), Time.gm(2000,1,1), Time.gm(2010,1,1)])
-    assert_nothing_raised() { cursor.exec_array }
+    cursor.exec_array
     cursor.max_array_size = 2
-    assert_raise(RuntimeError) { cursor.exec_array }
+    assert_raises(RuntimeError) { cursor.exec_array }
     drop_table('test_table')
   end
 
@@ -184,7 +183,7 @@ EOS
     end
     cursor[1] = n_arr
     cursor[2] = v_arr
-    assert_nothing_raised() { cursor.exec_array }
+    cursor.exec_array
     cursor.close
 
     cursor = @conn.parse("SELECT * FROM test_table ORDER BY N")
@@ -213,7 +212,7 @@ EOS
     cursor.max_array_size = max_array_size
     cursor.bind_param_array(1, nil, Fixnum)
     cursor.bind_param_array(2, nil, String)
-    assert_raise(RuntimeError) { cursor.exec_array }
+    assert_raises(RuntimeError) { cursor.exec_array }
     cursor.close
     drop_table('test_table')
   end

data/test/test_bind_raw.rb

@@ -1,9 +1,8 @@
 # Low-level API
 require 'oci8'
-require 'test/unit'
 require File.dirname(__FILE__) + '/config'
 
-class TestBindRaw < Test::Unit::TestCase
+class TestBindRaw < Minitest::Test
   CHECK_TARGET = [
     ["0123456789:;<=>?", "303132333435363738393A3B3C3D3E3F"],
     ["@ABCDEFGHIJKLMNO", "404142434445464748494A4B4C4D4E4F"],

data/test/test_bind_string.rb

@@ -1,9 +1,8 @@
 # -*- coding: utf-8 -*-
 require 'oci8'
-require 'test/unit'
 require File.dirname(__FILE__) + '/config'
 
-class TestBindString < Test::Unit::TestCase
+class TestBindString < Minitest::Test
   def setup
     @conn = get_oci8_connection
   end

data/test/test_bind_time.rb

@@ -1,8 +1,7 @@
 require 'oci8'
-require 'test/unit'
 require File.dirname(__FILE__) + '/config'
 
-class TestBindTime < Test::Unit::TestCase
+class TestBindTime < Minitest::Test
 
   YEAR_CHECK_TARGET = [1971, 1989, 2002, 2037]
   MON_CHECK_TARGET = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]

data/test/test_break.rb

@@ -1,10 +1,9 @@
 # High-level API
 require 'oci8'
-require 'test/unit'
 require 'timeout'
 require File.dirname(__FILE__) + '/config'
 
-class TestBreak < Test::Unit::TestCase
+class TestBreak < Minitest::Test
 
   def setup
     @conn = get_oci8_connection
@@ -107,7 +106,7 @@ class TestBreak < Test::Unit::TestCase
       # MRI and Rubinius 2.0.0
       expected = Timeout::Error
     end
-    assert_raise(expected) do
+    assert_raises(expected) do
       Timeout.timeout(1) do
         @conn.exec("BEGIN DBMS_LOCK.SLEEP(5); END;")
       end

data/test/test_clob.rb

@@ -1,9 +1,8 @@
 # Low-level API
 require 'oci8'
-require 'test/unit'
 require File.dirname(__FILE__) + '/config'
 
-class TestCLob < Test::Unit::TestCase
+class TestCLob < Minitest::Test
 
   def setup
     @conn = get_oci8_connection

data/test/test_connection_pool.rb

@@ -1,8 +1,7 @@
 require 'oci8'
-require 'test/unit'
 require File.dirname(__FILE__) + '/config'
 
-class TestConnectionPool < Test::Unit::TestCase
+class TestConnectionPool < Minitest::Test
 
   def create_pool(min, max, incr)
     OCI8::ConnectionPool.new(min, max, incr, $dbuser, $dbpass, $dbname)
@@ -48,7 +47,7 @@ class TestConnectionPool < Test::Unit::TestCase
       if cnt == 0
         unless conn.non_blocking?
           non_blocking = false
-          assert_raise(RuntimeError) do
+          assert_raises(RuntimeError) do
             # This should raise "Could not set non-blocking mode to a connection allocated from OCI8::ConnectionPool."
             conn.non_blocking = true
           end

data/test/test_connstr.rb

@@ -1,8 +1,7 @@
 require 'oci8'
-require 'test/unit'
 require File.dirname(__FILE__) + '/config'
 
-class TestConnStr < Test::Unit::TestCase
+class TestConnStr < Minitest::Test
   TEST_CASES =
     [
      # success cases:
@@ -77,5 +76,3 @@ class TestConnStr < Test::Unit::TestCase
     end
   end
 end
-
-Test::Unit::AutoRunner.run() if $0 == __FILE__

data/test/test_datetime.rb

@@ -1,9 +1,8 @@
 require 'oci8'
-require 'test/unit'
 require File.dirname(__FILE__) + '/config'
 require 'scanf'
 
-class TestDateTime < Test::Unit::TestCase
+class TestDateTime < Minitest::Test
 
   def timezone_string(tzh, tzm)
     if tzh >= 0
@@ -247,7 +246,7 @@ EOS
   def test_timezone
     begin
       # temporarily change the mapping to test OCI8::BindType::Util.default_timezone.
-      assert_raise(ArgumentError) do
+      assert_raises(ArgumentError) do
         OCI8::BindType::Util.default_timezone = :invalid_value
       end
 

data/test/test_dbi.rb

@@ -1,9 +1,8 @@
 require 'dbi'
 require 'oci8'
-require 'test/unit'
 require File.dirname(__FILE__) + '/config'
 
-class TestDBI < Test::Unit::TestCase
+class TestDBI < Minitest::Test
 
   def setup
     @dbh = get_dbi_connection()

data/test/test_dbi_clob.rb

@@ -1,23 +1,23 @@
 require 'dbi'
 require 'oci8'
-require 'test/unit'
 require File.dirname(__FILE__) + '/config'
 
-class TestDbiCLob < Test::Unit::TestCase
+class TestDbiCLob < Minitest::Test
 
   def setup
     @dbh = get_dbi_connection()
+    drop_table('test_table')
+    @dbh.execute('CREATE TABLE test_table (filename VARCHAR2(40), content CLOB)')
   end
 
   def test_insert
     filename = File.basename($lobfile)
-    @dbh.do("DELETE FROM test_clob WHERE filename = :1", filename)
 
     # insert an empty clob and get the rowid.
-    rowid = @dbh.execute("INSERT INTO test_clob(filename, content) VALUES (:1, EMPTY_CLOB())", filename) do |sth|
+    rowid = @dbh.execute("INSERT INTO test_table(filename, content) VALUES (:1, EMPTY_CLOB())", filename) do |sth|
       sth.func(:rowid)
     end
-    lob = @dbh.select_one("SELECT content FROM test_clob WHERE filename = :1 FOR UPDATE", filename)[0]
+    lob = @dbh.select_one("SELECT content FROM test_table WHERE filename = :1 FOR UPDATE", filename)[0]
     begin
       open($lobfile) do |f|
         while f.gets()
@@ -32,7 +32,7 @@ class TestDbiCLob < Test::Unit::TestCase
   def test_read
     filename = File.basename($lobfile)
     test_insert() # first insert data.
-    lob = @dbh.select_one("SELECT content FROM test_clob WHERE filename = :1 FOR UPDATE", filename)[0]
+    lob = @dbh.select_one("SELECT content FROM test_table WHERE filename = :1 FOR UPDATE", filename)[0]
     begin
       open($lobfile) do |f|
         while buf = lob.read($lobreadnum)