ruby-oci8 1.0.5 → 1.0.6

data/ChangeLog

@@ -1,3 +1,26 @@
+2009-05-17  KUBO Takehiro  <kubo@jiubao.org>
+	* NEWS: add changes between 1.0.5 and 1.0.6.
+	* VERSION: change version to 1.0.6.
+
+2009-04-14  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/oraconf.rb: Gets ORACLE_HOME from the Windows regitry
+	    by enumerating subkeys of \\HKEY_LOCAL_MACHINE\SOFTWARE\ORACLE.
+
+2009-04-12  KUBO Takehiro  <kubo@jiubao.org>
+	* lib/dbd/OCI8.rb: A data dictionary all_constraints doesn't have
+	    index_name column on Oracle 8i or lower. Rewrite
+	    DBI::DBD::OCI8::Database#column by using all_cons_columns.
+	    (backport from ruby-oci8 trunk)
+
+2009-04-12  KUBO Takehiro  <kubo@jiubao.org>
+	* ext/oci8/extconf.rb, ext/oci8/oci8.h, ext/oci8/oraconf.rb:
+	    fix a problem when compiling for Oracle 8.0.
+	    (reported by Axel Reinhold as a ruby-oci8 2.0 issue)
+	* lib/dbd/OCI8.rb: fix DBI::DBD::OCI8::BindType::DBIStatementHandle
+	    to pass a newly added sanity check in dbi 0.4.1.
+	    (reported by Dirk Herzhauser as a ruby-oci8 2.0 issue)
+	* test/test_all.rb: fix to use dbi installed as a rubygem.
+
 2009-03-17  KUBO Takehiro  <kubo@jiubao.org>
 	* NEWS: add changes between 1.0.4 and 1.0.5.
 	* VERSION: change version to 1.0.5.

data/NEWS

@@ -1,3 +1,17 @@
+1.0.6:
+
+* fix a problem when compiling for Oracle 8.0.
+  (reported by Axel Reinhold as a ruby-oci8 2.0 issue)
+
+* [dbi] fix to pass a newly added sanity check in dbi 0.4.1.
+  (reported by Dirk Herzhauser as a ruby-oci8 2.0 issue)
+
+* [dbi] fix dbh#columns for Oracle 8.1 or lower.
+  The data dictionary all_constraints doesn't have index_name
+  column on Oracle 8i. Rewrite DBI::DBD::OCI8::Database#columns
+  by using all_cons_columns.
+  (backport from ruby-oci8 trunk)
+
 1.0.5:
 
 No changes except who try to install on Mac OS X ppc.

data/VERSION

@@ -1 +1 @@
-1.0.5
+1.0.6

data/ext/oci8/extconf.rb

