ruby-oci8 2.1.5 → 2.1.6

data/ext/oci8/ocihandle.c

@@ -124,6 +124,7 @@ static VALUE attr_get_common(int argc, VALUE *argv, VALUE self, enum datatype da
     oci8_base_t *base = DATA_PTR(self);
     VALUE attr_type;
     VALUE strict;
+    VALUE args[6];
     union {
         ub1 ub1val;
         ub2 ub2val;
@@ -140,6 +141,10 @@ static VALUE attr_get_common(int argc, VALUE *argv, VALUE self, enum datatype da
     ub4 size = 0;
     sword rv;
 
+    if (base->type == 0) {
+        return Qnil;
+    }
+
     v.ub8val = MAGIC_NUMBER;
     rb_scan_args(argc, argv, "11", &attr_type, &strict);
     if (argc == 1) {
@@ -193,13 +198,13 @@ static VALUE attr_get_common(int argc, VALUE *argv, VALUE self, enum datatype da
     case DATATYPE_ORADATE:
         if (NIL_P(cOraDate))
             cOraDate = rb_eval_string("OraDate");
-        return rb_funcall(cOraDate, oci8_id_new, 6,
-                          INT2FIX((v.ub1ptr[0] - 100) * 100 + (v.ub1ptr[1] - 100)),
-                          INT2FIX(v.ub1ptr[2]),
-                          INT2FIX(v.ub1ptr[3]),
-                          INT2FIX(v.ub1ptr[4] - 1),
-                          INT2FIX(v.ub1ptr[5] - 1),
-                          INT2FIX(v.ub1ptr[6] - 1));
+        args[0] = INT2FIX((v.ub1ptr[0] - 100) * 100 + (v.ub1ptr[1] - 100));
+        args[1] = INT2FIX(v.ub1ptr[2]);
+        args[2] = INT2FIX(v.ub1ptr[3]);
+        args[3] = INT2FIX(v.ub1ptr[4] - 1);
+        args[4] = INT2FIX(v.ub1ptr[5] - 1);
+        args[5] = INT2FIX(v.ub1ptr[6] - 1);
+        return rb_class_new_instance(6, args, cOraDate);
     }
     return Qnil;
 }

data/ext/oci8/oraconf.rb

@@ -334,8 +334,9 @@ Backtrace:
   #{$!.backtrace.join("\n  ")}
 ---------------------------------------------------
 See:
- * http://ruby-oci8.rubyforge.org/#{lang}/HowToInstall.html
- * http://ruby-oci8.rubyforge.org/#{lang}/ReportInstallProblem.html
+ * http://ruby-oci8.rubyforge.org/en/file.install-full-client.html for Oracle full client
+ * http://ruby-oci8.rubyforge.org/en/file.install-instant-client.html for Oracle instant client
+ * http://ruby-oci8.rubyforge.org/en/file.report-installation-issue.html to report an issue.
 
 EOS
       exc = RuntimeError.new
@@ -391,7 +392,7 @@ EOS
     when /mswin32|cygwin|mingw32|bccwin32/
       oci_basename = 'oci'
       oci_glob_postfix = ''
-      nls_data_basename = ['oraociei11', 'oraociicus11', 'oraociei10', 'oraociicus10']
+      nls_data_basename = ['oraociei*', 'oraociicus*']
       @@ld_envs = %w[PATH]
       so_ext = 'dll'
       check_proc = make_proc_to_check_cpu(is_32bit ? :i386 : :x86_64)
@@ -523,7 +524,7 @@ EOS
     if ld_path
       nls_data_ext ||= so_ext # nls_data_ext is same with so_ext by default.
       nls_data_basename.each do |basename|
-        if File.exist?(File.join(ld_path, "#{basename}.#{nls_data_ext}"))
+        if Dir.glob(File.join(ld_path, "#{basename}.#{nls_data_ext}")).size > 0
           puts "  #{file} looks like an instant client."
           return ld_path
         end
@@ -645,12 +646,13 @@ EOS
 
     def get_libs(lib_dir)
       case RUBY_PLATFORM
-      when /cygwin/
+      when /cygwin|x64-mingw32/
+        regex = ([nil].pack('P').size == 8) ? / T (OCI\w+)/ : / T _(OCI\w+)/
         open("OCI.def", "w") do |f|
           f.puts("EXPORTS")
           open("|nm #{lib_dir}/MSVC/OCI.LIB") do |r|
             while line = r.gets
-              f.puts($') if line =~ / T _/
+              f.puts($1) if regex =~ line
             end
           end
         end

data/ext/oci8/stmt.c

@@ -61,7 +61,7 @@ static VALUE oci8_stmt_initialize(VALUE self, VALUE svc, VALUE sql)
     if (!NIL_P(sql) && oracle_client_version >= ORAVER_9_2) {
         OCI8SafeStringValue(sql);
 
-        rv = OCIStmtPrepare2(svcctx->base.hp.svc, &stmt->base.hp.stmt, oci8_errhp, RSTRING_ORATEXT(sql), RSTRING_LEN(sql), NULL, 0, OCI_NTV_SYNTAX, OCI_DEFAULT);
+        rv = OCIStmtPrepare2_nb(svcctx, svcctx->base.hp.svc, &stmt->base.hp.stmt, oci8_errhp, RSTRING_ORATEXT(sql), RSTRING_LEN(sql), NULL, 0, OCI_NTV_SYNTAX, OCI_DEFAULT);
         if (IS_OCI_ERROR(rv)) {
             chker2(rv, &svcctx->base);
         }
@@ -342,7 +342,7 @@ static void bind_stmt_init_elem(oci8_bind_t *obind, VALUE svc)
     ub4 idx = 0;
 
     do {
-        oho[idx].obj = rb_funcall(cOCIStmt, oci8_id_new, 1, svc);
+        oho[idx].obj = rb_class_new_instance(1, &svc, cOCIStmt);
         h = DATA_PTR(oho[idx].obj);
         oho[idx].hp = h->hp.ptr;
     } while (++idx < obind->maxar_sz);

data/lib/oci8.rb.in

@@ -50,8 +50,6 @@ when 'ruby'
   # if it wasn't explicitly changed by the configure option --with-ruby-version.
   #
   case RUBY_VERSION
-  when /^2\.0/
-    so_basename += RUBY_VERSION.gsub(/\W/, '')
   when /^1\.9\.0/
     raise 'unsupported ruby version: 1.9.0'
   when /^1\.9/
@@ -59,20 +57,10 @@ when 'ruby'
   when /^1\.8/
     so_basename += '18'
   else
-    raise 'unsupported ruby version: ' + RUBY_VERSION
+    so_basename += RUBY_VERSION.gsub(/\W/, '')
   end
 when 'rbx'
-  # "rbx -X18" and "rbx -X19" use different C header files.
-  case RUBY_VERSION
-  when /^2\.0/
-    so_basename += 'rbx20'
-  when /^1\.9/
-    so_basename += 'rbx19'
-  when /^1\.8/
-    so_basename += 'rbx18'
-  else
-    raise 'unsupported language mode: ' + RUBY_VERSION
-  end
+  so_basename += 'rbx'
 when 'jruby'
   raise "Ruby-oci8 doesn't support jruby because its C extension support is in development in jruby 1.6 and deprecated in jruby 1.7."
 else
@@ -104,6 +92,8 @@ class OCI8
   ORAVER_10_2 = OCI8::OracleVersion.new(10, 2)
   # @private
   ORAVER_11_1 = OCI8::OracleVersion.new(11, 1)
+  # @private
+  ORAVER_12_1 = OCI8::OracleVersion.new(12, 1)
 
   # @private
   @@oracle_client_version = OCI8::OracleVersion.new(self.oracle_client_vernum)

data/lib/oci8/cursor.rb

@@ -478,6 +478,8 @@ class OCI8
         elsif key.class == Class && key < OCI8::Object::Base
           param = @con.get_tdo_by_class(key)
           key = :named_type
+        elsif key == :named_type
+          param = @con.get_tdo_by_typename(param[:length])
         end
       when OCI8::Metadata::Base
         key = param.data_type

data/lib/oci8/metadata.rb

@@ -110,7 +110,7 @@ class OCI8
                           Proc.new do |p|
                             if p.charset_form == :nchar
                               "NVARCHAR2(#{p.char_size})"
-                            elsif p.char_used?
+                            elsif p.respond_to?(:char_used?) && p.char_used?
                               "VARCHAR2(#{p.char_size} CHAR)"
                             else
                               "VARCHAR2(#{p.data_size})"
@@ -248,6 +248,12 @@ class OCI8
                                 "TIMESTAMP(#{fsprecision}) WITH LOCAL TIME ZONE"
                               end
                             end]
+      DATA_TYPE_MAP[245] = [:record,
+                            Proc.new do |p|
+                              "#{p.schema_name}.#{p.type_name}"
+                            end]
+      DATA_TYPE_MAP[252] = [:boolean, "BOOLEAN"]
+      DATA_TYPE_MAP[266] = [:pls_integer, "PLS_INTEGER"]
 
       def __data_type # :nodoc:
         return @data_type if defined? @data_type
@@ -337,6 +343,9 @@ class OCI8
         #when 228; :sysfirst   # OCI_TYPECODE_SYSFIRST
         #when 235; :syslast    # OCI_TYPECODE_SYSLAST
         when 266; :pls_integer # OCI_TYPECODE_PLS_INTEGER
+        when 250; :record      # OCI_TYPECODE_RECORD
+        when 251; :itable      # OCI_TYPECODE_ITABLE
+        when 252; :boolean     # OCI_TYPECODE_BOOLEAN
         end
       end
     end
@@ -632,6 +641,12 @@ class OCI8
       end
       private :list_subprograms
 
+      # package type list
+      def list_types # :nodoc:
+        __param(137) # OCI_ATTR_LIST_PKG_TYPES
+      end
+      private :list_types
+
       # Returns +true+ if the package subprograms have
       # {invoker's rights}[http://download.oracle.com/docs/cd/B28359_01/appdev.111/b28370/subprograms.htm#i18574].
       # Otherwise, +false+.
@@ -647,6 +662,22 @@ class OCI8
           prog.instance_variable_set(:@is_standalone, false)
         end
       end
+
+      if OCI8.oracle_client_version < ORAVER_12_1
+        def types
+          raise "This version of the Oracle client does not support PL/SQL package type descriptions."
+        end
+      else
+        # Returns an array of types defined within the Package.
+        #
+        # @return [array of OCI8::Metadata::Type]
+        # @since 2.1.6
+        def types
+          @types ||= list_types.to_a.each do |type|
+            type.instance_variable_set(:@is_standalone, false)
+          end
+        end
+      end
     end
 
     # Information about types
@@ -851,6 +882,15 @@ class OCI8
         attr_get_string(OCI_ATTR_SUPERTYPE_NAME) if is_subtype?
       end
 
+      # Returns the package name if the type is a package type.
+      # Otherwise, +nil+.
+      #
+      # @return [String or nil]
+      # @since 2.1.6
+      def package_name
+        attr_get_string(12, false) # OCI_ATTR_PACKAGE_NAME
+      end
+
       # Returns attribute information of the type.
       #
       # @return [array of OCI8::Metadata::TypeAttr]
@@ -1199,6 +1239,7 @@ class OCI8
       # schema name of the synonym translation
       def schema_name
         @schema_name ||= attr_get_string(OCI_ATTR_SCHEMA_NAME)
+        @schema_name.size == 0 ? nil : @schema_name
       end
 
       # object name of the synonym translation
@@ -1214,11 +1255,7 @@ class OCI8
 
       # full-qualified synonym translation name with schema, object and database link name.
       def translated_name
-        if link.nil?
-          schema_name + '.' + name
-        else
-          schema_name + '.' + name + '@' + link
-        end
+        (schema_name ? schema_name + '.' : '') + name + (link ? '@' + link : '')
       end
 
       def inspect # :nodoc:
@@ -1487,10 +1524,21 @@ class OCI8
       end
 
       # Indicates whether an argument has a default
+      #
+      # @return [1 or 0]
+      # @deprecated
       def has_default
         attr_get_ub1(OCI_ATTR_HAS_DEFAULT)
       end
 
+      # Indicates whether an argument has a default
+      #
+      # @return [true or false]
+      # @since 2.1.6
+      def has_default?
+        __boolean(OCI_ATTR_HAS_DEFAULT)
+      end
+
       # The list of arguments at the next level (when the argument is
       # of a record or table type).
       def list_arguments
@@ -1648,8 +1696,9 @@ class OCI8
         #when OCI_LTYPE_TABLE_ALIAS;   offset = ?
         #when OCI_LTYPE_VARIABLE_TYPE; offset = ?
         #when OCI_LTYPE_NAME_VALUE;    offset = ?
+        when 15; offset = 0 # OCI_LTYPE_PACKAGE_TYPE
         else
-          raise NotImplementedError, "unsupported list type #{list.ltype}"
+          raise NotImplementedError, "unsupported list type #{ltype}"
         end
         ary = []
         0.upto(num_params - 1) do |i|
@@ -1994,7 +2043,13 @@ class OCI8
   # @param [String] object_name
   # @return [a subclass of OCI8::Metadata::Base]
   def describe_any(object_name)
-    __describe(object_name, OCI8::Metadata::Unknown, true)
+    if /^PUBLIC\.(.*)/i =~ object_name
+      md = __describe($1, OCI8::Metadata::Unknown, true)
+      raise OCIError.new(4043, object_name) if md.obj_schema != 'PUBLIC'
+      md
+    else
+      __describe(object_name, OCI8::Metadata::Unknown, true)
+    end
   end
   # Returns table or view information. If the name is a current schema's synonym
   # name or a public synonym name, it returns table or view information which
@@ -2066,7 +2121,13 @@ class OCI8
   # @param [String] synonym_name
   # @return [OCI8::Metadata::Synonym]
   def describe_synonym(synonym_name, check_public_also = true)
-    __describe(synonym_name, OCI8::Metadata::Synonym, check_public_also)
+    if /^PUBLIC\.(.*)/i =~ synonym_name
+      md = __describe($1, OCI8::Metadata::Synonym, true)
+      raise OCIError.new(4043, synonym_name) if md.obj_schema != 'PUBLIC'
+      md
+    else
+      __describe(synonym_name, OCI8::Metadata::Synonym, check_public_also)
+    end
   end
   # Returns sequence information
   #

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

@@ -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
-