ruby-oci8 2.2.1 → 2.2.2

data/lib/oci8/ocihandle.rb

@@ -425,22 +425,6 @@ class OCIHandle
   # @private
   OCI_CRED_EXT                =   2
 
-  #################################
-  #
-  # Authentication Modes
-  #
-  #################################
-
-  # for SYSDBA authorization
-  # @private
-  OCI_SYSDBA                  = 0x0002
-  # for SYSOPER authorization
-  # @private
-  OCI_SYSOPER                 = 0x0004
-  # for SYSASM authorization
-  # @private
-  OCI_SYSASM                  = 0x8000
-
   #################################
   #
   # OCI Parameter Types

data/lib/oci8/properties.rb

@@ -13,6 +13,10 @@ class OCI8
     :statement_cache_size => 0,
     :events_mode => ((OCI8.__get_prop(2) & 4) != 0), # 4 <- OCI_EVENTS in oci.h
     :cancel_read_at_exit => false,
+    :tcp_connect_timeout => nil,
+    :connect_timeout => nil,
+    :send_timeout => nil,
+    :recv_timeout => nil,
   }
 
   # @private
@@ -53,6 +57,11 @@ class OCI8
     when :cancel_read_at_exit
       val = val ? true : false
       OCI8.__set_prop(3, val)
+    when :tcp_connect_timeout, :connect_timeout, :send_timeout, :recv_timeout
+      if !val.nil?
+        val = val.to_i
+        raise ArgumentError, "The property value for :#{name} must be nil or a positive integer." if val <= 0
+      end
     end
     super(name, val)
   end
@@ -132,6 +141,30 @@ class OCI8
   #
   #     *Since:* 2.1.8
   #
+  # [:tcp_connect_timeout]
+  #
+  #     See {file:docs/timeout-parameters.md}
+  #
+  #     *Since:* 2.2.2
+  #
+  # [:connect_timeout]
+  #
+  #     See {file:docs/timeout-parameters.md}
+  #
+  #     *Since:* 2.2.2
+  #
+  # [:send_timeout]
+  #
+  #     See {file:docs/timeout-parameters.md}
+  #
+  #     *Since:* 2.2.2
+  #
+  # [:recv_timeout]
+  #
+  #     See {file:docs/timeout-parameters.md}
+  #
+  #     *Since:* 2.2.2
+  #
   # @return [a customized Hash]
   # @since 2.0.5
   #

data/lib/oci8/version.rb

@@ -1,3 +1,3 @@
 class OCI8
-  VERSION = "2.2.1"
+  VERSION = "2.2.2"
 end

data/lib/ruby-oci8.rb

