ruby-oci8 1.0.7 → 2.0.0

data/lib/oci8/oracle_version.rb

@@ -0,0 +1,144 @@
+# oracle_version.rb implements OCI8::OracleVersion.
+#
+# Copyright (C) 2009 KUBO Takehiro <kubo@jiubao.org>
+
+#--
+
+class OCI8
+
+  # A data class, representing Oracle version.
+  #
+  # Oracle version is represented by five numbers:
+  # *major*, *minor*, *update*, *patch* and *port_update*.
+  class OracleVersion
+    include Comparable
+
+    # The first part of the Oracle version.
+    attr_reader :major
+    # The second part of the Oracle version.
+    attr_reader :minor
+    # The third part of the Oracle version.
+    attr_reader :update
+    # The fifth part of the Oracle version.
+    attr_reader :patch
+    # The fourth part of the Oracle version.
+    attr_reader :port_update
+
+    # Creates a OCI8::OracleVersion object.
+    #
+    # If the first argument _arg_ is a String, it is parsed as dotted
+    # version string. If it is bigger than 0x08000000, it is parsed as
+    # a number contains 5-digit Oracle version. Otherwise, it is used
+    # as a major version and the rest arguments are minor, update,
+    # patch and port_update. Unspecified version numbers are zeros by
+    # default.
+    #
+    # == Example
+    #   oraver = OCI8::OracleVersion.new('10.2.0.4')
+    #   oraver.major       # => 10
+    #   oraver.minor       # =>  2
+    #   oraver.update      # =>  0
+    #   oraver.patch       # =>  4
+    #   oraver.port_update # =>  0
+    #
+    #   oraver = OCI8::OracleVersion.new(0x0a200400)
+    #   oraver.major       # => 10
+    #   oraver.minor       # =>  2
+    #   oraver.update      # =>  0
+    #   oraver.patch       # =>  4
+    #   oraver.port_update # =>  0
+    def initialize(arg, minor = nil, update = nil, patch = nil, port_update = nil)
+      if arg.is_a? String
+        major, minor, update, patch, port_update = arg.split('.').collect do |v|
+          v.to_i
+        end
+      elsif arg >= 0x08000000
+        major  = (arg & 0xFF000000) >> 24
+        minor  = (arg & 0x00F00000) >> 20
+        update = (arg & 0x000FF000) >> 12
+        patch  = (arg & 0x00000F00) >> 8
+        port_update = (arg & 0x000000FF)
+      else
+        major = arg
+      end
+      @major = major
+      @minor = minor || 0
+      @update = update || 0
+      @patch = patch || 0
+      @port_update = port_update || 0
+    end
+
+    # :call-seq:
+    #   oraver <=> other_oraver -> -1, 0, +1
+    #
+    # Compares +oraver+ and +other_oraver+.
+    #
+    # <=> is the basis for the methods <, <=, ==, >, >=, and between?,
+    # included from module Comparable.
+    def <=>(other)
+      cmp = @major <=> other.major
+      return cmp if cmp != 0
+      cmp = @minor <=> other.minor
+      return cmp if cmp != 0
+      cmp = @update <=> other.update
+      return cmp if cmp != 0
+      cmp = @patch <=> other.patch
+      return cmp if cmp != 0
+      @port_update <=> other.port_update
+    end
+
+    # :call-seq:
+    #   oraver.to_i -> integer
+    #
+    # Returns an integer number contains 5-digit Oracle version.
+    #
+    # If the hexadecimal notation is 0xAABCCDEE, *major*, *minor*,
+    # *update*, *patch* and *port_update* are 0xAA, 0xB, 0xCC, 0xD and
+    # 0xEE respectively.
+    #
+    # == Example
+    #   oraver = OCI8::OracleVersion.new('10.2.0.4')
+    #   oraver.to_i          # => 169870336
+    #   '%08x' % oraver.to_i # => "0a200400"
+    def to_i
+      (@major << 24) | (@minor << 20) | (@update << 12) | (@patch << 8) | @port_update
+    end
+
+    # :call-seq:
+    #   oraver.to_s -> string
+    #
+    # Returns a dotted version string of the Oracle version.
+    #
+    # == Example
+    #   oraver = OCI8::OracleVersion.new('10.2.0.4')
+    #   oraver.to_s          # => '10.2.0.4.0'
+    def to_s
+      format('%d.%d.%d.%d.%d', @major, @minor, @update, @patch, @port_update)
+    end
+
+    # :call-seq:
+    #   oraver.eql? other -> true or false
+    #
+    # Returns true if +oraver+ and +other+ are the same type and have
+    # equal values.
+    #--
+    # This is for class Hash to test members for equality.
+    def eql?(other)
+      other.is_a? OCI8::OracleVersion and (self <=> other) == 0
+    end
+
+    # :call-seq:
+    #   oraver.hash -> integer
+    #
+    # Returns a hash based on the value of +oraver+.
+    #--
+    # This is for class Hash.
+    def hash
+      to_i
+    end
+
+    def inspect # :nodoc:
+      "#<#{self.class.to_s}: #{self.to_s}>"
+    end
+  end
+end

