ruby-oci8 2.0.4 → 2.0.5

data/ext/oci8/ocihandle.c

@@ -61,6 +61,14 @@ static void oci8_handle_mark(oci8_base_t *base)
 
 static void oci8_handle_cleanup(oci8_base_t *base)
 {
+    if (oci8_in_finalizer) {
+        /* Do nothing when the program exits.
+         * The first two words of memory addressed by VALUE datatype is
+         * changed in finalizer. If a ruby function which access it such
+         * as rb_obj_is_kind_of is called, it may cause SEGV.
+         */
+        return;
+    }
     oci8_base_free(base);
     xfree(base);
 }
@@ -74,7 +82,7 @@ static VALUE oci8_s_allocate(VALUE klass)
 
     superklass = klass;
     while (!RTEST(rb_ivar_defined(superklass, oci8_id_oci8_class))) {
-        superklass = RCLASS_SUPER(superklass);
+        superklass = rb_class_superclass(superklass);
         if (superklass == rb_cObject)
             rb_raise(rb_eRuntimeError, "private method `new' called for %s:Class", rb_class2name(klass));
     }

data/ext/oci8/ocinumber.c

@@ -10,7 +10,7 @@
 #include <errno.h>
 #include "oranumber_util.h"
 
-#ifndef RUBY_VM
+#ifndef RB_NUM_COERCE_FUNCS_NEED_OPID
 /* ruby 1.8 */
 #define rb_num_coerce_cmp(x, y, id) rb_num_coerce_cmp((x), (y))
 #define rb_num_coerce_bin(x, y, id) rb_num_coerce_bin((x), (y))
@@ -39,6 +39,9 @@ static OCINumber const_mPI2; /* -PI/2 */
 
 #define _NUMBER(val) ((OCINumber *)DATA_PTR(val)) /* dangerous macro */
 
+#ifndef T_MASK
+#define T_MASK 0x100 /* TODO: rboci8_type() should be changed to be more portable. */
+#endif
 #define RBOCI8_T_ORANUMBER (T_MASK + 1)
 #define RBOCI8_T_BIGDECIMAL (T_MASK + 2)
 #ifdef T_RATIONAL
@@ -721,13 +724,13 @@ static VALUE onum_add(VALUE lhs, VALUE rhs)
         oci_lc(OCINumberAdd(errhp, _NUMBER(lhs), _NUMBER(rhs), &r));
         return oci8_make_ocinumber(&r, errhp);
     case T_FLOAT:
-        return rb_funcall(onum_to_f(lhs), '+', 1, rhs);
+        return rb_funcall(onum_to_f(lhs), oci8_id_add_op, 1, rhs);
     case RBOCI8_T_RATIONAL:
-        return rb_funcall(onum_to_r(lhs), '+', 1, rhs);
+        return rb_funcall(onum_to_r(lhs), oci8_id_add_op, 1, rhs);
     case RBOCI8_T_BIGDECIMAL:
-        return rb_funcall(onum_to_d(lhs), '+', 1, rhs);
+        return rb_funcall(onum_to_d(lhs), oci8_id_add_op, 1, rhs);
     }
