ruby-oci8 2.2.3 → 2.2.4

data/ext/oci8/ocihandle.c

@@ -245,9 +245,9 @@ static VALUE attr_get_common(int argc, VALUE *argv, VALUE self, enum datatype da
  *
  *  Gets the value of an attribute as `ub1' datatype.
  *
- *  @param [Fixnum] attr_type
+ *  @param [Integer] attr_type
  *  @param [Boolean] strict If false, "ORA-24328: illegal attribute value" is ignored.
- *  @return [Fixnum]
+ *  @return [Integer]
  *
  *  @since 2.0.4
  *  @private
@@ -262,9 +262,9 @@ static VALUE attr_get_ub1(int argc, VALUE *argv, VALUE self)
  *
  *  Gets the value of an attribute as `ub2' datatype.
  *
- *  @param [Fixnum] attr_type
+ *  @param [Integer] attr_type
  *  @param [Boolean] strict If false, "ORA-24328: illegal attribute value" is ignored.
- *  @return [Fixnum]
+ *  @return [Integer]
  *
  *  @since 2.0.4
  *  @private
@@ -279,7 +279,7 @@ static VALUE attr_get_ub2(int argc, VALUE *argv, VALUE self)
  *
  *  Gets the value of an attribute as `ub4' datatype.
  *
- *  @param [Fixnum] attr_type
+ *  @param [Integer] attr_type
  *  @param [Boolean] strict If false, "ORA-24328: illegal attribute value" is ignored.
  *  @return [Integer]
  *
@@ -296,7 +296,7 @@ static VALUE attr_get_ub4(int argc, VALUE *argv, VALUE self)
  *
  *  Gets the value of an attribute as `ub8' datatype.
  *
- *  @param [Fixnum] attr_type
+ *  @param [Integer] attr_type
  *  @param [Boolean] strict If false, "ORA-24328: illegal attribute value" is ignored.
  *  @return [Integer]
  *
@@ -313,9 +313,9 @@ static VALUE attr_get_ub8(int argc, VALUE *argv, VALUE self)
  *
  *  Gets the value of an attribute as `sb1' datatype.
  *
- *  @param [Fixnum] attr_type
+ *  @param [Integer] attr_type
  *  @param [Boolean] strict If false, "ORA-24328: illegal attribute value" is ignored.
- *  @return [Fixnum]
+ *  @return [Integer]
  *
  *  @since 2.0.4
  *  @private
@@ -330,9 +330,9 @@ static VALUE attr_get_sb1(int argc, VALUE *argv, VALUE self)
  *
  *  Gets the value of an attribute as `sb2' datatype.
  *
- *  @param [Fixnum] attr_type
+ *  @param [Integer] attr_type
  *  @param [Boolean] strict If false, "ORA-24328: illegal attribute value" is ignored.
- *  @return [Fixnum]
+ *  @return [Integer]
  *
  *  @since 2.0.4
  *  @private
@@ -347,7 +347,7 @@ static VALUE attr_get_sb2(int argc, VALUE *argv, VALUE self)
  *
  *  Gets the value of an attribute as `sb4' datatype.
  *
- *  @param [Fixnum] attr_type
+ *  @param [Integer] attr_type
  *  @param [Boolean] strict If false, "ORA-24328: illegal attribute value" is ignored.
  *  @return [Integer]
  *
@@ -364,7 +364,7 @@ static VALUE attr_get_sb4(int argc, VALUE *argv, VALUE self)
  *
  *  Gets the value of an attribute as `sb8' datatype.
  *
- *  @param [Fixnum] attr_type
+ *  @param [Integer] attr_type
  *  @param [Boolean] strict If false, "ORA-24328: illegal attribute value" is ignored.
  *  @return [Integer]
  *
@@ -381,7 +381,7 @@ static VALUE attr_get_sb8(int argc, VALUE *argv, VALUE self)
  *
  *  Gets the value of an attribute as `boolean' datatype.
  *
- *  @param [Fixnum] attr_type
+ *  @param [Integer] attr_type
  *  @param [Boolean] strict If false, "ORA-24328: illegal attribute value" is ignored.
  *  @return [true of false]
  *
@@ -403,7 +403,7 @@ static VALUE attr_get_boolean(int argc, VALUE *argv, VALUE self)
  *  @note If the specified attr_type's datatype is not a
  *    pointer type, it causes a segmentation fault.
  *
- *  @param [Fixnum] attr_type
+ *  @param [Integer] attr_type
  *  @param [Boolean] strict If false, "ORA-24328: illegal attribute value" is ignored.
  *  @return [String]
  *
@@ -424,7 +424,7 @@ static VALUE attr_get_string(int argc, VALUE *argv, VALUE self)
  *  @note If the specified attr_type's datatype is not a
  *    pointer type, it causes a segmentation fault.
  *
- *  @param [Fixnum] attr_type
+ *  @param [Integer] attr_type
  *  @param [Boolean] strict If false, "ORA-24328: illegal attribute value" is ignored.
  *  @return [String]
  *
@@ -445,9 +445,9 @@ static VALUE attr_get_binary(int argc, VALUE *argv, VALUE self)
  *  @note If the specified attr_type's datatype is not a
  *    pointer type, it causes a segmentation fault.
  *
- *  @param [Fixnum] attr_type
+ *  @param [Integer] attr_type
  *  @param [Boolean] strict If false, "ORA-24328: illegal attribute value" is ignored.
- *  @return [Fixnum]
+ *  @return [Integer]
  *
  *  @since 2.0.4
  *  @private
@@ -466,7 +466,7 @@ static VALUE attr_get_integer(int argc, VALUE *argv, VALUE self)
  *  @note If the specified attr_type's datatype is not a
  *    pointer type, it causes a segmentation fault.
  *
- *  @param [Fixnum] attr_type
+ *  @param [Integer] attr_type
  *  @param [Boolean] strict If false, "ORA-24328: illegal attribute value" is ignored.
  *  @return [OraDate]
  *
@@ -486,8 +486,8 @@ static VALUE attr_get_oradate(int argc, VALUE *argv, VALUE self)
  *  @note If the specified attr_type's datatype is a
  *    pointer type, it causes a segmentation fault.
  *
- *  @param [Fixnum] attr_type
- *  @param [Fixnum] attr_value
+ *  @param [Integer] attr_type
+ *  @param [Integer] attr_value
  *  @return [self]
  *
  *  @since 2.0.4
@@ -514,8 +514,8 @@ static VALUE attr_set_ub1(VALUE self, VALUE attr_type, VALUE val)
  *  @note If the specified attr_type's datatype is a
  *    pointer type, it causes a segmentation fault.
  *
- *  @param [Fixnum] attr_type
- *  @param [Fixnum] attr_value
+ *  @param [Integer] attr_type
+ *  @param [Integer] attr_value
  *  @return [self]
  *
  *  @since 2.0.4
@@ -542,7 +542,7 @@ static VALUE attr_set_ub2(VALUE self, VALUE attr_type, VALUE val)
  *  @note If the specified attr_type's datatype is a
  *    pointer type, it causes a segmentation fault.
  *
- *  @param [Fixnum] attr_type
+ *  @param [Integer] attr_type
  *  @param [Integer] attr_value
  *  @return [self]
  *
@@ -570,7 +570,7 @@ static VALUE attr_set_ub4(VALUE self, VALUE attr_type, VALUE val)
  *  @note If the specified attr_type's datatype is a
  *    pointer type, it causes a segmentation fault.
  *
- *  @param [Fixnum] attr_type
+ *  @param [Integer] attr_type
  *  @param [Integer] attr_value
  *  @return [self]
  *
@@ -598,8 +598,8 @@ static VALUE attr_set_ub8(VALUE self, VALUE attr_type, VALUE val)
  *  @note If the specified attr_type's datatype is a
  *    pointer type, it causes a segmentation fault.
  *
- *  @param [Fixnum] attr_type
- *  @param [Fixnum] attr_value
+ *  @param [Integer] attr_type
+ *  @param [Integer] attr_value
  *  @return [self]
  *
  *  @since 2.0.4
@@ -626,8 +626,8 @@ static VALUE attr_set_sb1(VALUE self, VALUE attr_type, VALUE val)
  *  @note If the specified attr_type's datatype is a
  *   pointer type, it causes a segmentation fault.
  *
- *  @param [Fixnum] attr_type
- *  @param [Fixnum] attr_value
+ *  @param [Integer] attr_type
+ *  @param [Integer] attr_value
  *  @return [self]
  *
  *  @since 2.0.4
@@ -654,7 +654,7 @@ static VALUE attr_set_sb2(VALUE self, VALUE attr_type, VALUE val)
  *  @note If the specified attr_type's datatype is a
  *    pointer type, it causes a segmentation fault.
  *
- *  @param [Fixnum] attr_type
+ *  @param [Integer] attr_type
  *  @param [Integer] attr_value
  *  @return [self]
  *
@@ -682,7 +682,7 @@ static VALUE attr_set_sb4(VALUE self, VALUE attr_type, VALUE val)
  *  @note If the specified attr_type's datatype is a
  *    pointer type, it causes a segmentation fault.
  *
- *  @param [Fixnum] attr_type
+ *  @param [Integer] attr_type
  *  @param [Integer] attr_value
  *  @return [self]
  *
@@ -710,7 +710,7 @@ static VALUE attr_set_sb8(VALUE self, VALUE attr_type, VALUE val)
  *  @note If the specified attr_type's datatype is a
  *    pointer type, it causes a segmentation fault.
  *
- *  @param [Fixnum] attr_type
+ *  @param [Integer] attr_type
  *  @param [true or false] attr_value
  *  @return [self]
  *
@@ -737,7 +737,7 @@ static VALUE attr_set_boolean(VALUE self, VALUE attr_type, VALUE val)
  *  +attr_value+ is converted to {OCI8.encoding} before it is set
  *  when the ruby version is 1.9.
  *
- *  @param [Fixnum] attr_type
+ *  @param [Integer] attr_type
  *  @param [String] attr_value
  *  @return [self]
  *
@@ -761,7 +761,7 @@ static VALUE attr_set_string(VALUE self, VALUE attr_type, VALUE val)
  *
  *  Sets the value of an attribute as `ub1 *' datatype.
  *
- *  @param [Fixnum] attr_type
+ *  @param [Integer] attr_type
  *  @param [String] attr_value
  *  @return [self]
  *
@@ -787,7 +787,7 @@ static VALUE attr_set_binary(VALUE self, VALUE attr_type, VALUE val)
  *  +number+ is converted to internal Oracle NUMBER format before
  *  it is set.
  *
- *  @param [Fixnum] attr_type
+ *  @param [Integer] attr_type
  *  @param [Numeric] number
  *  @return [self]
  *

data/ext/oci8/oraconf.rb

@@ -4,88 +4,37 @@ require 'mkmf'
 # compatibility for ruby-1.9
 RbConfig = Config unless defined? RbConfig
 
-module MiniRegistry
-  class MiniRegistryError < StandardError
-    attr_reader :api_name
-    attr_reader :code
-    def initialize(api_name, code)
-      @api_name = api_name
-      @code = code
-    end
-  end
-  if RUBY_PLATFORM =~ /mswin32|mswin64|cygwin|mingw32|bccwin32/
-    # Windows
-    require 'Win32API' # raise LoadError when UNIX.
-
-    # I looked in Win32Module by MoonWolf <URL:http://www.moonwolf.com/ruby/>,
-    # 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 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)
+if RUBY_PLATFORM =~ /mswin32|mswin64|cygwin|mingw32|bccwin32/
+  # Windows
+  require 'win32/registry'
+  module Registry
+
+    class OracleHome
+      attr_reader :name
+      attr_reader :path
+      def initialize(name, path)
+        @name = name
+        @path = path
       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 = 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
-        code = RegOpenKeyExA.call(hKey, lpName, 0, KEY_QUERY_VALUE, phkResult)
-        if code != ERROR_SUCCESS
-          RegCloseKey.call(hKey)
-          raise MiniRegistryError.new("Win32::RegEnumKeyEx", code)
+    def self.oracle_homes
+      homes = []
+      Win32::Registry::HKEY_LOCAL_MACHINE.open('SOFTWARE\Oracle') do |key|
+        key.each_key do |subkey_name|
+          subkey = key.open(subkey_name)
+          begin
+            homes << OracleHome.new(subkey['ORACLE_HOME_NAME'], subkey['ORACLE_HOME'].chomp('\\'))
+          rescue Win32::Registry::Error
+            # ignore errors
+          end
         end
-        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)
+      homes
     end
 
   end