data/metaconfig

@@ -10,7 +10,7 @@ ToplevelInstaller.module_eval {
     old = Dir.pwd
     @installer.mkdir_p "#{objdir_root}/test"
     Dir.chdir "#{objdir_root}/test"
-    @installer.ruby("-I#{srcdir_root}/ext/oci8 -I#{srcdir_root}/lib -I#{srcdir_root}/support -I#{srcdir_root}/test #{srcdir_root}/test/test_all.rb")
+    @installer.ruby("-w -I#{srcdir_root}/ext/oci8 -I#{srcdir_root}/lib -I#{srcdir_root}/support -I#{srcdir_root}/test #{srcdir_root}/test/test_all.rb")
     Dir.chdir old
   end
 
@@ -120,8 +120,8 @@ install_files['oci8lib.so'] = <<-EOS
 install_files['oci8.rb'] = <<-EOS
 #{get_zcontent('lib/oci8.rb')}EOS
 
-install_files['dbd/OCI8.rb'] = <<-EOS
-#{get_zcontent('lib/dbd/OCI8.rb')}EOS
+install_files['DBD/OCI8/OCI8.rb'] = <<-EOS
+#{get_zcontent('lib/DBD/OCI8/OCI8.rb')}EOS
 
 begin
   installer = Installer.new(install_files)

data/ruby-oci8.gemspec

@@ -23,20 +23,20 @@ spec = Gem::Specification.new do |s|
   s.description = <<EOS
 ruby-oci8 is a ruby interface for Oracle using OCI8 API. It is available with Oracle8, Oracle8i, Oracle9i, Oracle10g and Oracle Instant Client.
 EOS
-  s.autorequire = 'oci8'
   s.has_rdoc = true
-  s.required_ruby_version = '~> 1.8.0'
   s.authors = ['KUBO Takehiro']
   s.platform = gem_platform
   files = File.read('dist-files').split("\n")
   if gem_platform == Gem::Platform::RUBY
     s.require_paths = ['lib']
     s.extensions << 'ext/oci8/extconf.rb'
+    s.required_ruby_version = '>= 1.8.0'
   else
     s.require_paths = ['lib', 'ext/oci8']
-    # exclude C source files.
-    files.delete_if do |file|
-      file[0, 4] == 'ext/'
+    if RUBY_VERSION =~ /^1\.9\./
+      s.required_ruby_version = '~> 1.9.1'
+    else
+      s.required_ruby_version = '~> 1.8.0'
     end
     # check files created by a make command.
     ['ext/oci8/oci8lib.so', 'lib/oci8.rb'].each do |file|

data/setup.rb

@@ -91,7 +91,7 @@ end
 # Config
 #
 
-if arg = ARGV.detect{|arg| /\A--rbconfig=/ =~ arg }
+if arg = ARGV.detect{|a| /\A--rbconfig=/ =~ a }
   ARGV.delete(arg)
   require arg.split(/=/, 2)[1]
   $".push 'rbconfig.rb'
@@ -145,7 +145,7 @@ class ConfigTable
     sodir      = "$site-ruby/#{c['arch']}"
   end
 
-  if arg = c['configure_args'].split.detect {|arg| /--with-make-prog=/ =~ arg }
+  if arg = c['configure_args'].split.detect {|a| /--with-make-prog=/ =~ a }
     makeprog = arg.sub(/'/, '').split(/=/, 2)[1]
   else
     makeprog = 'make'
@@ -495,7 +495,7 @@ module FileOperations
   end
 
   REJECT_DIRS = %w(
-    CVS SCCS RCS CVS.adm
+    CVS SCCS RCS CVS.adm .svn .git
   )
 
   def all_dirs_in(dirname)
@@ -1163,7 +1163,7 @@ class Installer
   end
 
   def ruby_scripts
-    collect_filenames_auto().select {|n| /\.rb\z/ =~ n }
+    collect_filenames_auto().select {|n| /\.(rb|yml)\z/ =~ n }
   end
   
   # picked up many entries from cvs-1.11.1/src/ignore.c

data/test/config.rb

@@ -24,106 +24,86 @@ $lobreadnum = 256 # counts in charactors
 # $oracle_client_version: Oracle client library version for which oci8 is compiled.
 # $oracle_version: lower value of $oracle_server_version and $oracle_client_version.
 conn = OCI8.new($dbuser, $dbpass, $dbname)
-conn.exec('select value from database_compatible_level') do |row|
-  ver = row[0].split('.')
-  $oracle_server_version = (ver[0] + ver[1] + ver[2]).to_i
+begin
+  conn.exec('select value from database_compatible_level') do |row|
+    $oracle_server_version = OCI8::OracleVersion.new(row[0])
+  end
+rescue OCIError
+  raise if $!.code != 942 # ORA-00942: table or view does not exist
+  $oracle_server_version = OCI8::ORAVER_8_0
 end
 conn.logoff
-$oracle_client_version = OCI8::CLIENT_VERSION.to_i
-if $oracle_server_version < $oracle_client_version
+
+if $oracle_server_version < OCI8.oracle_client_version
   $oracle_version = $oracle_server_version
 else
-  $oracle_version = $oracle_client_version
+  $oracle_version = OCI8.oracle_client_version
 end
 
-if $oracle_version <= 805
-  $describe_need_object_mode = true
-  $test_clob = false
-elsif $oracle_version < 810
-  $describe_need_object_mode = false
+if $oracle_version < OCI8::ORAVER_8_1
   $test_clob = false
 else
-  $describe_need_object_mode = false
   $test_clob = true
 end
 
-def do_connect ()
-  begin
-    yield
-  rescue OCIError
-    raise if $!.code != 12516 && $!.code != 12520
-    # sleep a few seconds 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)
-    yield
-  end
-end
-
-$env_is_initialized = false
-def setup_lowapi()
-  if ! $env_is_initialized
-    if $describe_need_object_mode
-      OCIEnv.initialise(OCI_OBJECT)
-    else
-      OCIEnv.initialise(OCI_DEFAULT)
-    end
-    $env_is_initialized = true
-  end
-  env = OCIEnv.init()
-  svc = do_connect { env.logon($dbuser, $dbpass, $dbname) }
-  stmt = env.alloc(OCIStmt)
-  return env, svc, stmt
-end
-
-def get_oci_connection()
-  do_connect { OCI8.new($dbuser, $dbpass, $dbname) }
-end
+module Test
+  module Unit
+    class TestCase
 
-def get_dbi_connection()
-  do_connect { DBI.connect("dbi:OCI8:#{$dbname}", $dbuser, $dbpass, 'AutoCommit' => false) }
-end
+      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
 
-module RUNIT
-  class TestCase
-    def drop_table(table_name)
-      if $oracle_server_version < 1000
-        # Oracle 8 - 9i
-        sql = "DROP TABLE #{table_name}"
-      else
-        # Oracle 10g -
-        sql = "DROP TABLE #{table_name} PURGE"
+      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
 
-      if defined? @conn
-        begin
-          @conn.exec(sql)
-        rescue OCIError
-          raise if $!.code != 942 # table or view does not exist
-        end
-      elsif defined? @dbh
-        begin
-          @dbh.do(sql)
-        rescue DBI::DatabaseError
-          raise if $!.err != 942 # table or view does not exist
+      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
-      elsif defined? @stmt
-        begin
-          @stmt.prepare(sql).execute(@svc)
-        rescue OCIError
-          raise if $!.code != 942 # table or view does not exist
+
+        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
-    end # drop_table
+      end # drop_table
+    end
   end
 end
+

data/test/test_all.rb

@@ -1,48 +1,41 @@
-require 'runit/testsuite'
-require 'runit/cui/testrunner'
-
 srcdir = File.dirname(__FILE__)
 
-# Low-level API
+require 'oci8'
+require 'test/unit'
+require "#{srcdir}/config"
+
 require "#{srcdir}/test_oradate"
 require "#{srcdir}/test_oranumber"
-require "#{srcdir}/test_describe"
 require "#{srcdir}/test_bind_time"
 require "#{srcdir}/test_bind_raw"
 if $test_clob
   require "#{srcdir}/test_clob"
 end
 
-# High-level API
 require "#{srcdir}/test_break"
 require "#{srcdir}/test_oci8"
+require "#{srcdir}/test_datetime"
 require "#{srcdir}/test_connstr"
 require "#{srcdir}/test_metadata"
+require "#{srcdir}/test_array_dml"
 require "#{srcdir}/test_rowid"
+require "#{srcdir}/test_oracle_version"
 
 # Ruby/DBI
 begin
   require 'dbi'
+  is_dbi_loaded = true
 rescue LoadError
-  begin
-    require 'rubygems'
-    require 'dbi'
-  rescue LoadError
-    dbi_not_found = false
-  end
+  is_dbi_loaded = false
 end
-unless dbi_not_found
+if is_dbi_loaded
   require "#{srcdir}/test_dbi"
   if $test_clob
     require "#{srcdir}/test_dbi_clob"
   end
 end
 
-suite = RUNIT::TestSuite.new
-ObjectSpace.each_object(Class) { |klass|
-  if klass.ancestors.include?(RUNIT::TestCase)
-    suite.add_test(klass.suite)
-  end
-}
-#RUNIT::CUI::TestRunner.quiet_mode = true
-RUNIT::CUI::TestRunner.run(suite)
+#Test::Unit::AutoRunner.run(true, true)
+if defined? Test::Unit::AutoRunner
+  Test::Unit::AutoRunner.run()
+end