@@ -0,0 +1,4 @@
+if caller[0] !~ /\/bundler\/runtime\.rb:\d+:in `require'/
+  warn "Don't requie 'ruby-oci8'. Use \"require 'oci8'\" instead. 'ruby-oci8.rb' was added only for 'Bundler.require'."
+end
+require 'oci8'

data/ruby-oci8.gemspec

@@ -37,7 +37,7 @@ EOS
   s.has_rdoc = 'yard'
   s.authors = ['Kubo Takehiro']
   s.platform = gem_platform
-  s.license = '2-clause BSD-style license'
+  s.license = 'BSD-2-Clause'
   files = File.read('dist-files').split("\n")
   if gem_platform == Gem::Platform::RUBY
     s.extensions << 'ext/oci8/extconf.rb'

data/test/setup_test_object.sql

@@ -10,6 +10,10 @@ drop type rb_test_obj_elem_array
 /
 drop type rb_test_obj_elem
 /
+drop type rb_test_obj_sub
+/
+drop type rb_test_obj_base
+/
 create type rb_test_obj_elem as object (
   x integer,
   y integer
@@ -116,7 +120,7 @@ create or replace type body rb_test_obj is
 
   static function test_object_version return integer is
   begin
-    return 2;
+    return 3;
   end;
 
   static function class_func(n number) return rb_test_obj is
@@ -167,5 +171,21 @@ begin
   end loop;
 end;
 /
-commit
+
+create type rb_test_obj_base as object (
+   id varchar2(30)
+) not final
+/
+create type rb_test_obj_sub under rb_test_obj_base (
+   subid varchar2(30)
+) final
+/
+create or replace function rb_test_obj_get_object(get_base integer) return rb_test_obj_base is
+begin
+  if get_base = 0 then
+    return rb_test_obj_base('base');
+  else
+    return rb_test_obj_sub('sub', 'subid');
+  end if;
+end;
 /

data/test/test_all.rb

@@ -5,6 +5,7 @@ require "#{srcdir}/config"
 
 require "#{srcdir}/test_oradate"
 require "#{srcdir}/test_oranumber"
+require "#{srcdir}/test_bind_array.rb"
 require "#{srcdir}/test_bind_string"
 require "#{srcdir}/test_bind_time"
 require "#{srcdir}/test_bind_raw"

data/test/test_connstr.rb

@@ -75,4 +75,130 @@ class TestConnStr < Minitest::Test
       end
     end
   end
+
+  # https://docs.oracle.com/database/121/NETAG/naming.htm#BABJBFHJ
+  DESC_TEST_CASE =
+    [
+     # Cannot distinguish net service names from easy connect strings in this case.
+     ["sales-server", nil, nil, "sales-server"],
+     # Easy Connect string with host.
+     ["//sales-server", nil, nil, <<EOS],
+(DESCRIPTION=
+   (CONNECT_DATA=
+       (SERVICE_NAME=))
+   (ADDRESS=
+       (PROTOCOL=TCP)
+       (HOST=sales-server)
+       (PORT=1521)))
+EOS
+     # Easy Connect string with host and port.
+     ["sales-server:3456", nil, nil, <<EOS],
+(DESCRIPTION=
+   (CONNECT_DATA=
+       (SERVICE_NAME=))
+   (ADDRESS=
+       (PROTOCOL=TCP)
+       (HOST=sales-server)
+       (PORT=3456)))
+EOS
+     # The host name is sales-server and the service name is sales.
+     ["sales-server/sales", nil, nil, <<EOS],
+(DESCRIPTION=
+  (CONNECT_DATA=
+     (SERVICE_NAME=sales))
+  (ADDRESS=
+     (PROTOCOL=TCP)
+     (HOST=sales-server)
+     (PORT=1521)))
+EOS
+     # Easy Connect string with IPv6 address.
+     ["[2001:0db8:0:0::200C:417A]:80/sales", nil, nil, <<EOS],
+(DESCRIPTION=
+  (CONNECT_DATA=
+      (SERVICE_NAME=sales))
+  (ADDRESS=
+      (PROTOCOL=TCP)
+      (HOST=2001:0db8:0:0::200C:417A)
+      (PORT=80)))
+EOS
+     # Easy Connect string with IPv6 host address.
+     ["sales-server:80/sales", nil, nil, <<EOS],
+(DESCRIPTION=
+  (CONNECT_DATA=
+      (SERVICE_NAME=sales))
+  (ADDRESS=
+      (PROTOCOL=TCP)
+      (HOST=sales-server)
+      (PORT=80)))
+EOS
+     # Easy Connect string with host, service name, and server.
+     ["sales-server/sales:dedicated/inst1", nil, nil, <<EOS],
+(DESCRIPTION=
+  (CONNECT_DATA=
+      (SERVICE_NAME=sales)
+      (SERVER=dedicated)
+      (INSTANCE_NAME=inst1))
+  (ADDRESS=
+      (PROTOCOL=TCP)
+      (HOST=sales-server)
+      (PORT=1521)))
+EOS
+      ["sales-server//inst1", nil, nil, <<EOS],
+(DESCRIPTION=
+   (CONNECT_DATA=
+      (SERVICE_NAME=)
+      (INSTANCE_NAME=inst1))
+   (ADDRESS=
+      (PROTOCOL=TCP)
+      (HOST=sales-server)
+      (PORT=1521)))
+EOS
+     # 
+     ["sales-server/sales", 20, nil, <<EOS],
+(DESCRIPTION=
+  (CONNECT_DATA=
+     (SERVICE_NAME=sales))
+  (ADDRESS=
+     (PROTOCOL=TCP)
+     (HOST=sales-server)
+     (PORT=1521))
+  (TRANSPORT_CONNECT_TIMEOUT=20))
+EOS
+     # 
+     ["sales-server/sales", nil, 30, <<EOS],
+(DESCRIPTION=
+  (CONNECT_DATA=
+     (SERVICE_NAME=sales))
+  (ADDRESS=
+     (PROTOCOL=TCP)
+     (HOST=sales-server)
+     (PORT=1521))
+  (CONNECT_TIMEOUT=30))
+EOS
+     #
+     ["sales-server/sales", 20, 30, <<EOS],
+(DESCRIPTION=
+  (CONNECT_DATA=
+     (SERVICE_NAME=sales))
+  (ADDRESS=
+     (PROTOCOL=TCP)
+     (HOST=sales-server)
+     (PORT=1521))
+  (TRANSPORT_CONNECT_TIMEOUT=20)
+  (CONNECT_TIMEOUT=30))
+EOS
+    ]
+
+  def test_connect_descriptor
+    obj = OCI8.allocate # create an uninitialized object.
+    DESC_TEST_CASE.each do |test_case|
+      easy_connect_string = test_case[0]
+      tcp_connnect_timeout= test_case[1]
+      outbound_connnect_timeout = test_case[2]
+      expected_result = test_case[3].gsub(/\s/, '')
+      # use instance_eval to call a private method to_connect_descriptor
+      result = obj.instance_eval { to_connect_descriptor(easy_connect_string, tcp_connnect_timeout, outbound_connnect_timeout) }
+      assert_equal(expected_result, result, easy_connect_string)
+    end
+  end
 end

data/test/test_object.rb

@@ -22,7 +22,7 @@ begin
 
   begin
     version = RbTestObj.test_object_version(conn)
-    error_message = "Invalid test object version" if version != 2
+    error_message = "Invalid test object version" if version != 3
   rescue NoMethodError
     raise unless $!.to_s.include?('test_object_version')
     error_message = "rb_test_obj.test_object_version is not declared."
@@ -48,6 +48,12 @@ EOS
 class RbTestIntArray < OCI8::Object::Base
 end
 
+class RbTestObjBase < OCI8::Object::Base
+end
+
+class RbTestObjSub < RbTestObjBase
+end
+
 class TestObj1 < Minitest::Test
   Delta = 0.00001
 
@@ -456,4 +462,23 @@ EOS
       assert_equal(ary ? ary[2] : nil, csr[:out3])
     end
   end
+
+  def test_get_subtype
+    csr = @conn.parse("BEGIN :result := rb_test_obj_get_object(:1); END;")
+    csr.bind_param(1, nil, RbTestObjBase)
+    csr.bind_param(2, nil, Integer)
+
+    csr[2] = 0
+    csr.exec
+    val = csr[1]
+    assert_instance_of(RbTestObjBase, val)
+    assert_equal(val.id, 'base')
+
+    csr[2] = 1
+    csr.exec
+    val = csr[1]
+    assert_instance_of(RbTestObjSub, val)
+    assert_equal(val.id, 'sub')
+    assert_equal(val.subid, 'subid')
+  end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 2
   - 2
-  - 1
-  version: 2.2.1
+  - 2
+  version: 2.2.2
 platform: ruby
 authors: 
 - Kubo Takehiro
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2015-11-01 00:00:00 +09:00
+date: 2016-04-24 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -41,13 +41,16 @@ files:
 - pre-distclean.rb
 - ruby-oci8.gemspec
 - setup.rb
+- docs/bind-array-to-in_cond.md
 - docs/install-binary-package.md
 - docs/install-full-client.md
 - docs/install-instant-client.md
 - docs/install-on-osx.md
+- docs/conflicts-local-connections-and-processes.md
 - docs/osx-install-dev-tools.png
 - docs/platform-specific-issues.md
 - docs/report-installation-issue.md
+- docs/timeout-parameters.md
 - ext/oci8/.document
 - ext/oci8/MANIFEST
 - ext/oci8/apiwrap.c.tmpl
@@ -104,6 +107,7 @@ files:
 - lib/oci8/oracle_version.rb
 - lib/oci8/properties.rb
 - lib/oci8/version.rb
+- lib/ruby-oci8.rb
 - test/README
 - test/config.rb
 - test/setup_test_object.sql
@@ -133,7 +137,7 @@ files:
 has_rdoc: true
 homepage: http://www.rubydoc.info/github/kubo/ruby-oci8
 licenses: 
-- 2-clause BSD-style license
+- BSD-2-Clause
 post_install_message: 
 rdoc_options: []