@@ -44,6 +44,8 @@ $objs = ["oci8.o", "handle.o", "const.o", "env.o", "error.o", "svcctx.o",
 $CFLAGS += oraconf.cflags
 $libs += oraconf.libs
 
+have_type('oratext', 'ociap.h')
+
 # OCIEnvCreate
 #   8.0.5  - NG
 #   9.0.1  - OK

data/ext/oci8/oci8.h

@@ -52,6 +52,10 @@ extern "C" {
 #define RARRAY_LEN(obj) RARRAY(obj)->len
 #endif
 
+#ifndef HAVE_TYPE_ORATEXT
+typedef unsigned char oratext;
+#endif
+
 #define IS_OCI_ERROR(v) (((v) != OCI_SUCCESS) && ((v) != OCI_SUCCESS_WITH_INFO))
 
 #if defined(__GNUC__) && ((__GNUC__ > 3) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1))

data/ext/oci8/oraconf.rb

@@ -48,48 +48,69 @@ module MiniRegistry
     # copy the minimum code and reorganize it.
     ERROR_SUCCESS = 0
     ERROR_FILE_NOT_FOUND = 2
+    ERROR_NO_MORE_ITEMS = 259
 
     HKEY_LOCAL_MACHINE = 0x80000002
+    KEY_ENUMERATE_SUB_KEYS = 0x0008
+    KEY_QUERY_VALUE = 0x0001
     RegOpenKeyExA = Win32API.new('advapi32', 'RegOpenKeyExA', 'LPLLP', 'L')
+    RegEnumKeyExA = Win32API.new('advapi32', 'RegEnumKeyExA', 'LLPPPPPP', 'L')
     RegQueryValueExA = Win32API.new('advapi32','RegQueryValueExA','LPPPPP','L')
     RegCloseKey = Win32API.new('advapi32', 'RegCloseKey', 'L', 'L')
 
-    def get_reg_value(root, subkey, name)
-      result = [0].pack('L')
-      code = RegOpenKeyExA.call(root, subkey, 0, 0x20019, result)
+    def self.get_str_value(hKey, name)
+      lpcbData = [0].pack('L')
+      code = RegQueryValueExA.call(hKey, name, nil, nil, nil, lpcbData)
+      if code == ERROR_FILE_NOT_FOUND
+        return nil
+      elsif code != ERROR_SUCCESS
+        raise MiniRegistryError.new("Win32::RegQueryValueExA",code)
+      end
+      len = lpcbData.unpack('L')[0]
+      lpType = [0].pack('L')
+      lpData = "\0"*len
+      lpcbData = [len].pack('L')
+      code = RegQueryValueExA.call(hKey, name, nil, lpType, lpData, lpcbData)
+      if code != ERROR_SUCCESS
+        raise MiniRegistryError.new("Win32::RegQueryValueExA",code)
+      end
+      lpData.unpack('Z*')[0]
+    end
+
+    def self.enum_homes
+      phkResult = [0].pack('L')
+      code = RegOpenKeyExA.call(HKEY_LOCAL_MACHINE, 'SOFTWARE\ORACLE', 0, 0x20019, phkResult)
       if code != ERROR_SUCCESS
         raise MiniRegistryError.new("Win32::RegOpenKeyExA", code)
       end
-      hkey = result.unpack('L')[0]
-      begin
-        lpcbData = [0].pack('L')
-        code = RegQueryValueExA.call(hkey, name, nil, nil, nil, lpcbData)
-        if code == ERROR_FILE_NOT_FOUND
-          return nil
-        elsif code != ERROR_SUCCESS
-          raise MiniRegistryError.new("Win32::RegQueryValueExA",code)
+      hKey = phkResult.unpack('L')[0]
+      idx = 0
+      maxkeylen = 256
+      loop do
+        lpName = "\0" * maxkeylen
+        lpcName = [maxkeylen].pack('L')
+        code = RegEnumKeyExA.call(hKey, idx, lpName, lpcName, nil, nil, nil, nil);
+        break if code == ERROR_NO_MORE_ITEMS
+        if code != ERROR_SUCCESS
+          RegCloseKey.call(hKey)
+          raise MiniRegistryError.new("Win32::RegEnumKeyEx", code)
         end
-        len = lpcbData.unpack('L')[0]
-        lpType = "\0\0\0\0"
-        lpData = "\0"*len
-        lpcbData = [len].pack('L')
-        code = RegQueryValueExA.call(hkey, name, nil, lpType, lpData, lpcbData)
+        code = RegOpenKeyExA.call(hKey, lpName, 0, KEY_QUERY_VALUE, phkResult)
         if code != ERROR_SUCCESS
-          raise MiniRegistryError.new("Win32::RegQueryValueExA",code)
+          RegCloseKey.call(hKey)
+          raise MiniRegistryError.new("Win32::RegEnumKeyEx", code)
         end
-        lpData.unpack('Z*')[0]
-      ensure
-        RegCloseKey.call(hkey)
+        hSubkey = phkResult.unpack('L')[0]
+
+        name = get_str_value(hSubkey, 'ORACLE_HOME_NAME')
+        path = get_str_value(hSubkey, 'ORACLE_HOME')
+        yield name, path
+        RegCloseKey.call(hSubkey)
+        idx += 1
       end
+      RegCloseKey.call(hKey)
     end
-    def get_local_registry(subkey, name)
-      get_reg_value(HKEY_LOCAL_MACHINE, subkey, name)
-    end
-  else
-    # UNIX
-    def get_local_registry(subkey, name)
-      nil
-    end
+
   end
 end # module MiniRegistry
 
@@ -293,8 +314,6 @@ class MiniSOReader
 end
 
 class OraConf
-  include MiniRegistry
-
   attr_reader :cc_is_gcc
   attr_reader :version
   attr_reader :cflags
@@ -717,6 +736,7 @@ class OraConfFC < OraConf
       sqlplus = "sqlplus"
     end
     Logging::open do
+      ENV['NLS_LANG'] = 'american_america.us7ascii'
       open("|#{@oracle_home}/bin/#{sqlplus} < #{dev_null}") do |f|
         while line = f.gets
           print line
@@ -755,26 +775,10 @@ class OraConfFC < OraConf
       if oracle_home.nil?
         struct = Struct.new("OracleHome", :name, :path)
         oracle_homes = []
-        begin
-          last_home = get_local_registry("SOFTWARE\\ORACLE\\ALL_HOMES", 'LAST_HOME')
-          0.upto last_home.to_i do |id|
-             oracle_homes << "HOME#{id}"
-          end
-        rescue MiniRegistryError
-        end
-        oracle_homes << "KEY_XE"
-        oracle_homes << "KEY_XEClient"
-        oracle_homes.collect! do |home|
-          begin
-            name = get_local_registry("SOFTWARE\\ORACLE\\#{home}", 'ORACLE_HOME_NAME')
-            path = get_local_registry("SOFTWARE\\ORACLE\\#{home}", 'ORACLE_HOME')
-            path.chomp!("\\")
-            struct.new(name, path) if is_valid_home?(path)
-          rescue MiniRegistryError
-            nil
-          end
+        MiniRegistry.enum_homes do |name, path|
+          path.chomp!("\\") if path
+          oracle_homes << struct.new(name, path) if is_valid_home?(path)
         end
-        oracle_homes.compact!
         if oracle_homes.empty?
           raise <<EOS
 Set the environment variable ORACLE_HOME if Oracle Full Client.
@@ -944,21 +948,18 @@ EOS
         end
       end
 
-      # remove object files from libs.
-      objs = []
-      libs.gsub!(/\S+\.o\b/) do |obj|
-        objs << obj
-        ""
-      end
-      # change object files to an archive file to work around.
-      if objs.length > 0
-        Logging::open do
-          puts "change object files to an archive file."
-          command = Config::CONFIG["AR"] + " cru oracle_objs.a " + objs.join(" ")
-          puts command
-          system(command)
-          libs = "oracle_objs.a " + libs
+      # check whether object files are included.
+      if /\S+\.o\b/ =~ libs
+
+        # monkey patching!
+        Object.module_eval do
+          alias :orig_link_command :link_command
+          def link_command(ldflags, opt="", libpath=$DEFLIBPATH|$LIBPATH)
+            opt = "" if opt == $libs
+            orig_link_command(ldflags, opt, libpath)
+          end
         end
+
       end
       libs
     end # get_libs

data/lib/dbd/OCI8.rb

@@ -245,19 +245,21 @@ class Database < DBI::BaseDatabase
 
     dbh = DBI::DatabaseHandle.new(self)
 
-    pk_index_name = nil
+    primaries = {}
     dbh.select_all(<<EOS, tab.obj_schema, tab.obj_name) do |row|
-select index_name
-  from all_constraints
- where constraint_type = 'P'
-   and owner = :1
-   and table_name = :2
+select column_name
+  from all_cons_columns a, all_constraints b
+ where a.owner = b.owner
+   and a.constraint_name = b.constraint_name
+   and a.table_name = b.table_name
+   and b.constraint_type = 'P'
+   and b.owner = :1
+   and b.table_name = :2
 EOS
-      pk_index_name = row[0]
+      primaries[row[0]] = true
     end
 
     indices = {}
-    primaries = {}
     uniques = {}
     dbh.select_all(<<EOS, tab.obj_schema, tab.obj_name) do |row|
 select a.column_name, a.index_name, b.uniqueness
@@ -269,7 +271,6 @@ select a.column_name, a.index_name, b.uniqueness
 EOS
       col_name, index_name, uniqueness = row
       indices[col_name] = true
-      primaries[col_name] = true if index_name == pk_index_name
       uniques[col_name] = true if uniqueness == 'UNIQUE'
     end
 
@@ -401,6 +402,21 @@ class Statement < DBI::BaseStatement
   end
 end
 
+# DBI_STMT_NEW_ARGS is DBI::StatementHandle.new's arguments except +handle+.
+#
+# FYI: DBI::StatementHandle.new method signatures are follows:
+#   0.2.2: handle, fetchable=false, prepared=true
+#   0.4.0: handle, fetchable=false, prepared=true, convert_types=true
+#   0.4.1: handle, fetchable=false, prepared=true, convert_types=true, executed=false
+begin
+  DBI::StatementHandle.new(nil, false, true, true, true)
+  # dbi 0.4.1
+  DBI_STMT_NEW_ARGS = [true, true, true, true] # :nodoc:
+rescue ArgumentError
+  # dbi 0.4.0 or lower
+  DBI_STMT_NEW_ARGS = [true] # :nodoc:
+end
+
 if defined? ::OCI8::BindType::Base
   ##
   ## ruby-oci8 2.0 bind classes.
@@ -490,7 +506,7 @@ if defined? ::OCI8::BindType::Base
         val = super
         return nil if val.nil?
         stmt = DBI::DBD::OCI8::Statement.new(val)
-        DBI::StatementHandle.new(stmt, true, false)
+        DBI::StatementHandle.new(stmt, *DBI_STMT_NEW_ARGS)
       end
     end
   end # BindType
@@ -559,7 +575,7 @@ else
           return val if val.nil?
           cur = ::OCI8::Cursor.new(@env, @svc, @ctx, val)
           stmt = DBI::DBD::OCI8::Statement.new(cur)
-          DBI::StatementHandle.new(stmt, true, false)
+          DBI::StatementHandle.new(stmt, *DBI_STMT_NEW_ARGS)
         end
       end
     end

data/ruby-oci8.spec

@@ -3,7 +3,7 @@
 
 Summary: ruby interface for Oracle using OCI8 API
 Name: ruby-oci8
-Version: 1.0.5
+Version: 1.0.6
 Release: 1%{?dist}
 Group: Development/Libraries
 License: Ruby License

data/test/test_all.rb

@@ -23,11 +23,15 @@ require "#{srcdir}/test_rowid"
 # Ruby/DBI
 begin
   require 'dbi'
-  is_dbi_loaded = true
 rescue LoadError
-  is_dbi_loaded = false
+  begin
+    require 'rubygems'
+    require 'dbi'
+  rescue LoadError
+    dbi_not_found = false
+  end
 end
-if is_dbi_loaded
+unless dbi_not_found
   require "#{srcdir}/test_dbi"
   if $test_clob
     require "#{srcdir}/test_dbi_clob"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-oci8
 version: !ruby/object:Gem::Version 
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors: 
 - KUBO Takehiro
@@ -9,7 +9,7 @@ autorequire: oci8
 bindir: bin
 cert_chain: []
 
-date: 2009-03-18 00:00:00 +09:00
+date: 2009-05-17 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -118,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ruby-oci8
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: Ruby interface for Oracle using OCI8 API