-end # module MiniRegistry
+end
 
 # minimal implementation to read information of a shared object.
 class MiniSOReader
@@ -384,7 +333,7 @@ EOS
                         [nil].pack('P').size
                       rescue ArgumentError
                         # Rubinius 1.2.3 doesn't support Array#pack('P').
-                        # Use Fixnum#size, which returns the size of long.
+                        # Use Integer#size, which returns the size of long.
                         1.size
                       end
     is_32bit = size_of_pointer == 4
@@ -856,11 +805,8 @@ class OraConfFC < OraConf
     def get_home()
       oracle_home = ENV['ORACLE_HOME']
       if oracle_home.nil?
-        struct = Struct.new("OracleHome", :name, :path)
-        oracle_homes = []
-        MiniRegistry.enum_homes do |name, path|
-          path.chomp!("\\") if path
-          oracle_homes << struct.new(name, path) if is_valid_home?(path)
+        oracle_homes = Registry::oracle_homes.select do |home|
+          is_valid_home?(home.path)
         end
         if oracle_homes.empty?
           raise <<EOS

data/ext/oci8/oradate.c

@@ -116,12 +116,12 @@ static VALUE ora_date_s_allocate(VALUE klass)
  *    OraDate.new(2012)        # => 2012-01-01 00:00:00
  *    OraDate.new(2012, 3, 4)  # => 2012-03-04 00:00:00
  *