-    return rb_num_coerce_bin(lhs, rhs, '+');
+    return rb_num_coerce_bin(lhs, rhs, oci8_id_add_op);
 }
 
 /*
@@ -755,13 +758,13 @@ static VALUE onum_sub(VALUE lhs, VALUE rhs)
         oci_lc(OCINumberSub(errhp, _NUMBER(lhs), _NUMBER(rhs), &r));
         return oci8_make_ocinumber(&r, errhp);
     case T_FLOAT:
-        return rb_funcall(onum_to_f(lhs), '-', 1, rhs);
+        return rb_funcall(onum_to_f(lhs), oci8_id_sub_op, 1, rhs);
     case RBOCI8_T_RATIONAL:
-        return rb_funcall(onum_to_r(lhs), '-', 1, rhs);
+        return rb_funcall(onum_to_r(lhs), oci8_id_sub_op, 1, rhs);
     case RBOCI8_T_BIGDECIMAL:
-        return rb_funcall(onum_to_d(lhs), '-', 1, rhs);
+        return rb_funcall(onum_to_d(lhs), oci8_id_sub_op, 1, rhs);
     }
-    return rb_num_coerce_bin(lhs, rhs, '-');
+    return rb_num_coerce_bin(lhs, rhs, oci8_id_sub_op);
 }
 
 /*
@@ -788,13 +791,13 @@ static VALUE onum_mul(VALUE lhs, VALUE rhs)
         oci_lc(OCINumberMul(errhp, _NUMBER(lhs), _NUMBER(rhs), &r));
         return oci8_make_ocinumber(&r, errhp);
     case T_FLOAT:
-        return rb_funcall(onum_to_f(lhs), '*', 1, rhs);
+        return rb_funcall(onum_to_f(lhs), oci8_id_mul_op, 1, rhs);
     case RBOCI8_T_RATIONAL:
-        return rb_funcall(onum_to_r(lhs), '*', 1, rhs);
+        return rb_funcall(onum_to_r(lhs), oci8_id_mul_op, 1, rhs);
     case RBOCI8_T_BIGDECIMAL:
-        return rb_funcall(onum_to_d(lhs), '*', 1, rhs);
+        return rb_funcall(onum_to_d(lhs), oci8_id_mul_op, 1, rhs);
     }
-    return rb_num_coerce_bin(lhs, rhs, '*');
+    return rb_num_coerce_bin(lhs, rhs, oci8_id_mul_op);
 }
 
 /*
@@ -830,13 +833,13 @@ static VALUE onum_div(VALUE lhs, VALUE rhs)
         oci_lc(OCINumberDiv(errhp, _NUMBER(lhs), _NUMBER(rhs), &r));
         return oci8_make_ocinumber(&r, errhp);
     case T_FLOAT:
-        return rb_funcall(onum_to_f(lhs), '/', 1, rhs);
+        return rb_funcall(onum_to_f(lhs), oci8_id_div_op, 1, rhs);
     case RBOCI8_T_RATIONAL:
-        return rb_funcall(onum_to_r(lhs), '/', 1, rhs);
+        return rb_funcall(onum_to_r(lhs), oci8_id_div_op, 1, rhs);
     case RBOCI8_T_BIGDECIMAL:
-        return rb_funcall(onum_to_d(lhs), '/', 1, rhs);
+        return rb_funcall(onum_to_d(lhs), oci8_id_div_op, 1, rhs);
     }
-    return rb_num_coerce_bin(lhs, rhs, '/');
+    return rb_num_coerce_bin(lhs, rhs, oci8_id_div_op);
 }
 
 /*
@@ -1171,7 +1174,7 @@ static VALUE onum_to_d_real(OCINumber *num, OCIError *errhp)
 {
     char buf[64];
     ub4 buf_size = sizeof(buf);
-    const const char *fmt = "FM9.99999999999999999999999999999999999999EEEE";
+    const char *fmt = "FM9.99999999999999999999999999999999999999EEEE";
 
     if (!cBigDecimal) {
         rb_require("bigdecimal");
@@ -1182,6 +1185,24 @@ static VALUE onum_to_d_real(OCINumber *num, OCIError *errhp)
     return rb_funcall(rb_cObject, id_BigDecimal, 1, rb_usascii_str_new(buf, buf_size));
 }
 
+/*
+ *  call-seq:
+ *     onum.has_decimal_part? -> true or false
+ *
+ *  Returns +true+ if <i>self</i> has a decimal part.
+ *
+ *    OraNumber(10).has_decimal_part?   # => false
+ *    OraNumber(10.1).has_decimal_part? # => true
+ */
+static VALUE onum_has_decimal_part_p(VALUE self)
+{
+    OCIError *errhp = oci8_errhp;
+    boolean result;
+
+    oci_lc(OCINumberIsInt(errhp, _NUMBER(self), &result));
+    return result ? Qfalse : Qtrue;
+}
+
 /*
  *  call-seq:
  *     onum.to_onum -> oranumber
@@ -1504,6 +1525,7 @@ Init_oci_number(VALUE cOCI8, OCIError *errhp)
     rb_define_method(cOCINumber, "to_f", onum_to_f, 0);
     rb_define_method(cOCINumber, "to_r", onum_to_r, 0);
     rb_define_method(cOCINumber, "to_d", onum_to_d, 0);
+    rb_define_method(cOCINumber, "has_decimal_part?", onum_has_decimal_part_p, 0);
     rb_define_method_nodoc(cOCINumber, "to_onum", onum_to_onum, 0);
 
     rb_define_method(cOCINumber, "zero?", onum_zero_p, 0);

data/ext/oci8/oraconf.rb

@@ -378,6 +378,18 @@ EOS
 
   private
 
+  def self.make_proc_to_check_cpu(expect)
+    Proc.new do |file|
+      so = MiniSOReader.new(file)
+      if so.cpu == expect
+        true
+      else
+        puts "  skip: #{file} is for #{so.cpu} cpu."
+        false
+      end
+    end
+  end
+
   def self.check_ic_dir
     puts "checking for load library path... "
     STDOUT.flush
@@ -390,6 +402,16 @@ EOS
     so_ext = 'so'
     nls_data_ext = nil
     check_proc = nil
+    size_of_pointer = begin
+                        # the size of a pointer.
+                        [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.
+                        1.size
+                      end
+    is_32bit = size_of_pointer == 4
+    is_big_endian = "\x01\x02".unpack('s')[0] == 0x0102
     case RUBY_PLATFORM
     when /mswin32|cygwin|mingw32|bccwin32/
       oci_basename = 'oci'
@@ -398,40 +420,29 @@ EOS
       @@ld_envs = %w[PATH]
       so_ext = 'dll'
     when /i.86-linux/
-      check_proc = Proc.new do |file|
-        so = MiniSOReader.new(file)
-        if so.cpu == :i386
-          true
-        else
-          puts "  skip: #{file} is for #{so.cpu} cpu."
-          false
-        end
-      end
+      check_proc = make_proc_to_check_cpu(:i386)
     when /ia64-linux/
-      check_proc = Proc.new do |file|
-        so = MiniSOReader.new(file)
-        if so.cpu == :ia64
-          true
-        else
-          puts "  skip: #{file} is for #{so.cpu} cpu."
-          false
-        end
-      end
+      check_proc = make_proc_to_check_cpu(:ia64)
     when /x86_64-linux/
-      check_proc = Proc.new do |file|
-        so = MiniSOReader.new(file)
-        if so.cpu == :x86_64
-          true
+      # RUBY_PLATFORM depends on the compilation environment.
+      # Even though it is x86_64-linux, the compiled ruby may
+      # be a 32-bit executable.
+      check_proc = make_proc_to_check_cpu(is_32bit ? :i386 : :x86_64)
+    when /solaris/
+      if is_32bit
+        @@ld_envs = %w[LD_LIBRARY_PATH_32 LD_LIBRARY_PATH]
+        if is_big_endian
+          check_proc = make_proc_to_check_cpu(:sparc)
         else
-          puts "  skip: #{file} is for #{so.cpu} cpu."
-          false
+          check_proc = make_proc_to_check_cpu(:i386)
         end
-      end
-    when /solaris/
-      if [0].pack('l!').length == 8
-        @@ld_envs = %w[LD_LIBRARY_PATH_64 LD_LIBRARY_PATH]
       else
-        @@ld_envs = %w[LD_LIBRARY_PATH_32 LD_LIBRARY_PATH]
+        @@ld_envs = %w[LD_LIBRARY_PATH_64 LD_LIBRARY_PATH]
+        if is_big_endian
+          check_proc = make_proc_to_check_cpu(:sparcv9)
+        else
+          check_proc = make_proc_to_check_cpu(:x86_64)
+        end
       end
     when /aix/
       oci_glob_postfix = ''
@@ -439,29 +450,27 @@ EOS
       so_ext = 'a'
       nls_data_ext = 'so'
     when /hppa.*-hpux/
-      if [0].pack('l!').length == 4
+      if is_32bit
         @@ld_envs = %w[SHLIB_PATH]
       end
       so_ext = 'sl'
     when /darwin/
       @@ld_envs = %w[DYLD_LIBRARY_PATH]
       so_ext = 'dylib'
-      check_proc = Proc.new do |file|
-        is_32bit = [0].pack('l!').size == 4
-        is_big_endian = "\x01\x02".unpack('s')[0] == 0x0102
-        if is_32bit
-          if is_big_endian
-            this_cpu = :ppc    # 32-bit big-endian
-          else
-            this_cpu = :i386   # 32-bit little-endian
-          end
+      if is_32bit
+        if is_big_endian
+          this_cpu = :ppc    # 32-bit big-endian
         else
-          if is_big_endian
-            this_cpu = :ppc64  # 64-bit big-endian
-          else
-            this_cpu = :x86_64 # 64-bit little-endian
-          end
+          this_cpu = :i386   # 32-bit little-endian
         end
+      else
+        if is_big_endian
+          this_cpu = :ppc64  # 64-bit big-endian
+        else
+          this_cpu = :x86_64 # 64-bit little-endian
+        end
+      end
+      check_proc = Proc.new do |file|
         so = MiniSOReader.new(file)
         if so.file_format == :universal
           if so.cpu.include? this_cpu
@@ -495,40 +504,43 @@ EOS
         next
       end
       puts "  #{env}... "
-      ENV[env].split(File::PATH_SEPARATOR).each do |path|
-        next if path.nil? or path == ''
-        print "    checking #{path}... "
-        path.gsub!(/\\/, '/') if /mswin32|cygwin|mingw32|bccwin32/ =~ RUBY_PLATFORM
-        files = Dir.glob(File.join(path, glob_name))
-        if files.empty?
-          puts "no"
-          next
-        end
-        STDOUT.flush
-        next if (check_proc && !check_proc.call(files[0]))
-        file = files[0]
-        ld_path = path
-        puts "yes"
-        break
-      end
-      break
+      ld_path, file = check_lib_in_path(ENV[env], glob_name, check_proc)
+      break if ld_path
     end
 
-    if ld_path.nil? and RUBY_PLATFORM =~ /linux/
-      open("|/sbin/ldconfig -p") do |f|
-        print "  checking ld.so.conf... "
-        STDOUT.flush
-        while line = f.gets
-          if line =~ /libclntsh\.so\..* => (\/.*)\/libclntsh\.so\.(.*)/
-            file = "#$1/libclntsh.so.#$2"
-            path = $1
-            next if (check_proc && !check_proc.call(file))
-            ld_path = path
-            puts "yes"
-            break
+    if ld_path.nil?
+      case RUBY_PLATFORM
+      when /linux/
+        open("|/sbin/ldconfig -p") do |f|
+          print "  checking ld.so.conf... "
+          STDOUT.flush
+          while line = f.gets
+            if line =~ /libclntsh\.so\..* => (\/.*)\/libclntsh\.so\.(.*)/
+              file = "#$1/libclntsh.so.#$2"
+              path = $1
+              next if (check_proc && !check_proc.call(file))
+              ld_path = path
+              puts "yes"
+              break
+            end
+          end
+          puts "no"
+        end
+      when /solaris/
+        if is_32bit
+          crle_cmd = 'crle'
+        else
+          crle_cmd = 'crle -64'
+        end
+        open('|env LANG=C /usr/bin/' + crle_cmd) do |f|
+          while line = f.gets
+            if line =~ /Default Library Path[^:]*:\s*(\S*)/
+              puts "  checking output of `#{crle_cmd}'... "
+              ld_path, file = check_lib_in_path($1, glob_name, check_proc)
+              break
+            end
           end
         end
-        puts "no"
       end
     end
 
@@ -545,6 +557,23 @@ EOS
     nil
   end
 
+  def self.check_lib_in_path(paths, glob_name, check_proc)
+    paths.split(File::PATH_SEPARATOR).each do |path|
+      next if path.nil? or path == ''
+      print "    checking #{path}... "
+      path.gsub!(/\\/, '/') if /mswin32|cygwin|mingw32|bccwin32/ =~ RUBY_PLATFORM
+      files = Dir.glob(File.join(path, glob_name))
+      if files.empty?
+        puts "no"
+        next
+      end
+      STDOUT.flush
+      next if (check_proc && !check_proc.call(files[0]))
+      puts "yes"
+      return path, files[0]
+    end
+  end
+
   def init
     check_cc()
     @cc_is_gcc = check_cc_is_gcc()
@@ -1109,20 +1138,8 @@ EOS
     end
 
     if RUBY_PLATFORM =~ /darwin/
-      is_intelmac = ([1].pack('s') == "\001\000")
-      arch_ppc_error = false
-      arch_i386_error = false
       open('mkmf.log', 'r') do |f|
         while line = f.gets
-          # universal-darwin8.0 (Mac OS X 10.4?)
-          if line.include? 'cputype (18, architecture ppc) does not match cputype (7)'
-            # try to link an i386 library but the instant client is ppc.
-            arch_i386_error = true
-          end
-          if line.include? 'cputype (7, architecture i386) does not match cputype (18)'
-            # try to link a ppc library but the instant client is i386.
-            arch_ppc_error = true
-          end
           if line.include? '/libclntsh.dylib load command 8 unknown cmd field'
             raise <<EOS
 Intel mac instant client is for Mac OS X 10.5.
@@ -1135,54 +1152,37 @@ You have three workarounds.
 EOS
             # '
           end
-          # universal-darwin9.0 (Mac OS X 10.5?)
-          if line.include? 'Undefined symbols for architecture i386:'
-            # try to link an i386 library but the instant client is ppc.
-            arch_i386_error = true
-          end
-          if line.include? 'Undefined symbols for architecture ppc:'
-            # try to link a ppc library but the instant client is i386.
-            arch_ppc_error = true
+
+          case line
+          when /cputype \(\d+, architecture \w+\) does not match cputype \(\d+\) for specified -arch flag: (\w+)/
+            missing_arch = $1
+          when /Undefined symbols for architecture (\w+)/
+            missing_arch = $1
+          when /missing required architecture (\w+) in file/
+            missing_arch = $1
           end
 
-          if arch_i386_error
-            if is_intelmac
-              # intel mac and '-arch i386' error
-              raise <<EOS
-Could not compile with Oracle instant client.
-Use intel mac instant client.
-EOS
+          if missing_arch
+            if [nil].pack('p').size == 8
+              my_arch = 'x86_64'
+            elsif "\x01\x02".unpack('s')[0] == 0x0201
+              my_arch = 'i386'
             else
-              # ppc mac and '-arch i386' error
-              raise <<EOS
-Could not compile with Oracle instant client.
-You may need to set a environment variable:
-    RC_ARCHS=ppc
-    export RC_ARCHS
-If it does not fix the problem, delete all '-arch i386'
-in '#{Config::CONFIG['archdir']}/rbconfig.rb'.
-EOS
+              my_arch = 'ppc'
             end
-          end
-
-          if arch_ppc_error
-            if is_intelmac
-              # intel mac and '-arch ppc' error
-              raise <<EOS
+            raise <<EOS
 Could not compile with Oracle instant client.
-You may need to set a environment variable:
-    RC_ARCHS=i386
+You may need to set the environment variable RC_ARCHS or ARCHFLAGS as follows:
+
+    RC_ARCHS=#{my_arch}
+    export RC_ARCHS
+or
+    ARCHFLAGS='-arch #{my_arch}'
     export RC_ARCHS
-If it does not fix the problem, delete all '-arch ppc'
+
+If it does not fix the problem, delete all '-arch #{missing_arch}'
 in '#{Config::CONFIG['archdir']}/rbconfig.rb'.
 EOS
-            else
-              # ppc mac and '-arch ppc' error
-              raise <<EOS
-Could not compile with Oracle instant client.
-Use ppc instant client.
-EOS
-            end
           end
         end
       end