- *  @param [Fixnum] year year
- *  @param [Fixnum] month month
- *  @param [Fixnum] day  day of month
- *  @param [Fixnum] hour hour
- *  @param [Fixnum] min  minute
- *  @param [Fixnum] sec  second
+ *  @param [Integer] year year
+ *  @param [Integer] month month
+ *  @param [Integer] day  day of month
+ *  @param [Integer] hour hour
+ *  @param [Integer] min  minute
+ *  @param [Integer] sec  second
  */
 static VALUE ora_date_initialize(int argc, VALUE *argv, VALUE self)
 {
@@ -267,7 +267,7 @@ static VALUE ora_date_to_a(VALUE self)
  *
  *  Returns the year field of <i>self</i>.
  *
- *  @return [Fixnum]
+ *  @return [Integer]
  */
 static VALUE ora_date_year(VALUE self)
 {
@@ -281,7 +281,7 @@ static VALUE ora_date_year(VALUE self)
  *
  *  Assigns <i>num</i> to the year field of <i>self</i>.
  *
- *  @param [Fixnum] num number between -4712 and 9999
+ *  @param [Integer] num number between -4712 and 9999
  */
 static VALUE ora_date_set_year(VALUE self, VALUE val)
 {
@@ -299,7 +299,7 @@ static VALUE ora_date_set_year(VALUE self, VALUE val)
  *  Returns the month field of <i>self</i>.
  *  The month starts with one.
  *
- *  @return [Fixnum]
+ *  @return [Integer]
  */
 static VALUE ora_date_month(VALUE self)
 {
@@ -314,7 +314,7 @@ static VALUE ora_date_month(VALUE self)
  *  Assigns <i>num</i> to the month field of <i>self</i>.
  *  The month starts with one.
  *
- *  @param [Fixnum] num number between 1 and 12
+ *  @param [Integer] num number between 1 and 12
  */
 static VALUE ora_date_set_month(VALUE self, VALUE val)
 {
@@ -331,7 +331,7 @@ static VALUE ora_date_set_month(VALUE self, VALUE val)
  *
  *  Returns the day of month field of <i>self</i>.
  *
- *  @return [Fixnum]
+ *  @return [Integer]
  */
 static VALUE ora_date_day(VALUE self)
 {
@@ -345,7 +345,7 @@ static VALUE ora_date_day(VALUE self)
  *
  *  Assigns <i>num</i> to the day of month field of <i>self</i>.
  *
- *  @param [Fixnum] num number between 1 and 31
+ *  @param [Integer] num number between 1 and 31
  */
 static VALUE ora_date_set_day(VALUE self, VALUE val)
 {
@@ -362,7 +362,7 @@ static VALUE ora_date_set_day(VALUE self, VALUE val)
  *
  *  Returns the hour field of <i>self</i>.
  *
- *  @return [Fixnum]
+ *  @return [Integer]
  */
 static VALUE ora_date_hour(VALUE self)
 {
@@ -376,7 +376,7 @@ static VALUE ora_date_hour(VALUE self)
  *
  *  Assigns <i>num</i> to the hour field of <i>self</i>.
  *
- *  @param [Fixnum] num number between 0 and 23
+ *  @param [Integer] num number between 0 and 23
  */
 static VALUE ora_date_set_hour(VALUE self, VALUE val)
 {
@@ -393,7 +393,7 @@ static VALUE ora_date_set_hour(VALUE self, VALUE val)
  *
  *  Returns the minute field of <i>self</i>.
  *
- *  @return [Fixnum]
+ *  @return [Integer]
  */
 static VALUE ora_date_minute(VALUE self)
 {
@@ -407,7 +407,7 @@ static VALUE ora_date_minute(VALUE self)
  *
  *  Assigns <i>num</i> to the minute field of <i>self</i>.
  *
- *  @param [Fixnum] num number between 0 and 59
+ *  @param [Integer] num number between 0 and 59
  */
 static VALUE ora_date_set_minute(VALUE self, VALUE val)
 {
@@ -424,7 +424,7 @@ static VALUE ora_date_set_minute(VALUE self, VALUE val)
  *
  *  Returns the second field of <i>self</i>.
  *
- *  @return [Fixnum]
+ *  @return [Integer]
  */
 static VALUE ora_date_second(VALUE self)
 {
@@ -438,7 +438,7 @@ static VALUE ora_date_second(VALUE self)
  *
  *  Assigns <i>num</i> to the second field of <i>self</i>.
  *
- *  @param [Fixnum] num number between 0 and 59
+ *  @param [Integer] num number between 0 and 59
  */
 static VALUE ora_date_set_second(VALUE self, VALUE val)
 {